From 28384dcde5b1665427e6cc38d7b95edbb11ab18c Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@mozilla.com>
Date: Thu, 18 Jan 2024 19:16:48 +0100
Subject: [PATCH 001/222] Bug 1867539 - reformat testrail scripts with black

Fixes lint warnings on oak
---
 .../androidTest/lib/testrail_conn.py          | 54 ++++++------
 .../taskcluster/androidTest/testrail.py       | 86 ++++++++++++-------
 2 files changed, 84 insertions(+), 56 deletions(-)

diff --git a/automation/taskcluster/androidTest/lib/testrail_conn.py b/automation/taskcluster/androidTest/lib/testrail_conn.py
index 41d1f2667..e2e18dd9f 100644
--- a/automation/taskcluster/androidTest/lib/testrail_conn.py
+++ b/automation/taskcluster/androidTest/lib/testrail_conn.py
@@ -21,11 +21,11 @@ import requests
 
 class APIClient:
     def __init__(self, base_url):
-        self.user = ''
-        self.password = ''
-        if not base_url.endswith('/'):
-            base_url += '/'
-        self.__url = base_url + 'index.php?/api/v2/'
+        self.user = ""
+        self.password = ""
+        if not base_url.endswith("/"):
+            base_url += "/"
+        self.__url = base_url + "index.php?/api/v2/"
 
     def send_get(self, uri, filepath=None):
         """Issue a GET request (read) against the API.
@@ -38,7 +38,7 @@ class APIClient:
         Returns:
             A dict containing the result of the request.
         """
-        return self.__send_request('GET', uri, filepath)
+        return self.__send_request("GET", uri, filepath)
 
     def send_post(self, uri, data):
         """Issue a POST request (write) against the API.
@@ -52,49 +52,51 @@ class APIClient:
         Returns:
             A dict containing the result of the request.
         """
-        return self.__send_request('POST', uri, data)
+        return self.__send_request("POST", uri, data)
 
     def __send_request(self, method, uri, data):
         url = self.__url + uri
 
         auth = str(
-            base64.b64encode(
-                bytes('%s:%s' % (self.user, self.password), 'utf-8')
-            ),
-            'ascii'
+            base64.b64encode(bytes("%s:%s" % (self.user, self.password), "utf-8")),
+            "ascii",
         ).strip()
-        headers = {'Authorization': 'Basic ' + auth}
+        headers = {"Authorization": "Basic " + auth}
 
-        if method == 'POST':
-            if uri[:14] == 'add_attachment':    # add_attachment API method
-                files = {'attachment': (open(data, 'rb'))}
+        if method == "POST":
+            if uri[:14] == "add_attachment":  # add_attachment API method
+                files = {"attachment": (open(data, "rb"))}
                 response = requests.post(url, headers=headers, files=files)
-                files['attachment'].close()
+                files["attachment"].close()
             else:
-                headers['Content-Type'] = 'application/json'
-                payload = bytes(json.dumps(data), 'utf-8')
+                headers["Content-Type"] = "application/json"
+                payload = bytes(json.dumps(data), "utf-8")
                 response = requests.post(url, headers=headers, data=payload)
         else:
-            headers['Content-Type'] = 'application/json'
+            headers["Content-Type"] = "application/json"
             response = requests.get(url, headers=headers)
 
         if response.status_code > 201:
             try:
                 error = response.json()
-            except requests.exceptions.HTTPError:     # response.content not formatted as JSON
+            except (
+                requests.exceptions.HTTPError
+            ):  # response.content not formatted as JSON
                 error = str(response.content)
-            raise APIError('TestRail API returned HTTP %s (%s)' % (response.status_code, error))
+            raise APIError(
+                "TestRail API returned HTTP %s (%s)" % (response.status_code, error)
+            )
         else:
-            if uri[:15] == 'get_attachment/':   # Expecting file, not JSON
+            if uri[:15] == "get_attachment/":  # Expecting file, not JSON
                 try:
-                    open(data, 'wb').write(response.content)
-                    return (data)
+                    open(data, "wb").write(response.content)
+                    return data
                 except FileNotFoundError:
-                    return ("Error saving attachment.")
+                    return "Error saving attachment."
             else:
                 try:
                     return response.json()
-                except requests.exceptions.HTTPError: 
+                except requests.exceptions.HTTPError:
                     return {}
 
 
diff --git a/automation/taskcluster/androidTest/testrail.py b/automation/taskcluster/androidTest/testrail.py
index b75efa7c3..cc9ccd99a 100644
--- a/automation/taskcluster/androidTest/testrail.py
+++ b/automation/taskcluster/androidTest/testrail.py
@@ -55,11 +55,11 @@ except Exception as e:
     raise Exception(f"An error occurred while loading the .env file: {e}")
 
 try:
-    with open('.testrail_credentials.json', 'r') as file:
+    with open(".testrail_credentials.json", "r") as file:
         secret = json.load(file)
-        TESTRAIL_HOST = secret['host']
-        TESTRAIL_USERNAME = secret['username']
-        TESTRAIL_PASSWORD = secret['password']
+        TESTRAIL_HOST = secret["host"]
+        TESTRAIL_USERNAME = secret["username"]
+        TESTRAIL_PASSWORD = secret["password"]
 except json.JSONDecodeError as e:
     raise ValueError("Failed to load testrail credentials : {e}")
 
@@ -69,22 +69,26 @@ try:
     VERSION_NUMBER = os.environ["MOBILE_HEAD_REF"]
     TEST_STATUS = os.environ["TEST_STATUS"]
 
-    if TEST_STATUS not in ('PASS', 'FAIL'):
+    if TEST_STATUS not in ("PASS", "FAIL"):
         raise ValueError(f"ERROR: Invalid TEST_STATUS value: {TEST_STATUS}")
 except KeyError as e:
     raise ValueError(f"ERROR: Missing Environment Variable: {e}")
 
+
 def parse_release_number(VERSION_NUMBER):
-    parts = VERSION_NUMBER.split('_')
+    parts = VERSION_NUMBER.split("_")
     return parts[1]
 
+
 def build_milestone_name(product_type, release_type, version_number):
     return f"Automated smoke testing sign-off - {product_type} {release_type} {version_number}"
 
+
 def build_milestone_description(milestone_name):
     current_date = datetime.now()
     formatted_date = current_date = current_date.strftime("%B %d, %Y")
-    return textwrap.dedent(f"""
+    return textwrap.dedent(
+        f"""
         RELEASE: {milestone_name}\n\n\
         RELEASE_TAG_URL: https://github.com/mozilla-mobile/firefox-android/releases\n\n\
         RELEASE_DATE: {formatted_date}\n\n\
@@ -95,10 +99,11 @@ def build_milestone_description(milestone_name):
         Known issues: n/a\n\
         New issue: n/a\n\
         Verified issue: 
-    """)
+    """
+    )
 
-class TestRail():
 
+class TestRail:
     def __init__(self):
         try:
             self.client = APIClient(TESTRAIL_HOST)
@@ -106,49 +111,70 @@ class TestRail():
             self.client.password = TESTRAIL_PASSWORD
         except KeyError as e:
             raise ValueError(f"ERROR: Missing Testrail Env Var: {e}")
-    
+
     # Public Methods
 
     def create_milestone(self, testrail_project_id, title, description):
         data = {"name": title, "description": description}
-        return self.client.send_post(f'add_milestone/{testrail_project_id}', data)
-    
-    def create_test_run(self, testrail_project_id, testrail_milestone_id, name_run, testrail_suite_id):
-        data = {"name": name_run, "milestone_id": testrail_milestone_id, "suite_id": testrail_suite_id}
-        return self.client.send_post(f'add_run/{testrail_project_id}', data)
-    
-    def update_test_cases_to_passed(self, testrail_project_id, testrail_run_id, testrail_suite_id):
+        return self.client.send_post(f"add_milestone/{testrail_project_id}", data)
+
+    def create_test_run(
+        self, testrail_project_id, testrail_milestone_id, name_run, testrail_suite_id
+    ):
+        data = {
+            "name": name_run,
+            "milestone_id": testrail_milestone_id,
+            "suite_id": testrail_suite_id,
+        }
+        return self.client.send_post(f"add_run/{testrail_project_id}", data)
+
+    def update_test_cases_to_passed(
+        self, testrail_project_id, testrail_run_id, testrail_suite_id
+    ):
         test_cases = self._get_test_cases(testrail_project_id, testrail_suite_id)
-        data = { "results": [{"case_id": test_case['id'], "status_id": 1} for test_case in test_cases]}
+        data = {
+            "results": [
+                {"case_id": test_case["id"], "status_id": 1} for test_case in test_cases
+            ]
+        }
         return testrail._update_test_run_results(testrail_run_id, data)
 
     # Private Methods
 
     def _get_test_cases(self, testrail_project_id, testrail_test_suite_id):
-        return self.client.send_get(f'get_cases/{testrail_project_id}&suite_id={testrail_test_suite_id}')
-    
+        return self.client.send_get(
+            f"get_cases/{testrail_project_id}&suite_id={testrail_test_suite_id}"
+        )
+
     def _update_test_run_results(self, testrail_run_id, data):
-        return self.client.send_post(f'add_results_for_cases/{testrail_run_id}', data)
-    
+        return self.client.send_post(f"add_results_for_cases/{testrail_run_id}", data)
+
+
 if __name__ == "__main__":
-    if TEST_STATUS != 'PASS':
+    if TEST_STATUS != "PASS":
         raise ValueError("Tests failed. Sending Slack Notification....")
 
     # There are for a dummy Testrail project used for Phase 1 testing of this script
     # They will be parameterized during Phase 2 of script hardening
-    PROJECT_ID = 53 # Firefox for FireTV
-    TEST_SUITE_ID = 45442 # Demo Test Suite
+    PROJECT_ID = 53  # Firefox for FireTV
+    TEST_SUITE_ID = 45442  # Demo Test Suite
 
     testrail = TestRail()
-    milestone_name = build_milestone_name(PRODUCT_TYPE, RELEASE_TYPE, parse_release_number(VERSION_NUMBER))
+    milestone_name = build_milestone_name(
+        PRODUCT_TYPE, RELEASE_TYPE, parse_release_number(VERSION_NUMBER)
+    )
     milestone_description = build_milestone_description(milestone_name)
 
     # Create milestone for 'Firefox for FireTV' and store the ID
-    milestone_id = testrail.create_milestone(PROJECT_ID, milestone_name, milestone_description)['id']
+    milestone_id = testrail.create_milestone(
+        PROJECT_ID, milestone_name, milestone_description
+    )["id"]
 
     # Create test run for each Device/API and update test cases to 'passed'
-    # The Firebase Test devices are temporarily hard-coded during testing 
+    # The Firebase Test devices are temporarily hard-coded during testing
     # and will be parameterized in Phase 2 of hardening
-    for test_run_name in ['Google Pixel 32(Android11)', 'Google Pixel2(Android9)']:
-        test_run_id = testrail.create_test_run(PROJECT_ID, milestone_id, test_run_name, TEST_SUITE_ID)['id']
+    for test_run_name in ["Google Pixel 32(Android11)", "Google Pixel2(Android9)"]:
+        test_run_id = testrail.create_test_run(
+            PROJECT_ID, milestone_id, test_run_name, TEST_SUITE_ID
+        )["id"]
         testrail.update_test_cases_to_passed(PROJECT_ID, test_run_id, TEST_SUITE_ID)

From 404a16596883b963fad324ec199418d91cc5b20f Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@mozilla.com>
Date: Mon, 22 Jan 2024 15:48:43 +0100
Subject: [PATCH 002/222] Bug 1867539 - fix exception formatting in testrail
 script

---
 automation/taskcluster/androidTest/testrail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automation/taskcluster/androidTest/testrail.py b/automation/taskcluster/androidTest/testrail.py
index cc9ccd99a..e735e417a 100644
--- a/automation/taskcluster/androidTest/testrail.py
+++ b/automation/taskcluster/androidTest/testrail.py
@@ -61,7 +61,7 @@ try:
         TESTRAIL_USERNAME = secret["username"]
         TESTRAIL_PASSWORD = secret["password"]
 except json.JSONDecodeError as e:
-    raise ValueError("Failed to load testrail credentials : {e}")
+    raise ValueError(f"Failed to load testrail credentials : {e}")
 
 try:
     PRODUCT_TYPE = os.environ["PRODUCT_TYPE"]

From 34435bba5d73034dac1525bbbac1bdc23d55ab80 Mon Sep 17 00:00:00 2001
From: jackyzy823 <jackyzy823@gmail.com>
Date: Mon, 15 Jan 2024 23:09:08 +0800
Subject: [PATCH 003/222] Bug 1807078 - use min for thumbail size of TabPreview

---
 app/src/main/java/org/mozilla/fenix/browser/TabPreview.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/TabPreview.kt b/app/src/main/java/org/mozilla/fenix/browser/TabPreview.kt
index b49478793..facb796e5 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/TabPreview.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/TabPreview.kt
@@ -22,7 +22,7 @@ import org.mozilla.fenix.databinding.TabPreviewBinding
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.theme.ThemeManager
-import kotlin.math.max
+import kotlin.math.min
 
 class TabPreview @JvmOverloads constructor(
     context: Context,
@@ -72,7 +72,7 @@ class TabPreview @JvmOverloads constructor(
     fun loadPreviewThumbnail(thumbnailId: String, isPrivate: Boolean) {
         doOnNextLayout {
             val previewThumbnail = binding.previewThumbnail
-            val thumbnailSize = max(previewThumbnail.height, previewThumbnail.width)
+            val thumbnailSize = min(previewThumbnail.height, previewThumbnail.width)
             thumbnailLoader.loadIntoView(
                 previewThumbnail,
                 ImageLoadRequest(thumbnailId, thumbnailSize, isPrivate),

From e113448a06cad5321f0b4c0941f355a66a148745 Mon Sep 17 00:00:00 2001
From: Charlie <chumphreys@mozilla.com>
Date: Fri, 19 Jan 2024 11:57:47 -0600
Subject: [PATCH 004/222] Bug 1875515 - record Nimbus is_ready event

---
 app/nimbus.fml.yaml                                   | 11 +++++++++++
 .../java/org/mozilla/fenix/experiments/NimbusSetup.kt |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/nimbus.fml.yaml b/app/nimbus.fml.yaml
index 753601f74..69b197bec 100644
--- a/app/nimbus.fml.yaml
+++ b/app/nimbus.fml.yaml
@@ -371,6 +371,17 @@ features:
       - channel: nightly
         value:
           enabled: true
+
+  nimbus-is-ready:
+    description: >
+      A feature that provides the number of Nimbus is_ready events to send
+      when Nimbus finishes launching.
+    variables:
+      event-count:
+        description: The number of events that should be sent.
+        type: Int
+        default: 1
+
 types:
   objects: {}
 
diff --git a/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt b/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt
index f6ecca1cf..8682e1614 100644
--- a/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt
+++ b/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt
@@ -70,7 +70,9 @@ fun createNimbus(context: Context, urlString: String?): NimbusApi {
         onFetchCallback = {
             context.settings().nimbusExperimentsFetched = true
         }
-    }.build(appInfo)
+    }.build(appInfo).also { nimbusApi ->
+        nimbusApi.recordIsReady(FxNimbus.features.nimbusIsReady.value().eventCount)
+    }
 }
 
 private fun Context.reportError(message: String, e: Throwable) {

From 5d0b4517d60ed5a158b3ec2cbd5739970278e711 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Mon, 22 Jan 2024 12:49:07 -0500
Subject: [PATCH 005/222] Bug 1875869 - Start the Nightly 124 development cycle

---
 app/src/main/res/values/strings.xml | 34 -----------------------------
 1 file changed, 34 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e63052abe..42f8c65bc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -250,8 +250,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scan</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Search engine</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Search engine settings</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -422,20 +420,10 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">HTTPS-Only Mode</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie banner reduction</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Cookie Banner Blocker</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Cookie Banner Blocker in private browsing</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduce cookie banners</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Off</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">On</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s automatically tries to reject cookie requests on cookie banners.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Off for this site</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -453,33 +441,15 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Site currently not supported</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Turn on Cookie banner reduction for %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Turn on Cookie Banner Blocker for %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Turn off Cookie banner reduction for %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Turn off Cookie Banner Blocker for %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s can’t automatically reject cookie requests on this site. You can send a request to support this site in the future.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s will clear this site’s cookies and refresh the page. Clearing all cookies may sign you out or empty shopping carts.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Turn off and %1$s will clear cookies and reload this site. This may sign you out or empty shopping carts.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s tries to automatically reject all cookie requests on supported sites.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3" >Turn on and %1$s will try to automatically refuse all cookie banners on this site.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Allow %1$s to reject cookie banners?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s can automatically reject many cookie banner requests.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Not Now</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">You’ll see fewer cookie requests</string>
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Allow</string>
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s just refused cookies for you</string>
     <!--Message for the cookie banner re-engagement CFR -->
@@ -1239,8 +1209,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Dismiss</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Unable to print</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Unable to print this page</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Print</string>
@@ -2189,8 +2157,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Highlights</b> are from %s reviews within the last 80 days that we believe to be reliable.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Learn more about %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">how %s by Mozilla determines review quality</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">how %s determines review quality</string>
     <!-- Text for title of settings section. -->

From ab56ebe21c5dd1d1879e21387e71187e540c5911 Mon Sep 17 00:00:00 2001
From: rahulsainani <rsainani@mozilla.com>
Date: Fri, 12 Jan 2024 12:34:26 +0100
Subject: [PATCH 006/222] Bug 1874388 - Remove unused notification pre prompt

---
 app/metrics.yaml                              | 72 ------------------
 app/nimbus.fml.yaml                           |  8 --
 .../java/org/mozilla/fenix/HomeActivity.kt    | 29 -------
 ...omeNotificationPermissionDialogFragment.kt | 64 ----------------
 .../NotificationPermissionDialogScreen.kt     | 75 -------------------
 .../java/org/mozilla/fenix/utils/Settings.kt  | 17 -----
 app/src/main/res/navigation/nav_graph.xml     |  8 --
 app/src/main/res/values/preference_keys.xml   |  4 -
 app/src/main/res/values/strings.xml           |  8 +-
 9 files changed, 4 insertions(+), 281 deletions(-)
 delete mode 100644 app/src/main/java/org/mozilla/fenix/onboarding/HomeNotificationPermissionDialogFragment.kt
 delete mode 100644 app/src/main/java/org/mozilla/fenix/onboarding/view/NotificationPermissionDialogScreen.kt

diff --git a/app/metrics.yaml b/app/metrics.yaml
index 92a892dc6..fa9706d26 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -1061,78 +1061,6 @@ onboarding:
     metadata:
       tags:
         - Onboarding
-  notif_ppp_impression:
-    type: event
-    description: |
-      Notification pre permission prompt was shown to the user.
-    bugs:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1810115
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/28529
-      - https://github.com/mozilla-mobile/firefox-android/pull/4039
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - android-probes@mozilla.com
-    expires: never
-    metadata:
-      tags:
-        - Notifications
-        - Onboarding
-  notif_ppp_close_click:
-    type: event
-    description: |
-      User clicked the close button on the notification pre permission prompt.
-    bugs:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1810115
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/28529
-      - https://github.com/mozilla-mobile/firefox-android/pull/4039
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - android-probes@mozilla.com
-    expires: never
-    metadata:
-      tags:
-        - Notifications
-        - Onboarding
-  notif_ppp_positive_btn_click:
-    type: event
-    description: |
-      User clicked the positive button on notification pre permission prompt.
-    bugs:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1810115
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/28529
-      - https://github.com/mozilla-mobile/firefox-android/pull/4039
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - android-probes@mozilla.com
-    expires: never
-    metadata:
-      tags:
-        - Notifications
-        - Onboarding
-  notif_ppp_negative_btn_click:
-    type: event
-    description: |
-      User clicked the negative button on notification pre permission prompt.
-    bugs:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1810115
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/28529
-      - https://github.com/mozilla-mobile/firefox-android/pull/4039
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - android-probes@mozilla.com
-    expires: never
-    metadata:
-      tags:
-        - Notifications
-        - Onboarding
   set_to_default_card:
     type: event
     description: |
diff --git a/app/nimbus.fml.yaml b/app/nimbus.fml.yaml
index 69b197bec..7b1a0157a 100644
--- a/app/nimbus.fml.yaml
+++ b/app/nimbus.fml.yaml
@@ -236,14 +236,6 @@ features:
         type: Int
         default: 0
 
-  pre-permission-notification-prompt:
-    description: A feature that shows the pre-permission notification prompt.
-    variables:
-      enabled:
-        description: if true, the pre-permission notification prompt is shown to the user.
-        type: Boolean
-        default: false
-
   onboarding:
     description: "A feature that configures the new user onboarding page.
     Note that onboarding is a **first run** feature, and should only be modified by first run experiments."
diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 61cab7c75..7c94eae28 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -31,7 +31,6 @@ import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.ActionBar
 import androidx.appcompat.widget.Toolbar
-import androidx.core.app.NotificationManagerCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
@@ -63,7 +62,6 @@ import mozilla.components.feature.media.ext.findActiveMediaTab
 import mozilla.components.feature.privatemode.notification.PrivateNotificationFeature
 import mozilla.components.feature.search.BrowserStoreSearchAdapter
 import mozilla.components.service.fxa.sync.SyncReason
-import mozilla.components.support.base.ext.areNotificationsEnabledSafe
 import mozilla.components.support.base.feature.ActivityResultHandler
 import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.log.logger.Logger
@@ -128,7 +126,6 @@ import org.mozilla.fenix.messaging.FenixNimbusMessagingController
 import org.mozilla.fenix.messaging.MessageNotificationWorker
 import org.mozilla.fenix.nimbus.FxNimbus
 import org.mozilla.fenix.onboarding.ReEngagementNotificationWorker
-import org.mozilla.fenix.onboarding.ensureMarketingChannelExists
 import org.mozilla.fenix.perf.MarkersActivityLifecycleCallbacks
 import org.mozilla.fenix.perf.MarkersFragmentLifecycleCallbacks
 import org.mozilla.fenix.perf.Performance
@@ -345,8 +342,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
             if (settings().showHomeOnboardingDialog && components.fenixOnboarding.userHasBeenOnboarded()) {
                 navHost.navController.navigate(NavGraphDirections.actionGlobalHomeOnboardingDialog())
             }
-
-            showNotificationPermissionPromptIfRequired()
         }
 
         Performance.processIntentIfPerformanceTest(intent, this)
@@ -443,30 +438,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         StartupTimeline.onActivityCreateEndHome(this) // DO NOT MOVE ANYTHING BELOW HERE.
     }
 
-    /**
-     * On Android 13 or above, prompt the user for notification permission at the start.
-     * Show the pre permission dialog to the user once if the notification are not enabled.
-     */
-    private fun showNotificationPermissionPromptIfRequired() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
-            !NotificationManagerCompat.from(applicationContext).areNotificationsEnabledSafe() &&
-            settings().numberOfAppLaunches <= 1
-        ) {
-            // Recording the exposure event here to capture all users who met all criteria to receive
-            // the pre permission notification prompt
-            FxNimbus.features.prePermissionNotificationPrompt.recordExposure()
-
-            if (settings().notificationPrePermissionPromptEnabled) {
-                if (!settings().isNotificationPrePermissionShown) {
-                    navHost.navController.navigate(NavGraphDirections.actionGlobalHomeNotificationPermissionDialog())
-                }
-            } else {
-                // This will trigger the notification permission system dialog as app targets sdk 32.
-                ensureMarketingChannelExists(applicationContext)
-            }
-        }
-    }
-
     private fun maybeShowSplashScreen() {
         if (components.settings.isFirstSplashScreenShown) {
             return
diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/HomeNotificationPermissionDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/onboarding/HomeNotificationPermissionDialogFragment.kt
deleted file mode 100644
index be4a22e1b..000000000
--- a/app/src/main/java/org/mozilla/fenix/onboarding/HomeNotificationPermissionDialogFragment.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.onboarding
-
-import android.annotation.SuppressLint
-import android.content.pm.ActivityInfo
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.RequiresApi
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.DialogFragment
-import org.mozilla.fenix.R
-import org.mozilla.fenix.ext.requireComponents
-import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.onboarding.view.NotificationPermissionDialogScreen
-import org.mozilla.fenix.theme.FirefoxTheme
-
-/**
- * Dialog displaying notification pre-permission prompt.
- */
-class HomeNotificationPermissionDialogFragment : DialogFragment() {
-
-    @SuppressLint("SourceLockedOrientationActivity")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, R.style.HomeOnboardingDialogStyle)
-        activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-    }
-
-    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View = ComposeView(requireContext()).apply {
-        setContent {
-            FirefoxTheme {
-                NotificationPermissionDialogScreen(
-                    onDismiss = ::onDismiss,
-                    grantNotificationPermission = {
-                        ensureMarketingChannelExists(context.applicationContext)
-                        requireComponents.notificationsDelegate.requestNotificationPermission()
-                        onDismiss()
-                    },
-                )
-            }
-        }
-    }
-
-    private fun onDismiss() {
-        dismiss()
-        context?.settings()?.isNotificationPrePermissionShown = true
-    }
-}
diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/view/NotificationPermissionDialogScreen.kt b/app/src/main/java/org/mozilla/fenix/onboarding/view/NotificationPermissionDialogScreen.kt
deleted file mode 100644
index 702b98a1f..000000000
--- a/app/src/main/java/org/mozilla/fenix/onboarding/view/NotificationPermissionDialogScreen.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.onboarding.view
-
-import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import mozilla.components.service.glean.private.NoExtras
-import org.mozilla.fenix.GleanMetrics.Onboarding
-import org.mozilla.fenix.R
-import org.mozilla.fenix.compose.annotation.LightDarkPreview
-import org.mozilla.fenix.theme.FirefoxTheme
-
-/**
- * A screen for displaying notification pre permission prompt.
- *
- * @param onDismiss Invoked when the user clicks on the close or the negative button.
- * @param grantNotificationPermission Invoked when the user clicks on the positive button.
- */
-@Composable
-fun NotificationPermissionDialogScreen(
-    onDismiss: () -> Unit,
-    grantNotificationPermission: () -> Unit,
-) {
-    OnboardingPage(
-        pageState = OnboardingPageState(
-            imageRes = R.drawable.ic_notification_permission,
-            title = stringResource(
-                id = R.string.onboarding_home_enable_notifications_title,
-                formatArgs = arrayOf(stringResource(R.string.app_name)),
-            ),
-            description = stringResource(
-                id = R.string.onboarding_home_enable_notifications_description,
-                formatArgs = arrayOf(stringResource(R.string.app_name)),
-            ),
-            primaryButton = Action(
-                text = stringResource(id = R.string.onboarding_home_enable_notifications_positive_button),
-                onClick = {
-                    grantNotificationPermission()
-                    Onboarding.notifPppPositiveBtnClick.record(NoExtras())
-                },
-            ),
-            secondaryButton = Action(
-                text = stringResource(id = R.string.onboarding_home_enable_notifications_negative_button),
-                onClick = {
-                    onDismiss()
-                    Onboarding.notifPppNegativeBtnClick.record(NoExtras())
-                },
-            ),
-            onRecordImpressionEvent = { Onboarding.notifPppImpression.record(NoExtras()) },
-        ),
-        onDismiss = {
-            onDismiss()
-            Onboarding.notifPppCloseClick.record(NoExtras())
-        },
-        modifier = Modifier
-            .statusBarsPadding()
-            .navigationBarsPadding(),
-    )
-}
-
-@LightDarkPreview
-@Composable
-private fun NotificationPermissionScreenPreview() {
-    FirefoxTheme {
-        NotificationPermissionDialogScreen(
-            grantNotificationPermission = {},
-            onDismiss = { },
-        )
-    }
-}
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 298084062..8a8bbd706 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -1682,23 +1682,6 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = setOf(),
     )
 
-    /**
-     * Indicates if notification pre permission prompt feature is enabled.
-     */
-    var notificationPrePermissionPromptEnabled by lazyFeatureFlagPreference(
-        key = appContext.getPreferenceKey(R.string.pref_key_notification_pre_permission_prompt_enabled),
-        default = { FxNimbus.features.prePermissionNotificationPrompt.value().enabled },
-        featureFlag = true,
-    )
-
-    /**
-     * Indicates if notification permission prompt has been shown to the user.
-     */
-    var isNotificationPrePermissionShown by booleanPreference(
-        key = appContext.getPreferenceKey(R.string.pref_key_is_notification_pre_permission_prompt_shown),
-        default = false,
-    )
-
     /**
      * Returns whether onboarding should be shown to the user.
      *
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 11a149c4e..f3815ca3c 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -43,10 +43,6 @@
         android:id="@+id/action_global_home_onboarding_dialog"
         app:destination="@id/homeOnboardingDialogFragment" />
 
-    <action
-        android:id="@+id/action_global_home_notification_permission_dialog"
-        app:destination="@id/homeNotificationPermissionDialogFragment" />
-
     <action
         android:id="@+id/action_global_wallpaper_onboarding_dialog"
         app:destination="@id/wallpaperOnboardingDialogFragment"
@@ -231,10 +227,6 @@
             app:argType="string" />
     </dialog>
 
-    <dialog
-        android:id="@+id/homeNotificationPermissionDialogFragment"
-        android:name="org.mozilla.fenix.onboarding.HomeNotificationPermissionDialogFragment" />
-
     <dialog
         android:id="@+id/wallpaperOnboardingDialogFragment"
         android:name="org.mozilla.fenix.onboarding.WallpaperOnboardingDialogFragment" />
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index 2103cf261..97281deec 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -377,10 +377,6 @@
     <string name="pref_key_growth_resume_last_sent" translatable="false">pref_key_growth_last_resumed</string>
     <string name="pref_key_growth_uri_load_last_sent" translatable="false">pref_key_growth_uri_load_last_sent</string>
 
-    <!-- Notification Pre Permission Prompt -->
-    <string name="pref_key_notification_pre_permission_prompt_enabled">pref_key_notification_pre_permission_prompt_enabled</string>
-    <string name="pref_key_is_notification_pre_permission_prompt_shown">pref_key_is_notification_pre_permission_prompt_shown</string>
-
     <!--Shopping -->
     <string name="pref_key_is_review_quality_check_enabled">pref_key_is_review_quality_check_enabled</string>
     <string name="pref_key_is_review_quality_check_product_recommendations_enabled">pref_key_is_review_quality_check_product_recommendations_enabled</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 42f8c65bc..06bea5296 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -298,14 +298,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Notifications help you do more with %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Notifications help you do more with %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sync your tabs between devices, manage downloads, get tips about making the most of %s’s privacy protection, and more.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sync your tabs between devices, manage downloads, get tips about making the most of %s’s privacy protection, and more.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Continue</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Continue</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Not now</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Not now</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->

From bef8bc3749d3698aaf69960b42621335ca8ded9c Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Mon, 22 Jan 2024 14:38:04 -0700
Subject: [PATCH 007/222] Bug 1875923 - Update max_line_length in editorconfig
 to match detekt

---
 .editorconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.editorconfig b/.editorconfig
index 7ea380af1..35408b931 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,7 @@
 [*.{kt,kts}]
 ij_kotlin_allow_trailing_comma_on_call_site=true
 ij_kotlin_allow_trailing_comma=true
+max_line_length = 120 # Matches maxLineLength in detekt.yml
 
 [*]
 insert_final_newline = true

From 7dc1b784b4c7350052f3c4befa3b20423c2fcc90 Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Fri, 19 Jan 2024 15:12:00 -0500
Subject: [PATCH 008/222] Bug 1875514 - Only send installation ping when we
 receive adjust metrics

---
 app/metrics.yaml                                      | 11 +++++++++++
 .../fenix/components/metrics/FirstSessionPing.kt      |  4 ++++
 .../fenix/components/metrics/GleanMetricsService.kt   |  2 --
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/metrics.yaml b/app/metrics.yaml
index fa9706d26..aba35607b 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -843,6 +843,17 @@ events:
     metadata:
       tags:
         - Search
+  first_session_ping_cancelled:
+    type: event
+    description: |
+      First session ping cancelled because Adjust metrics were empty.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1875514
+    data_reviews:
+      - https://github.com/mozilla-mobile/firefox-android/pull/5223
+    notification_emails:
+      - android-probes@mozilla.com
+    expires: never
 
 splash_screen:
   first_launch_extended:
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/FirstSessionPing.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/FirstSessionPing.kt
index 9474ff079..0666ab06e 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/FirstSessionPing.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/FirstSessionPing.kt
@@ -10,8 +10,10 @@ import androidx.annotation.VisibleForTesting
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import mozilla.components.service.glean.private.NoExtras
 import mozilla.components.support.base.log.logger.Logger
 import org.mozilla.fenix.Config
+import org.mozilla.fenix.GleanMetrics.Events
 import org.mozilla.fenix.GleanMetrics.FirstSession
 import org.mozilla.fenix.GleanMetrics.Pings
 import org.mozilla.fenix.ext.settings
@@ -74,6 +76,8 @@ class FirstSessionPing(private val context: Context) {
                 Pings.firstSession.submit()
                 markAsTriggered()
             }
+        } else {
+            Events.firstSessionPingCancelled.record(NoExtras())
         }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
index 2ecf9005a..52eb6c4ba 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
@@ -66,7 +66,6 @@ class GleanMetricsService(
     private var initialized = false
 
     private val activationPing = ActivationPing(context)
-    private val installationPing = FirstSessionPing(context)
 
     override fun start() {
         logger.debug("Enabling Glean.")
@@ -87,7 +86,6 @@ class GleanMetricsService(
             Glean.registerPings(Pings)
 
             activationPing.checkAndSend()
-            installationPing.checkAndSend()
         }
     }
 

From aa2f7105c2c7069d1a98627c6104b48c327553a7 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Tue, 23 Jan 2024 00:03:41 +0000
Subject: [PATCH 009/222] Import translations from android-l10n

---
 app/src/main/res/values-bg/strings.xml     |  92 +++++++++++++++++++
 app/src/main/res/values-bs/strings.xml     |  61 ++++++++++--
 app/src/main/res/values-de/strings.xml     |  91 ++++++++++++++++++
 app/src/main/res/values-es/strings.xml     |   9 +-
 app/src/main/res/values-hu/strings.xml     |   9 +-
 app/src/main/res/values-it/strings.xml     |  91 ++++++++++++++++++
 app/src/main/res/values-iw/strings.xml     | 102 ++++++++++++++++++++-
 app/src/main/res/values-kab/strings.xml    |  16 +++-
 app/src/main/res/values-ko/strings.xml     |  97 +++++++++++++++++++-
 app/src/main/res/values-pt-rBR/strings.xml |   9 +-
 app/src/main/res/values-ru/strings.xml     |  92 +++++++++++++++++++
 app/src/main/res/values-sk/strings.xml     |  91 ++++++++++++++++++
 app/src/main/res/values-sl/strings.xml     |  49 ++++++++++
 app/src/main/res/values-tg/strings.xml     |   9 +-
 14 files changed, 792 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index cc3cd40b8..cc35bf1da 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -719,6 +719,8 @@
     <string name="preferences_sync_bookmarks">Отметки</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Регистрации</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Пароли</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Отворени раздели</string>
     <!-- Preference for signing out -->
@@ -744,6 +746,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Банкови карти</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Начини на плащане</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Адреси</string>
 
@@ -1700,8 +1704,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Регистрации и пароли</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Пароли</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Запазване на регистрации и пароли</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Запазване на пароли</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Питане за запазване</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1718,26 +1726,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Добавяне на регистрация</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Добавяне на парола</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Синхронизиране на регистрации</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Синхронизиране на пароли</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Синхронизиране на регистрации между устройства</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Синхронизиране на пароли между устройства</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Запазени регистрации</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Запазени пароли</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Тук се показват нещата, които запазвате или синхронизирате във %s.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Паролите, които запазите или синхронизирате с %s ще бъдат изброени тук. Всички запазени пароли са шифровани.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Научете повече за Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Научете повече за синхронизирането</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Изключения</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Тук се показват регистрации и пароли, които не са запазени.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s няма да запазва пароли за сайтове, изброени тук.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Следните страници няма да запазват регистрации и пароли.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s няма да запази пароли за тези сайтове.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Изтриване на всички</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Търсене на регистрация</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Търсене на пароли</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Страница</string>
     <!-- The header for the username for a login -->
@@ -1767,10 +1795,16 @@
     <string name="saved_login_hide_password">Скриване на парола</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Отключете, за да видите запазените регистрации</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Отключете, за да видите запазените пароли</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Защитете вашите данни за вход</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Защитете запазените пароли</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените регистрации и пароли, в случай че някой друг има достъп до него.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените пароли от достъп, ако някой друг има вашето устройство.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">По-късно</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1788,6 +1822,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Меню за сортиране на регистрации</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Меню за сортиране на пароли</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Автоматично попълване</string>
@@ -1795,19 +1832,29 @@
     <string name="preferences_addresses">Адреси</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Банкови карти</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Начини на плащане</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Запазване и автоматично попълване на карти</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Запазване и попълване на начини на плащане</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Данните са криптирани</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s шифрова всички запазени от вас начини на плащане</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Синхронизиране на карти между устройства</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Синхронизиране на карти</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Добавяне на карта</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Добавяне на карта</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Управление на карти</string>
 
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Управление на карти</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Добавяне на адрес</string>
     <!-- Preference option for managing saved addresses -->
@@ -1815,9 +1862,14 @@
 
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Запазване и попълване на адреси</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Запазване и попълване на адреси</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Включително номера, електронни адреси и адреси за доставка</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Включва телефонни номера и имейл адреси</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Добавяне на карта</string>
     <!-- Title of the "Edit card" screen -->
@@ -1838,6 +1890,8 @@
     <string name="credit_cards_delete_card_button">Изтриване на картата</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Сигурни ли сте, че искате да премахнете тази банкова карта?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Изтриване на картата?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Премахване</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1850,14 +1904,22 @@
     <string name="credit_cards_saved_cards">Запазени карти</string>
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Моля, въведете валиден номер на банкова карта</string>
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Въведете валиден номер на карта</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Попълнете полето</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Добавяне на име</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Отключете, за да видите запазените карти</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Защитете банковите си карти</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Защитете запазените начини на плащане</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените банкови карти, в случай че някой друг има достъп до него.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените карти от достъп, ако някой друг има вашето устройство.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Настройване</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1868,6 +1930,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Отключете, за да използвате запазената банкова карта</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Отключете, за да използвате запазените методи на плащане</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Добавяне на адрес</string>
     <!-- Title of the "Edit address" screen -->
@@ -1906,6 +1970,8 @@
     <string name="addressess_delete_address_button">Премахване на адреса</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Сигурни ли сте, че искате да премахнете този адрес?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Изтриване на този адрес?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Премахване</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2006,30 +2072,52 @@
     <string name="login_menu_edit_button">Редактиране</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Сигурни ли сте, че искате да изтриете тези данни за вход?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Сигурни ли сте, че искате да изтриете тази парола?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Изтриване</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Отказ</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Настройки за вход</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Опции за парола</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Текстовото поле за редактиране на адреса на регистрация.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Текстовото поле за редактиране на адреса на уебсайта на паролата.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Текстовото поле за редактиране на потребителското име на регистрация.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Текстовото поле за редактиране на потребителското име на паролата.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Текстовото поле за редактиране на паролата на регистрация.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Текстовото поле за редактиране на паролата.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Запазване на промените на регистрацията.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Запазване на промените.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Редактиране</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Редактиране на паролата</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Добавете регистрация</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Добавяне на парола</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Паролата е задължителна</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Въведете парола</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Потребителското име е задължително</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Въведете потребителско име</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Името на хоста е задължително</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Въведете уеб адрес</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Гласово търсене</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2401,6 +2489,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Без превод на %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Без превод на този сайт</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Заменя всички останали настройки</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Заменя предложенията за превод</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Настройки на превода</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 51cac9c00..28a1ed0e9 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -205,6 +205,8 @@
     <string name="resync_button_content_description">Ponovo sinhronizuj</string>
     <!-- Browser menu button that opens the find in page menu -->
     <string name="browser_menu_find_in_page">Pronađi na stranici</string>
+    <!-- Browser menu button that opens the translations dialog, which has options to translate the current browser page. -->
+    <string name="browser_menu_translations">Prevedi stranicu</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">Spasi u kolekciju</string>
     <!-- Browser menu button that open a share menu to share the current site -->
@@ -312,13 +314,18 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ne sada</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Firefox obavijest o privatnosti</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Volimo da vas čuvamo</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Naš neprofitni pretraživač pomaže spriječiti kompanije da vas potajno prate širom weba.\n\nSaznajte više u našem obavještenju o privatnosti.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Naš neprofitni pretraživač pomaže u sprečavanju kompanija da vas potajno prate širom interneta.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Naš neprofitni pretraživač pomaže spriječiti kompanije da vas potajno prate širom weba.\n\nSaznajte više u našem obavještenju o privatnosti.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">obavještenje o privatnosti</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">obavještenje o privatnosti</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Postavi kao zadani pretraživač</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -1301,6 +1308,10 @@
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">Zatvori privatne tabove</string>
 
+    <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
+    <string name="notification_erase_title_android_14">Zatvoriti privatne tabove?</string>
+    <string name="notification_erase_text_android_14">Dodirnite ili prevucite ovo obavještenje da zatvorite privatne tabove.</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">Marketing</string>
     <!-- Title shown in the notification that pops up to remind the user to set fenix as default browser.
@@ -2231,17 +2242,17 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Saznajte više</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="121" tools:ignore="UnusedResources">Odabirom “Da, probaj” prihvatate %1$s od strane Mozilla-ine %2$s i %3$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption">Odabirom “Da, probaj” prihvatate %1$s od strane Mozilla-ine %2$s i %3$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
-    <string name="review_quality_check_contextual_onboarding_caption_2">Odabirom “Da, probaj” prihvatate sljedeće od %1$s:</string>
+    <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Odabirom “Da, probaj” prihvatate sljedeće od %1$s:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="121" tools:ignore="UnusedResources">politika privatnosti</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">politika privatnosti</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy_2">Politika privatnosti</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Politika privatnosti</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
-    <string name="review_quality_check_contextual_onboarding_terms_use" moz:RemovedIn="121" tools:ignore="UnusedResources">uslovi korištenja</string>
+    <string name="review_quality_check_contextual_onboarding_terms_use">uslovi korištenja</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
-    <string name="review_quality_check_contextual_onboarding_terms_use_2">Uslovi korištenja</string>
+    <string name="review_quality_check_contextual_onboarding_terms_use_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Uslovi korištenja</string>
     <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_primary_button_text">Da, probaj</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
@@ -2298,6 +2309,11 @@
     <!-- Content description for headings announced by accessibility service. The first parameter is the text of the heading. Talkback will announce the first parameter and then speak the word "Heading" indicating to the user that this text is a heading for a section. -->
     <string name="a11y_heading">%s, naslov</string>
 
+    <!-- Title for dialog displayed when trying to access links present in a text. -->
+    <string name="a11y_links_title">Linkovi</string>
+    <!-- Additional content description for text bodies that contain urls. -->
+    <string name="a11y_links_available">Dostupni linkovi</string>
+
     <!-- Translations feature-->
 
     <!-- Translation request dialog -->
@@ -2315,13 +2331,26 @@
     <string name="translations_bottom_sheet_translate_to">Prevedi na</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Ne sada</string>
+    <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
+    <string name="translations_bottom_sheet_negative_button_error">Gotovo</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
     <string name="translations_bottom_sheet_positive_button">Prevedi</string>
+    <!-- Button text on the translations dialog when a translation error appears. -->
+    <string name="translations_bottom_sheet_positive_button_error">Pokušaj ponovo</string>
     <!-- Inactive button text on the translations dialog that indicates a translation is currently in progress. This button will be accompanied by a loading icon. -->
     <string name="translations_bottom_sheet_translating_in_progress">Prevođenje</string>
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Prevođenje u toku</string>
 
+    <!-- The title of the warning card informs the user that a translation could not be completed. -->
+    <string name="translation_error_could_not_translate_warning_text">Došlo je do problema pri prevođenju. Molimo pokušajte ponovo.</string>
+    <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
+    <string name="translation_error_could_not_load_languages_warning_text">Učitavanje jezika nije uspjelo. Provjerite internetsku vezu i pokušajte ponovo.</string>
+    <!-- The title of the warning card informs the user that a language is not supported. The first parameter is the name of the language that is not supported. -->
+    <string name="translation_error_language_not_supported_warning_text">Žao nam je, još uvijek ne podržavamo %1$s.</string>
+    <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
+    <string name="translation_error_language_not_supported_learn_more">Saznajte više</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opcije prevođenja</string>
@@ -2453,8 +2482,12 @@
     <string name="download_language_file_dialog_negative_button_text">Otkaži</string>
 
     <!-- Debug drawer -->
+    <!-- The user-facing title of the Debug Drawer feature. -->
+    <string name="debug_drawer_title">Alati za otklanjanje grešaka</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate back within the debug drawer. -->
+    <string name="debug_drawer_back_button_content_description">Idite nazad</string>
     <!-- The title of the Tab Tools feature in the Debug Drawer. -->
-    <string name="debug_drawer_tab_tools_title" tools:ignore="UnusedResources">Tab alati</string>
+    <string name="debug_drawer_tab_tools_title">Tab alati</string>
     <!-- The title of the tab count section in Tab Tools. -->
     <string name="debug_drawer_tab_tools_tab_count_title">Broj tabova</string>
     <!-- The active tab count category in the tab count section in Tab Tools. -->
@@ -2465,4 +2498,14 @@
     <string name="debug_drawer_tab_tools_tab_count_private">Privatno</string>
     <!-- The total tab count category in the tab count section in Tab Tools. -->
     <string name="debug_drawer_tab_tools_tab_count_total">Ukupno</string>
+    <!-- The title of the tab creation tool section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_title">Alat za kreiranje tabova</string>
+    <!-- The label of the text field in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_text_field_label">Količina tabova za kreiranje</string>
+    <!-- The button text to add tabs to the active tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_active">Dodaj aktivnim tabovima</string>
+    <!-- The button text to add tabs to the inactive tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_inactive">Dodaj u neaktivne tabove</string>
+    <!-- The button text to add tabs to the private tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_private">Dodaj privatnim tabovima</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2f23b8dc4..e2268dcae 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -725,6 +725,8 @@
     <string name="preferences_sync_bookmarks">Lesezeichen</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Zugangsdaten</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Passwörter</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Offene Tabs</string>
     <!-- Preference for signing out -->
@@ -751,6 +753,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Kreditkarten</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Zahlungsmethoden</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adressen</string>
 
@@ -1721,8 +1725,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Zugangsdaten und Passwörter</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Passwörter</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Zugangsdaten und Passwörter speichern</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Passwörter speichern</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Zum Speichern nachfragen</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1740,26 +1748,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Zugangsdaten hinzufügen</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Passwort hinzufügen</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Zugangsdaten synchronisieren</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Passwörter synchronisieren</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Zugangsdaten zwischen Geräten synchronisieren</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Passwörter geräteübergreifend synchronisieren</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Gespeicherte Zugangsdaten</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Gespeicherte Passwörter</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Die Zugangsdaten, die Sie speichern oder mit %s synchronisieren, werden hier angezeigt.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Die Passwörter, die Sie speichern oder mit %s synchronisieren, werden hier aufgelistet. Alle gespeicherten Passwörter werden verschlüsselt.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Erfahren Sie mehr über Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Weitere Informationen über Sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Ausnahmen</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Zugangsdaten und Passwörter, die nicht gespeichert werden, werden hier angezeigt.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s speichert keine Passwörter für die hier aufgeführten Websites.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Zugangsdaten und Passwörter werden für diese Websites nicht gespeichert.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s speichert keine Passwörter für diese Websites.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Alle Ausnahmen löschen</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Zugangsdaten durchsuchen</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Passwörter durchsuchen</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Website</string>
     <!-- The header for the username for a login -->
@@ -1788,10 +1815,16 @@
     <string name="saved_login_hide_password">Passwort verbergen</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Zum Anzeigen Ihrer gespeicherten Zugangsdaten entsperren</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Zum Anzeigen Ihrer gespeicherten Passwörter entsperren</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Sichern Sie Ihre Zugangsdaten und Passwörter</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Sichern Sie Ihre gespeicherten Passwörter</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Zugangsdaten und Passwörter zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Passwörter zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Später</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1811,6 +1844,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menü mit Zugangsdaten sortieren</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menü „Passwörter sortieren“</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Automatisch ausfüllen</string>
@@ -1818,10 +1854,16 @@
     <string name="preferences_addresses">Adressen</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Kreditkarten</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Zahlungsmethoden</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Autovervollständigung für Kreditkartendaten</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Zahlungsmethoden speichern und ausfüllen</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Daten sind verschlüsselt</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s verschlüsselt alle von Ihnen gespeicherten Zahlungsmethoden</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Karten zwischen Geräten synchronisieren</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1829,17 +1871,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Kreditkarte hinzufügen</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Karte hinzufügen</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Gespeicherte Karten verwalten</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Karten verwalten</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adresse hinzufügen</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Adressen verwalten</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Autovervollständigung für Adressen</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Adressen speichern und ausfüllen</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Dies beinhaltetet Nummern, E-Mail- und Lieferadressen</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Enthält Telefonnummern und E-Mail-Adressen</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Karte hinzufügen</string>
     <!-- Title of the "Edit card" screen -->
@@ -1860,6 +1911,8 @@
     <string name="credit_cards_delete_card_button">Karte löschen</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Soll diese Kreditkarte wirklich gelöscht werden?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Karte löschen?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Löschen</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1875,14 +1928,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Bitte geben Sie eine gültige Kreditkartennummer ein</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Geben Sie eine gültige Kartennummer ein</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Bitte füllen Sie dieses Feld aus</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Fügen Sie einen Namen hinzu</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Zum Anzeigen Ihrer gespeicherten Karten entsperren</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Sichern Sie Ihre Kreditkarten</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Sichern Sie Ihre gespeicherten Zahlungsmethoden</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Karten zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Karten zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Jetzt einrichten</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1893,6 +1954,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Entsperren, um gespeicherte Kreditkartendaten zu verwenden</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Zum Verwenden Ihrer gespeicherten Zahlungsmethoden entsperren</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adresse hinzufügen</string>
     <!-- Title of the "Edit address" screen -->
@@ -1930,6 +1993,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Soll diese Adresse wirklich gelöscht werden?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Diese Adresse löschen?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Löschen</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2028,30 +2093,52 @@
     <string name="login_menu_edit_button">Bearbeiten</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Sollen diese Zugangsdaten wirklich gelöscht werden?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Soll dieses Passwort wirklich gelöscht werden?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Löschen</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Abbrechen</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Optionen für Zugangsdaten</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Passwort-Optionen</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Das bearbeitbare Textfeld für die Internetadresse der Zugangsdaten.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Das bearbeitbare Textfeld für die Internetadresse des Passworts.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Das bearbeitbare Textfeld für den Benutzernamen der Zugangsdaten.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Das bearbeitbare Textfeld für den Benutzernamen des Passworts.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Das bearbeitbare Textfeld für das Passwort der Zugangsdaten.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Das bearbeitbare Textfeld für das Passwort.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Änderungen an Zugangsdaten speichern.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Änderungen speichern.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Bearbeiten</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Passwort bearbeiten</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Neue Zugangsdaten hinzufügen</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Passwort hinzufügen</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Passwort erforderlich</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Passwort eingeben</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Benutzername erforderlich</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Benutzername eingeben</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hostname erforderlich</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Internetadresse eingeben</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Sprachsuche</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2425,6 +2512,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">%1$s nie übersetzen</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Diese Website nie übersetzen</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Überschreibt alle anderen Einstellungen</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Überschreibt Angebote zur Übersetzung</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Einstellungen für die Übersetzung</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9af93598d..05599fb39 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -332,13 +332,18 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ahora no</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Aviso de privacidad de Firefox</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Nos encanta mantenerte a salvo</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Nuestro navegador respaldado por una organización sin ánimo de lucro ayuda a evitar que las empresas te sigan en secreto en la web.\n\nMás información en nuestro aviso de privacidad.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Nuestro navegador respaldado por una organización sin ánimo de lucro ayuda a evitar que las empresas te sigan en secreto por la web.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Nuestro navegador respaldado por una organización sin ánimo de lucro ayuda a evitar que las empresas te sigan en secreto en la web.\n\nMás información en nuestro aviso de privacidad.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">aviso de privacidad</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">aviso de privacidad</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Establecer como navegador predeterminado</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 2edef48f0..ad0df69ed 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -329,13 +329,18 @@
     <string name="onboarding_home_enable_notifications_negative_button">Most nem</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Firefox adatvédelmi nyilatkozat</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Szeretjük biztonságban tartani Önt</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">A nonprofit szervezet által támogatott böngészőnk segít megakadályozni, hogy a cégek titokban nyomon kövessék Önt az interneten.\n\nTovábbi információk az adatvédelmi nyilatkozatban találhatók.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">A nonprofit szervezet által támogatott böngészőnk segít megakadályozni, hogy a cégek titokban kövessék Önt a weben.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">A nonprofit szervezet által támogatott böngészőnk segít megakadályozni, hogy a cégek titokban nyomon kövessék Önt az interneten.\n\nTovábbi információk az adatvédelmi nyilatkozatban találhatók.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">adatvédelmi nyilatkozatban</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">adatvédelmi nyilatkozatban</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Beállítás alapértelmezett böngészőként</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1619b3f98..42e0da8f3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -729,6 +729,8 @@
     <string name="preferences_sync_bookmarks">Segnalibri</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Credenziali</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Password</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Schede aperte</string>
     <!-- Preference for signing out -->
@@ -755,6 +757,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Carte di credito</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Metodi di pagamento</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Indirizzi</string>
 
@@ -1726,8 +1730,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Credenziali e password</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Password</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Salva credenziali e password</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Salva password</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Chiedi prima di salvare</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1745,26 +1753,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Aggiungi credenziali</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Aggiungi password</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronizza le credenziali</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizza password</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sincronizza credenziali tra dispositivi</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronizza le password tra i tuoi dispositivi</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Credenziali salvate</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Password salvate</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Le credenziali salvate o sincronizzate in %s verranno visualizzate qui.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Le password salvate o sincronizzate con %s verranno visualizzate qui. Tutte le password salvate sono crittate.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Ulteriori informazioni su Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Ulteriori informazioni sulla sincronizzazione</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Eccezioni</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Le credenziali e le password non salvate verranno mostrate qui.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s non salverà le password per i siti elencati qui.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Le credenziali e le password non verranno salvate per questi siti.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s non salverà le password per questi siti.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Elimina tutte le eccezioni</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Cerca credenziali</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Cerca nelle password</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sito</string>
     <!-- The header for the username for a login -->
@@ -1793,10 +1820,16 @@
     <string name="saved_login_hide_password">Nascondi password</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Sblocca per visualizzare le credenziali salvate</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Sblocca per visualizzare le password salvate</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Proteggi le credenziali di accesso</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Proteggi le password salvate</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare le tue credenziali.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare le password salvate.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Più tardi</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1816,6 +1849,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordina il menu delle credenziali di accesso</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu per ordinare le password</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Compilazione automatica</string>
@@ -1823,10 +1859,16 @@
     <string name="preferences_addresses">Indirizzi</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Carte di credito</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Metodi di pagamento</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Salvare e compilare automaticamente le carte</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Salva e compila i metodi di pagamento</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">I dati sono crittati</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s critta tutti i metodi di pagamento salvati</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizza le carte tra più dispositivi</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1834,17 +1876,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Aggiungi una carta di credito</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Aggiungi carta</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Gestione carte salvate</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gestisci carte</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Aggiungi indirizzo</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Gestione indirizzi</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Salvare e compilare automaticamente gli indirizzi</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Salva e compila indirizzi</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Includere informazioni come numeri, email e indirizzi di spedizione</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Include numeri di telefono e indirizzi email</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Aggiungi carta</string>
     <!-- Title of the "Edit card" screen -->
@@ -1866,6 +1917,8 @@
     <string name="credit_cards_delete_card_button">Elimina carta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Eliminare questa carta di credito?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Eliminare la carta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Elimina</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1881,14 +1934,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Inserire un numero di carta di credito valido</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Inserisci un numero di carta valido</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Compilare questo campo</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Aggiungi un nome</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Sblocca per visualizzare le carte di credito salvate</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Proteggi le tue carte di credito</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Proteggi i metodi di pagamento salvati</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare le carte di credito salvate.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare le carte di credito salvate.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Imposta adesso</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1899,6 +1960,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Sblocca per utilizzare le informazioni delle carte di credito salvate</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Sblocca per utilizzare i metodi di pagamento salvati</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Aggiungi indirizzo</string>
     <!-- Title of the "Edit address" screen -->
@@ -1937,6 +2000,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Eliminare questo indirizzo?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Eliminare questo indirizzo?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Elimina</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2035,30 +2100,52 @@
     <string name="login_menu_edit_button">Modifica</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Rimuovere queste credenziali?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Eliminare questa password?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Rimuovi</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Annulla</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Opzioni credenziali</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opzioni password</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Il campo di testo modificabile per l’indirizzo web delle credenziali</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Il campo di testo modificabile per l’indirizzo del sito web della password.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Il campo di testo modificabile per il nome utente delle credenziali</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Il campo di testo modificabile per il nome utente.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Il campo di testo modificabile per la password delle credenziali</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Il campo di testo modificabile per la password.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Salva le modifiche alle credenziali.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Salva modifiche.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Modifica</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Modifica password</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Aggiungi nuove credenziali</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Aggiungi password</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Password obbligatoria</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Inserisci una password</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Nome utente obbligatorio</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Inserisci un nome utente</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Nome server obbligatorio</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Inserisci un indirizzo web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Ricerca vocale</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2438,6 +2525,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Non tradurre mai %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Non tradurre mai questo sito</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Sostituisce tutte le altre impostazioni</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Sostituisce la scelta relativa alla proposta di traduzione</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Impostazioni traduzione</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 2b64746de..7ae3a56c4 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -326,13 +326,18 @@
     <string name="onboarding_home_enable_notifications_negative_button">לא כעת</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">הצהרת הפרטיות של Firefox</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">אנחנו אוהבים לשמור עליך</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">הדפדפן שלנו שמגובה בקרן ללא מטרות רווח מסייע למנוע מחברות לעקוב אחריך בסתר ברחבי הרשת.\n\nמידע נוסף בהצהרת הפרטיות שלנו.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">הדפדפן שלנו שמגובה בקרן ללא מטרות רווח מסייע למנוע מחברות לעקוב אחריך בסתר ברחבי הרשת.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">הדפדפן שלנו שמגובה בקרן ללא מטרות רווח מסייע למנוע מחברות לעקוב אחריך בסתר ברחבי הרשת.\n\nמידע נוסף בהצהרת הפרטיות שלנו.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">הצהרת פרטיות</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">הצהרת פרטיות</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">הגדרה כדפדפן ברירת המחדל</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -714,6 +719,8 @@
     <string name="preferences_sync_bookmarks">סימניות</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">כניסות</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">ססמאות</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">לשוניות פתוחות</string>
     <!-- Preference for signing out -->
@@ -740,6 +747,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">כרטיסי אשראי</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">אמצעי תשלום</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">כתובות</string>
 
@@ -1684,8 +1693,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">כניסות וססמאות</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">ססמאות</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">שמירת כניסות וססמאות</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">שמירת ססמאות</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">לבקש לשמור</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1704,26 +1717,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">הוספת כניסה</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">הוספת ססמה</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">סנכרון כניסות</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">סנכרון ססמאות</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">סנכרון כניסות בין מכשירים</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">סנכרון ססמאות בין מכשירים</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">כניסות שמורות</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">ססמאות שמורות</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">הכניסות שיישמרו או יסתנכרנו אל %s יופיעו כאן.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">הססמאות שיישמרו או יסונכרנו עם %s יופיעו כאן. כל הססמאות השמורות הינן מוצפנות.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">מידע נוסף על Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">מידע נוסף על סנכרון</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">חריגות</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">כניסות וססמאות שאינן שמורות יופיעו כאן.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">‏%s לא ישמור ססמאות לאתרים המפורטים כאן.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">כניסות וססמאות לא יישמרו עבור אתרים אלו.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">‏%s לא ישמור ססמאות לאתרים אלו.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">מחיקת כל החריגות</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">חיפוש כניסות</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">חיפוש ססמאות</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">אתר</string>
     <!-- The header for the username for a login -->
@@ -1752,10 +1784,16 @@
     <string name="saved_login_hide_password">הסתרת ססמה</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">יש לבטל את הנעילה כדי להציג את הכניסות השמורות שלך</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">יש לבטל את הנעילה כדי להציג את הססמאות השמורות שלך</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">שמירה מאובטחת של הכניסות והססמאות שלך</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">אבטחת הססמאות השמורות שלך</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על פרטי הגישה והססמאות השמורות שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על הססמאות השמורות שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">מאוחר יותר</string>
 
@@ -1775,6 +1813,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">תפריט מיון כניסות</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">תפריט מיון ססמאות</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">מילוי אוטומטי</string>
@@ -1782,10 +1823,16 @@
     <string name="preferences_addresses">כתובות</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">כרטיסי אשראי</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">אמצעי תשלום</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">שמירה ומילוי אוטומטי של כרטיסים</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">שמירה ומילוי אמצעי תשלום</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">הנתונים מוצפנים</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">‏%s מצפין את כל אמצעי התשלום השמורים</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">סנכרון כרטיסים בין מכשירים</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1793,8 +1840,12 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">הוספת כרטיס אשראי</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">הוספת כרטיס</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">ניהול כרטיסים שמורים</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">ניהול כרטיסים</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">הוספת כתובת</string>
     <!-- Preference option for managing saved addresses -->
@@ -1802,9 +1853,14 @@
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">שמירה ומילוי אוטומטי של כתובות</string>
 
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">שמירה ומילוי כתובות</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">לכלול מידע כמו מספרים, כתובות דוא״ל וכתובות למשלוח</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">כולל מספרי טלפון וכתובות דוא״ל</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">הוספת כרטיס</string>
     <!-- Title of the "Edit card" screen -->
@@ -1825,6 +1881,8 @@
     <string name="credit_cards_delete_card_button">מחיקת כרטיס</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">האם ברצונך למחוק את כרטיס האשראי הזה?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">למחוק את הכרטיס?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">מחיקה</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1840,14 +1898,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">נא להכניס מספר כרטיס אשראי תקין</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">נא להכניס מספר כרטיס תקני</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">נא למלא שדה זה</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">הוספת שם</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">יש לבטל את הנעילה כדי להציג את הכרטיסים השמורים שלך</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">אבטחת כרטיסי האשראי שלך</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">אבטחת אמצעי התשלום השמורים שלך</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על כרטיסי האשראי השמורים שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על אמצעי התשלום השמורים שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">להגדיר כעת</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1858,6 +1924,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">יש לבטל את הנעילה כדי להשתמש בפרטי כרטיס האשראי השמור</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">יש לבטל את הנעילה כדי להשתמש באמצעי התשלום השמורים שלך</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">הוספת כתובת</string>
     <!-- Title of the "Edit address" screen -->
@@ -1894,6 +1962,8 @@
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">האם ברצונך למחוק את כתובת זו?</string>
 
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">למחוק את הכתובת הזאת?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">מחיקה</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1993,30 +2063,52 @@
     <string name="login_menu_edit_button">עריכה</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">האם ברצונך למחוק את כניסה זו?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">האם ברצונך למחוק ססמה זו?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">מחיקה</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">ביטול</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">אפשרויות כניסה</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">אפשרויות ססמה</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">שדה הטקסט הניתן לעריכה עבור כתובת האינטרנט של הכניסה.</string>
+    <string name="saved_login_hostname_description">שדה הטקסט הניתן לעריכה עבור כתובת האתר של הכניסה.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">שדה הטקסט הניתן לעריכה עבור כתובת האתר של הססמה.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">שדה הטקסט הניתן לעריכה עבור שם המשתמש של הכניסה.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">שדה הטקסט הניתן לעריכה עבור שם המשתמש של הססמה.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">שדה הטקסט הניתן לעריכה עבור הססמה של הכניסה.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">שדה הטקסט הניתן לעריכה עבור הססמה.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">שמירת השינויים של הכניסה.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">שמירת שינויים.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">עריכה</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">עריכת הססמה</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">הוספת כניסה חדשה</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">הוספת ססמה</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">נדרשת ססמה</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">נא להכניס ססמה</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">דרוש שם משתמש</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">נא להכניס שם משתמש</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">דרוש שם מארח</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">נא להכניס כתובת אתר</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">חיפוש קולי</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2393,6 +2485,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">לעולם לא לתרגם מ%1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">לעולם לא לתרגם את אתר זה</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">עוקף את כל ההגדרות האחרות</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">עוקף הצעות לתרגום</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">הגדרות תרגום</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index abe107796..2e204dcc3 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -330,14 +330,14 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
     <string name="onboarding_home_enable_notifications_negative_button">Mačči tura</string>
 
-    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Nḥemmel ad teqqimeḍ d aɣellsan</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Iminig-nneɣ tettallit yiwet n tkebbanit ur nettnadi ɣef tedrimt, tessewḥal tikebbaniyin ara ak-iḍefren deg web.\n\nIssin ugar ɣef tsertit-nneɣ n tbaḍnit.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Iminig-nneɣ tettallit yiwet n tkebbanit ur nettnadi ɣef tedrimt, tessewḥal tikebbaniyin ara ak-iḍefren deg web.\n\nIssin ugar ɣef tsertit-nneɣ n tbaḍnit.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">tasertit n tbaḍnit</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">tasertit n tbaḍnit</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Sbadu-t d iminig amezwer</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -2292,6 +2292,9 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Action label for links to the Firefox Pocket website. Talkback will append this to say "Double tap to open link to learn more". -->
     <string name="a11y_action_label_pocket_learn_more">ldi aseɣwen i wakken ad tissineḍ ugar</string>
 
+    <!-- Title for dialog displayed when trying to access links present in a text. -->
+    <string name="a11y_links_title">Iseɣwan</string>
+
     <!-- Translations feature-->
 
     <!-- Translation request dialog -->
@@ -2330,6 +2333,9 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Section header text that begins the section of a list of different options the user may select to adjust their translation preferences. -->
     <string name="translation_settings_translation_preference">Ismenyifen n tsuqilt</string>
 
+    <!-- Preference option for never translate. Radio button title text.-->
+    <string name="automatic_translation_option_never_translate_title_preference">Werǧin attsuqleḍ</string>
+
     <!-- Content description (not visible, for screen readers etc.): For a never-translated site list item that is selected.
              The first parameter is web site url (for example:"wikipedia.com") -->
     <string name="never_translate_site_item_list_content_description_preference">Kkes %1$s</string>
@@ -2373,6 +2379,10 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
     <string name="download_language_file_dialog_negative_button_text">Sefsex</string>
 
+    <!-- Content description (not visible, for screen readers etc.): Navigate back within the debug drawer. -->
+    <string name="debug_drawer_back_button_content_description">Inig ar deffir</string>
+    <!-- The title of the Tab Tools feature in the Debug Drawer. -->
+    <string name="debug_drawer_tab_tools_title">Ifecka n yiccer</string>
     <!-- The active tab count category in the tab count section in Tab Tools. -->
     <string name="debug_drawer_tab_tools_tab_count_normal">Urmid</string>
     <!-- The inactive tab count category in the tab count section in Tab Tools. -->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 34715ce5b..157771aab 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -732,6 +732,8 @@
     <string name="preferences_sync_bookmarks">북마크</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">로그인</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">비밀번호</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">열린 탭</string>
     <!-- Preference for signing out -->
@@ -758,6 +760,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">신용 카드</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">결제 방법</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">주소</string>
 
@@ -1737,8 +1741,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">로그인과 비밀번호</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">비밀번호</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">로그인과 비밀번호 저장</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">비밀번호 저장</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">저장할지 묻기</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1756,26 +1764,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">로그인 추가</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">비밀번호 추가</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sync 로그인</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">비밀번호 동기화</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">기기 간에 로그인 동기화</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">기기 간에 비밀번호 동기화</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">저장된 로그인</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">저장된 비밀번호</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">%s에 저장하거나 동기화한 로그인이 여기에 표시됩니다.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">%s에 저장하거나 동기화한 비밀번호는 여기에 나열됩니다. 저장한 모든 비밀번호는 암호화됩니다.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Sync에 대해 더 알아보기.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">동기화에 대해 더 알아보기</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">예외 목록</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">저장되지 않은 로그인과 비밀번호가 여기에 표시됩니다.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s는 여기에 나열된 사이트의 비밀번호를 저장하지 않습니다.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">이 사이트에 대한 로그인과 비밀번호는 저장되지 않습니다.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s는 이 사이트의 비밀번호를 저장하지 않습니다.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">모든 예외 삭제</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">로그인 검색</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">비밀번호 검색</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">사이트</string>
     <!-- The header for the username for a login -->
@@ -1803,11 +1830,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">비밀번호 숨기기</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">저장된 로그인을 보려면 잠금 해제</string>
+    <string name="logins_biometric_prompt_message">저장된 로그인을 보려면 잠금 해제하세요</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">저장된 비밀번호를 보려면 잠금 해제하세요</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">로그인과 비밀번호 보안</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">저장된 비밀번호를 보호하세요</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">다른 사람이 내 기기를 가지고 있는 경우, 저장된 로그인과 비밀번호에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">다른 사람이 내 기기를 가지고 있는 경우, 저장된 비밀번호에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">나중에</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1827,6 +1860,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">로그인 정렬 메뉴</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">비밀번호 정렬 메뉴</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">자동 채우기</string>
@@ -1834,10 +1870,16 @@
     <string name="preferences_addresses">주소</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">신용 카드</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">결제 방법</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">카드 저장 및 자동 채우기</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">결제 방법 저장 및 채우기</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">데이터가 암호화됨</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s는 저장한 모든 결제 방법을 암호화합니다</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">기기 간에 카드 동기화</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1845,8 +1887,12 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">신용 카드 추가</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">카드 추가</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">저장된 카드 관리</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">카드 관리</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">주소 추가</string>
     <!-- Preference option for managing saved addresses -->
@@ -1854,9 +1900,14 @@
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">주소 저장 및 자동 채우기</string>
 
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">주소 저장 및 채우기</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">숫자, 이메일 및 배송 주소와 같은 정보 포함</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">전화번호와 이메일 주소가 포함됩니다</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">카드 추가</string>
     <!-- Title of the "Edit card" screen -->
@@ -1878,6 +1929,8 @@
     <string name="credit_cards_delete_card_button">카드 삭제</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">이 신용 카드를 삭제하시겠습니까?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">카드를 삭제하시겠습니까?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">삭제</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1893,14 +1946,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">유효한 신용 카드 번호를 입력해 주세요</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">유효한 카드 번호를 입력하세요</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">이 항목을 입력하세요.</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">이름 추가</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
-    <string name="credit_cards_biometric_prompt_message">저장된 카드를 보려면 잠금 해제</string>
+    <string name="credit_cards_biometric_prompt_message">저장된 카드를 보려면 잠금 해제하세요</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">신용 카드 보안</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">저장된 결제 수단을 보호하세요</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">다른 사람이 내 기기를 가지고 있는 경우, 저장된 신용 카드에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">다른 사람이 내 기기를 가지고 있는 경우, 저장된 카드에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">지금 설정</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1909,8 +1970,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">기기 잠금 해제</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">저장된 신용 카드 정보를 사용하려면 잠금 해제</string>
+    <string name="credit_cards_biometric_prompt_unlock_message">저장된 신용 카드 정보를 사용하려면 잠금 해제하세요</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">저장된 결제 방법을 사용하려면 잠금 해제하세요</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">주소 추가</string>
     <!-- Title of the "Edit address" screen -->
@@ -1948,6 +2011,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">이 주소를 삭제하시겠습니까?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">이 주소를 삭제하시겠습니까?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">삭제</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2047,30 +2112,52 @@
     <string name="login_menu_edit_button">편집</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">이 로그인을 삭제하시겠습니까?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">이 비밀번호를 삭제하시겠습니까?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">삭제</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">취소</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">로그인 옵션</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">비밀번호 옵션</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">로그인 웹 주소의 편집 가능한 텍스트 필드입니다.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">비밀번호의 웹 사이트 주소에 대한 편집 가능한 텍스트 필드입니다.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">로그인 사용자 이름의 편집 가능한 텍스트 필드입니다.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">비밀번호의 사용자 이름에 대한 편집 가능한 텍스트 필드입니다.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">로그인 비밀번호의 편집 가능한 텍스트 필드입니다.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">비밀번호에 대한 편집 가능한 텍스트 필드입니다.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">변경 내용을 로그인에 저장.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">변경 내용 저장.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">편집</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">비밀번호 수정</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">새 로그인 추가</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">비밀번호 추가</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">비밀번호 필요</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">비밀번호 입력</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">사용자 이름은 필수입니다</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">사용자 이름 입력</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">호스트 이름은 필수입니다</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">웹 주소 입력</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">음성 검색</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2447,6 +2534,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">항상 %1$s 번역 안 함</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">항상 이 사이트 번역 안 함</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">다른 모든 설정을 재정의</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">번역 제안을 재정의</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">번역 설정</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 7032e588a..5c95fc6c8 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -330,13 +330,18 @@
     <string name="onboarding_home_enable_notifications_negative_button">Agora não</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Aviso de privacidade do Firefox</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Adoramos manter você seguro</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Nosso navegador respaldado por uma entidade sem fins lucrativos ajuda a impedir que empresas sigam você secretamente pela web.\n\nSaiba mais em nosso aviso de privacidade.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Nosso navegador respaldado por uma entidade sem fins lucrativos ajuda a impedir que empresas sigam você secretamente pela web.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Nosso navegador respaldado por uma entidade sem fins lucrativos ajuda a impedir que empresas sigam você secretamente pela web.\n\nSaiba mais em nosso aviso de privacidade.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">aviso de privacidade</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">aviso de privacidade</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Definir como navegador padrão</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3dccedd39..2e1347e28 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -730,6 +730,8 @@
     <string name="preferences_sync_bookmarks">Закладки</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Пароли</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Пароли</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Открытые вкладки</string>
     <!-- Preference for signing out -->
@@ -756,6 +758,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Банковские карты</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Способы оплаты</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Адреса</string>
 
@@ -1720,8 +1724,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Пароли</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Пароли</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Сохранение паролей</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Сохранять пароли</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Предлагать сохранить</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1738,26 +1746,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Добавить логин</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Добавить пароль</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Синхронизация логинов</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Синхронизировать пароли</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Синхронизировать логины между устройствами</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Синхронизировать пароли между устройствами</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Сохранённые пароли</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Сохранённые пароли</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Пароли, которые вы сохраняете или синхронизируете в %s, появятся тут.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Пароли, которые вы сохраните или синхронизируете в %s, будут показаны здесь. Все сохраняемые вами пароли зашифрованы.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Узнайте больше о синхронизации.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Узнайте больше о синхронизации</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Исключения</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Здесь будут показаны не сохраняемые логины и пароли.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s не будет сохранять пароли для перечисленных здесь сайтов.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Логины и пароли для этих сайтов сохраняться не будут.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s не будет сохранять пароли для этих сайтов.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Удалить все исключения</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Поиск логинов</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Поиск паролей</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Сайт</string>
     <!-- The header for the username for a login -->
@@ -1786,10 +1814,16 @@
     <string name="saved_login_hide_password">Скрыть пароль</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Разблокируйте, чтобы просмотреть сохранённые пароли</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Разблокируйте, чтобы просмотреть сохранённые пароли</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Защитите свои логины и пароли</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Защитите сохранённые пароли</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Настройте графический ключ, Пин-код или пароль для блокировки устройства, чтобы защитить сохранённые пароли, если кто-либо ещё получит доступ к вашему устройству.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Настройте графический ключ, пин-код или пароль для разблокировки устройства, чтобы защитить сохранённые пароли на случай, если кто-либо ещё получит доступ к вашему устройству.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Позже</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1808,6 +1842,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Меню сортировки логинов</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Меню сортировки паролей</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Автозаполнение</string>
@@ -1815,10 +1852,16 @@
     <string name="preferences_addresses">Адреса</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Банковские карты</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Способы оплаты</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Сохранять и автоматически заполнять данные карт</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Сохранить и заполнять способы оплаты</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Данные зашифрованы</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s шифрует все сохраняемые вами способы оплаты</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Синхронизировать карты между различными устройствами</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1826,17 +1869,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Добавить банковскую карту</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Добавить карту</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Управление сохранёнными картами</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Управление картами</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Добавить адрес</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Управление адресами</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Сохранять и автоматически заполнять адреса</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Сохранять и заполнять адреса</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Включая такие сведения, как номера, адреса эл. почты и доставок</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Включает номера телефонов и адреса электронной почты</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Добавить карту</string>
     <!-- Title of the "Edit card" screen -->
@@ -1857,6 +1909,8 @@
     <string name="credit_cards_delete_card_button">Удалить карту</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Вы уверены, что хотите удалить эту банковскую карту?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Удалить карту?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Удалить</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1871,14 +1925,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Пожалуйста, введите правильный номер карты</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Введите корректный номер карты</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Пожалуйста, заполните это поле</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Добавьте имя</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Разблокируйте, чтобы просмотреть сохранённые карты</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Защитите свои банковские карты</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Защитите сохранённые способы оплаты</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Настройте графический ключ, Пин-код или пароль для блокировки устройства, чтобы защитить сохранённые банковские карты, если кто-либо ещё получит доступ к вашему устройству.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Настройте графический ключ, пин-код или пароль для разблокировки устройства, чтобы защитить сохранённые карты на случай, если кто-либо ещё получит доступ к вашему устройству.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Настроить сейчас</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1888,6 +1950,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Разблокируйте, чтобы использовать сохранённые данные банковской карты</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Разблокируйте, чтобы использовать сохранённые способы оплаты</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Добавить адрес</string>
     <!-- Title of the "Edit address" screen -->
@@ -1924,6 +1988,8 @@
     <string name="addressess_delete_address_button">Удалить адрес</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Вы уверены, что хотите удалить этот адрес?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Удалить этот адрес?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Удалить</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2022,30 +2088,52 @@
     <string name="login_menu_edit_button">Править</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Вы уверены, что хотите удалить этот пароль?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Вы уверены, что хотите удалить этот пароль?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Удалить</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Отмена</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Настройки логина</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Настройки пароля</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Редактируемое текстовое поле для веб-адреса логина.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Редактируемое текстовое поле для адреса веб-сайта данного пароля.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Редактируемое текстовое поле для имени пользователя логина.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Редактируемое текстовое поле для имени пользователя данного пароля.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Редактируемое текстовое поле для пароля логина.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Редактируемое текстовое поле для пароля.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Сохранить изменения в логине.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Сохранить изменения.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Правка</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Изменить пароль</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Добавить новый логин</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Добавить пароль</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Требуется пароль</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Введите пароль</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Требуется имя пользователя</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Введите имя пользователя</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Введите имя сервера</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Введите веб-адрес</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Голосовой поиск</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2421,6 +2509,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Никогда не переводить %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Никогда не переводить этот сайт</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Переопределяет все другие настройки</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Переопределяет предложения на перевод</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Настройки перевода</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 091fbb5ce..8dcbb001c 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -729,6 +729,8 @@
     <string name="preferences_sync_bookmarks">Záložky</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Prihlasovacie údaje</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Heslá</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Otvorené karty</string>
     <!-- Preference for signing out -->
@@ -755,6 +757,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Platobné karty</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Spôsoby platby</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresy</string>
 
@@ -1701,8 +1705,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Prihlasovacie údaje</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Heslá</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Ukladanie prihlasovacích údajov</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Ukladanie hesiel</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Pred uložením sa opýtať</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1719,26 +1727,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Pridať prihlasovacie údaje</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Pridať heslo</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Synchronizácia prihlasovacích údajov</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synchronizácia hesiel</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Synchronizovať prihlasovacie údaje medzi zariadeniami</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synchronizovať heslá naprieč zariadeniami</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Uložené prihlasovacie údaje</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Uložené heslá</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Uložené alebo synchronizované údaje v aplikácii %s sa zobrazia tu.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Heslá, ktoré uložíte alebo synchronizujete do %su budú zobrazené tu. Všetky heslá sú šifrované.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Ďalšie informácie o službe Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Ďalšie informácie o synchronizácii</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Výnimky</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Tu sa zobrazia prihlasovacie údaje, ktoré sa nebudú ukladať.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s nebude ukladať heslá pre tu uvedené stránky.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Pre nasledujúce stránky sa nebudú ukladať prihlasovacie údaje.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s nebude ukladať heslá pre tieto stránky.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Odstrániť všetky výnimky</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Hľadať</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Hľadať v heslách</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Stránka</string>
     <!-- The header for the username for a login -->
@@ -1767,10 +1794,16 @@
     <string name="saved_login_hide_password">Skryť heslo</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Pre zobrazenie prihlasovacích údajov odomknite zariadenie</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Ak chcete zobraziť uložené heslá, odomknite zariadenie</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Zabezpečte svoje prihlasovacie údaje</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Zabezpečte svoje heslá</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené prihlasovacie údaje v prípade, že vaše zariadenie bude používať niekto iný.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené heslá v prípade, že vaše zariadenie bude používať niekto iný.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Neskôr</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1789,6 +1822,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Zoradiť ponuku prihlasovacích údajov</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Ponuka pre zoradenie hesiel</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Automatické dopĺňanie</string>
@@ -1796,10 +1832,16 @@
     <string name="preferences_addresses">Adresy</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Platobné karty</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Spôsoby platby</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Ukladať a automaticky dopĺňať údaje o platobných kartách</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Ukladať a dopĺňať spôsoby platby</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Údaje sú šifrované</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s zašifruje všetky spôsoby platby, ktoré uložíte</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synchronizovať platobné karty naprieč zariadeniami</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1807,17 +1849,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Pridať platobnú kartu</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Pridať kartu</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Spravovať uložené karty</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Spravovať karty</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Pridať adresu</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Spravovať adresy</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Ukladať a automaticky dopĺňať adresy</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Ukladať a dopĺňať adresy</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Zahŕňa informácie ako sú čísla, e‑mailové adresy a dodacie adresy</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Zahŕňa telefónne čísla a e‑mailové adresy</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Pridať kartu</string>
     <!-- Title of the "Edit card" screen -->
@@ -1838,6 +1889,8 @@
     <string name="credit_cards_delete_card_button">Odstrániť kartu</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Naozaj chcete odstrániť túto kreditnú kartu?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Odstrániť kartu?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Odstrániť</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1852,14 +1905,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Prosím, zadajte platné číslo platobnej karty</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Zadajte platné číslo karty</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Vyplňte toto pole</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Zadajte meno</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Odomknutím zobrazíte svoje uložené kreditné karty</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Zabezpečte svoje kreditné karty</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Zabezpečte svoje uložené spôsoby platby</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené kreditné karty v prípade, že vaše zariadenie bude používať niekto iný.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené karty v prípade, že vaše zariadenie bude používať niekto iný.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Nastaviť teraz</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1869,6 +1930,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Odomknutím použijete uložené informácie o kreditnej karte</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Ak chcete použiť uložené spôsoby platby, odomknite zariadenie</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Pridať adresu</string>
     <!-- Title of the "Edit address" screen -->
@@ -1906,6 +1969,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Naozaj chcete odstrániť túto adresu?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Chcete odstrániť túto adresu?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Odstrániť</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2004,30 +2069,52 @@
     <string name="login_menu_edit_button">Upraviť</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Naozaj chcete odstrániť tieto prihlasovacie údaje?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Naozaj chcete odstrániť toto heslo?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Odstrániť</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Zrušiť</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Možnosti prihlásenia</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Možnosti hesiel</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Upraviteľné textové pole pre webovú adresu.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Upraviteľné textové pole pre webovú stránku, kde používate toto heslo.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Upraviteľné textové pole pre používateľské meno.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Upraviteľné textové pole pre používateľské meno, ktoré používate s týmto heslom.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Upraviteľné textové pole pre heslo.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Upraviteľné textové pole pre heslo.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Uložiť zmeny prihlasovacích údajov.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Uložiť zmeny</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Upraviť</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Upraviť heslo</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Pridať nové prihlasovacie údaje</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Pridať heslo</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Vyžaduje sa heslo</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Zadajte heslo</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Vyžaduje sa používateľské meno</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Zadajte používateľské meno</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Vyžaduje sa názov hostiteľa</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Zadajte webovú stránku</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Hlasové vyhľadávanie</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2403,6 +2490,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Nikdy neprekladať z jazyka %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Nikdy neprekladať túto stránku</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Prepíše všetky ostatné nastavenia</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Prepíše ponuky na preklad</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Nastavenia prekladu</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 47590c8a9..9f332f94b 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -721,6 +721,8 @@
     <string name="preferences_sync_bookmarks">Zaznamki</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Prijave</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Gesla</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Odprti zavihki</string>
     <!-- Preference for signing out -->
@@ -748,6 +750,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Kreditne kartice</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Načini plačila</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Naslove</string>
 
@@ -1698,8 +1702,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Prijave in gesla</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Gesla</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Shranjevanje prijav in gesel</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Shranjuj gesla</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Vprašaj pred shranjevanjem</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1718,16 +1726,27 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Dodaj prijavo</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Dodaj geslo</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sinhronizacija prijav</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sinhroniziraj gesla</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sinhroniziraj prijave med napravami</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sinhroniziraj gesla med napravami</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Shranjene prijave</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Shranjena gesla</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Tu se prikažejo prijave, ki jih shranite ali sinhronizirate v %s.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Več o Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Več o sinhronizaciji</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Izjeme</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
@@ -1809,14 +1828,20 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Dodaj kreditno kartico</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Dodaj kartico</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Upravljanje shranjenih kartic</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Upravljanje kartic</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Dodaj naslov</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Upravljanje naslovov</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Shranjuj in samodejno izpolnjuj naslove</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Shranjuj in izpolnjuj naslove</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Vključi podatke, kot so številke, e-poštni naslovi in naslovi za dostavo</string>
 
@@ -1855,8 +1880,12 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Vnesite veljavno številko kreditne kartice</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Vnesite veljavno številko kartice</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Izpolnite to polje</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Dodajte ime</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Odklenite za ogled shranjenih kartic</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
@@ -2016,24 +2045,44 @@
     <string name="dialog_delete_negative">Prekliči</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Možnosti prijave</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Možnosti gesel</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Besedilno polje za urejanje spletnega naslova prijave.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Besedilno polje za urejanje naslova spletnega mesta, ki mu pripada geslo.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Besedilno polje za urejanje uporabniškega imena prijave.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Besedilno polje za urejanje uporabniškega imena, ki pripada geslu.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Besedilno polje za urejanje gesla prijave.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Besedilno polje za urejanje gesla.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Shrani spremembe v prijavo.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Shrani spremembe.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Urejanje</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Uredi geslo</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Dodaj novo prijavo</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Dodaj geslo</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Zahtevano je geslo</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Vnesite geslo</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Zahtevano je uporabniško ime</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Vnesite uporabniško ime</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Zahtevano je ime domene</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Vnesite spletni naslov</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Glasovno iskanje</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
diff --git a/app/src/main/res/values-tg/strings.xml b/app/src/main/res/values-tg/strings.xml
index 80da7812d..06120253d 100644
--- a/app/src/main/res/values-tg/strings.xml
+++ b/app/src/main/res/values-tg/strings.xml
@@ -330,13 +330,18 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ҳоло не</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Огоҳномаи махфияти «Firefox»</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Мо нигоҳдории бехатарии шуморо дӯст медорем</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Браузери мо, ки аз ҷониби ташкилоти ғайритиҷоратӣ дастгирӣ мешавад, маъракаҳоеро манъ мекунад, ки шуморо ба таври пинҳонӣ дар ҳудуди Интернет пайгирӣ мекунанд.\n\nМаълумоти бештар дар Огоҳномаи махфияти мо.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Браузери мо, ки аз ҷониби ташкилоти ғайритиҷоратӣ дастгирӣ мешавад, маъракаҳоеро, ки шуморо дар атрофи Интернет пинҳонӣ пайгирӣ мекунанд, қатъ мекунад.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Браузери мо, ки аз ҷониби ташкилоти ғайритиҷоратӣ дастгирӣ мешавад, маъракаҳоеро манъ мекунад, ки шуморо ба таври пинҳонӣ дар ҳудуди Интернет пайгирӣ мекунанд.\n\nМаълумоти бештар дар Огоҳномаи махфияти мо.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">огоҳномаи махфият</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">огоҳномаи махфият</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Гузоштан ҳамчун браузери пешфарз</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->

From 8ed8e283ef7328eac3270dbd9ebf0f8050f085f8 Mon Sep 17 00:00:00 2001
From: sarah541 <sarahkhan1107@hotmail.com>
Date: Tue, 18 Jul 2023 10:49:02 -0400
Subject: [PATCH 010/222] Bug 1834842 - Replace Hardcoded SERP Telemetry

---
 app/build.gradle                                              | 2 +-
 .../org/mozilla/fenix/components/metrics/MetricController.kt  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index cecd28894..5653cbaba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -347,7 +347,7 @@ android.applicationVariants.configureEach { variant ->
     if (!isDebug) {
         buildConfigField 'boolean', 'TELEMETRY', 'true'
     } else {
-        buildConfigField 'boolean', 'TELEMETRY', 'false'
+        buildConfigField 'boolean', 'TELEMETRY', 'true'
     }
 
     def buildDate = Config.generateBuildDate()
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt
index 453ff4750..7dd5ddf86 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.components.metrics
 
+import android.util.Log
 import androidx.annotation.VisibleForTesting
 import mozilla.components.browser.menu.facts.BrowserMenuFacts
 import mozilla.components.browser.toolbar.facts.ToolbarFacts
@@ -390,13 +391,16 @@ internal class ReleaseMetricController(
         }
 
         Component.FEATURE_SEARCH to AdsTelemetry.SERP_ADD_CLICKED -> {
+            Log.d("Sarah", "SERP_ADD_CLICKED")
             BrowserSearch.adClicks[value!!].add()
             track(Event.GrowthData.SerpAdClicked)
         }
         Component.FEATURE_SEARCH to AdsTelemetry.SERP_SHOWN_WITH_ADDS -> {
+            Log.d("Sarah", "SERP_SHOWN_WITH_ADDS")
             BrowserSearch.withAds[value!!].add()
         }
         Component.FEATURE_SEARCH to InContentTelemetry.IN_CONTENT_SEARCH -> {
+            Log.d("Sarah", "IN_CONTENT_SEARCH")
             BrowserSearch.inContent[value!!].add()
             track(Event.GrowthData.UserActivated(fromSearch = true))
         }

From a38cb0b85303a66235be99d5f97b0cf967d924c3 Mon Sep 17 00:00:00 2001
From: sarah541 <sarahkhan1107@hotmail.com>
Date: Fri, 27 Oct 2023 12:49:39 -0400
Subject: [PATCH 011/222] Bug 1834842 - integrate updated SERP telemetry with
 Remote Settings Client

---
 app/build.gradle                                    |  2 +-
 .../main/java/org/mozilla/fenix/components/Core.kt  | 13 +++++++++----
 .../fenix/components/metrics/MetricController.kt    |  4 ----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5653cbaba..cecd28894 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -347,7 +347,7 @@ android.applicationVariants.configureEach { variant ->
     if (!isDebug) {
         buildConfigField 'boolean', 'TELEMETRY', 'true'
     } else {
-        buildConfigField 'boolean', 'TELEMETRY', 'true'
+        buildConfigField 'boolean', 'TELEMETRY', 'false'
     }
 
     def buildDate = Config.generateBuildDate()
diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt
index e1978453a..ec0e77e87 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -12,6 +12,9 @@ import androidx.appcompat.content.res.AppCompatResources.getDrawable
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
 import androidx.datastore.preferences.preferencesDataStore
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import mozilla.components.browser.domains.autocomplete.BaseDomainAutocompleteProvider
 import mozilla.components.browser.domains.autocomplete.ShippedDomainsProvider
 import mozilla.components.browser.engine.gecko.GeckoEngine
@@ -309,11 +312,13 @@ class Core(
             // Install the "icons" WebExtension to automatically load icons for every visited website.
             icons.install(engine, this)
 
-            // Install the "ads" WebExtension to get the links in an partner page.
-            adsTelemetry.install(engine, this)
+            CoroutineScope(Dispatchers.Main).launch {
+                // Install the "ads" WebExtension to get the links in an partner page.
+                adsTelemetry.install(engine, this@apply, context.filesDir)
 
-            // Install the "cookies" WebExtension and tracks user interaction with SERPs.
-            searchTelemetry.install(engine, this)
+                // Install the "cookies" WebExtension and tracks user interaction with SERPs.
+                searchTelemetry.install(engine, this@apply, context.filesDir)
+            }
 
             WebNotificationFeature(
                 context,
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt
index 7dd5ddf86..453ff4750 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.fenix.components.metrics
 
-import android.util.Log
 import androidx.annotation.VisibleForTesting
 import mozilla.components.browser.menu.facts.BrowserMenuFacts
 import mozilla.components.browser.toolbar.facts.ToolbarFacts
@@ -391,16 +390,13 @@ internal class ReleaseMetricController(
         }
 
         Component.FEATURE_SEARCH to AdsTelemetry.SERP_ADD_CLICKED -> {
-            Log.d("Sarah", "SERP_ADD_CLICKED")
             BrowserSearch.adClicks[value!!].add()
             track(Event.GrowthData.SerpAdClicked)
         }
         Component.FEATURE_SEARCH to AdsTelemetry.SERP_SHOWN_WITH_ADDS -> {
-            Log.d("Sarah", "SERP_SHOWN_WITH_ADDS")
             BrowserSearch.withAds[value!!].add()
         }
         Component.FEATURE_SEARCH to InContentTelemetry.IN_CONTENT_SEARCH -> {
-            Log.d("Sarah", "IN_CONTENT_SEARCH")
             BrowserSearch.inContent[value!!].add()
             track(Event.GrowthData.UserActivated(fromSearch = true))
         }

From f1ea10205394d9fb9301e427f8fd91a8d02d796c Mon Sep 17 00:00:00 2001
From: sarah541 <sarahkhan1107@hotmail.com>
Date: Thu, 7 Dec 2023 01:35:57 -0500
Subject: [PATCH 012/222] Bug 1870066 - Add local dump and additonal logic

---
 .../java/org/mozilla/fenix/components/Core.kt | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt
index ec0e77e87..e87e48814 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -15,6 +15,7 @@ import androidx.datastore.preferences.preferencesDataStore
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import mozilla.components.browser.domains.autocomplete.BaseDomainAutocompleteProvider
 import mozilla.components.browser.domains.autocomplete.ShippedDomainsProvider
 import mozilla.components.browser.engine.gecko.GeckoEngine
@@ -59,6 +60,7 @@ import mozilla.components.feature.search.middleware.AdsTelemetryMiddleware
 import mozilla.components.feature.search.middleware.SearchExtraParams
 import mozilla.components.feature.search.middleware.SearchMiddleware
 import mozilla.components.feature.search.region.RegionMiddleware
+import mozilla.components.feature.search.telemetry.SerpTelemetryRepository
 import mozilla.components.feature.search.telemetry.ads.AdsTelemetry
 import mozilla.components.feature.search.telemetry.incontent.InContentTelemetry
 import mozilla.components.feature.session.HistoryDelegate
@@ -85,6 +87,7 @@ import mozilla.components.service.pocket.Profile
 import mozilla.components.service.sync.autofill.AutofillCreditCardsAddressesStorage
 import mozilla.components.service.sync.logins.SyncableLoginsStorage
 import mozilla.components.support.base.worker.Frequency
+import mozilla.components.support.ktx.android.content.res.readJSONObject
 import mozilla.components.support.locale.LocaleManager
 import org.mozilla.fenix.AppRequestInterceptor
 import org.mozilla.fenix.BuildConfig
@@ -313,11 +316,18 @@ class Core(
             icons.install(engine, this)
 
             CoroutineScope(Dispatchers.Main).launch {
+                val readJson = { context.assets.readJSONObject("search/search_telemetry_v2.json") }
+                val providerList = withContext(Dispatchers.IO) {
+                    SerpTelemetryRepository(
+                        rootStorageDirectory = context.filesDir,
+                        readJson = readJson,
+                        collectionName = COLLECTION_NAME,
+                    ).updateProviderList()
+                }
                 // Install the "ads" WebExtension to get the links in an partner page.
-                adsTelemetry.install(engine, this@apply, context.filesDir)
-
+                adsTelemetry.install(engine, this@apply, providerList)
                 // Install the "cookies" WebExtension and tracks user interaction with SERPs.
-                searchTelemetry.install(engine, this@apply, context.filesDir)
+                searchTelemetry.install(engine, this@apply, providerList)
             }
 
             WebNotificationFeature(
@@ -603,5 +613,8 @@ class Core(
 
         // Maximum number of suggestions returned from shortcut search engine.
         const val METADATA_SHORTCUT_SUGGESTION_LIMIT = 20
+
+        // collection name to fetch from server for SERP telemetry
+        const val COLLECTION_NAME = "search-telemetry-v2"
     }
 }

From 22e4f2b9e49558841ad67dffe6e1d0f82a43d0cc Mon Sep 17 00:00:00 2001
From: RebecaTudor <rebecatudor273@gmail.com>
Date: Fri, 19 Jan 2024 11:53:16 +0200
Subject: [PATCH 013/222] Bug 1838580 - [a11y] Increase tap area for search
 engine icon

The touching area for search engine icon (Google by default) from
the search bar was only 28dp.
To Increase tap area to reach the minimum accessibility touch target
size of 48dp, it was used TouchDelegate. This way there are no visual
changes.
---
 app/src/main/java/org/mozilla/fenix/ext/View.kt | 17 +++++++++++++++++
 .../fenix/home/toolbar/SearchSelectorBinding.kt |  7 +++++++
 2 files changed, 24 insertions(+)

diff --git a/app/src/main/java/org/mozilla/fenix/ext/View.kt b/app/src/main/java/org/mozilla/fenix/ext/View.kt
index 83a02b7c1..3c5976e42 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/View.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/View.kt
@@ -30,6 +30,23 @@ fun View.increaseTapArea(@Dimension(unit = DP) extraDps: Int) {
     }
 }
 
+/**
+ * Increase tap area only vertically.
+ *
+ * @param extraDps the extra dps that's wanted to be added on top and bottom of the view
+ */
+fun View.increaseTapAreaVertically(@Dimension(unit = DP) extraDps: Int) {
+    val dips = extraDps.dpToPx(resources.displayMetrics)
+    val parent = this.parent as View
+    parent.post {
+        val touchArea = Rect()
+        getHitRect(touchArea)
+        touchArea.top -= dips
+        touchArea.bottom += dips
+        parent.touchDelegate = TouchDelegate(touchArea, this)
+    }
+}
+
 fun View.removeTouchDelegate() {
     val parent = this.parent as View
     parent.post {
diff --git a/app/src/main/java/org/mozilla/fenix/home/toolbar/SearchSelectorBinding.kt b/app/src/main/java/org/mozilla/fenix/home/toolbar/SearchSelectorBinding.kt
index 3696c628d..6a6b92684 100644
--- a/app/src/main/java/org/mozilla/fenix/home/toolbar/SearchSelectorBinding.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/toolbar/SearchSelectorBinding.kt
@@ -20,6 +20,7 @@ import mozilla.components.support.ktx.android.content.getColorFromAttr
 import org.mozilla.fenix.GleanMetrics.UnifiedSearch
 import org.mozilla.fenix.R
 import org.mozilla.fenix.databinding.FragmentHomeBinding
+import org.mozilla.fenix.ext.increaseTapAreaVertically
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.search.toolbar.SearchSelectorMenu
 
@@ -51,6 +52,8 @@ class SearchSelectorBinding(
                     orientation = orientation,
                 )
             }
+
+            increaseTapAreaVertically(SEARCH_SELECTOR_INCREASE_HEIGHT_DPS)
         }
     }
 
@@ -76,4 +79,8 @@ class SearchSelectorBinding(
                 binding.searchSelectorButton.setIcon(icon, name)
             }
     }
+
+    companion object {
+        const val SEARCH_SELECTOR_INCREASE_HEIGHT_DPS = 10
+    }
 }

From bc729a894eab4caa69f0e27d35fcc3e704073fe0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 15:53:55 +0000
Subject: [PATCH 014/222] Update to GeckoView Nightly 124.0.20240123053648 on
 main (#5258)

* Update GeckoView (Nightly) to 124.0.20240123053648.

* Update Glean to 56.1.0.

* Bug 1870050 - Properly define buildConfigField SUPPORTED_LOCALE_ARRAY

This was previously generated as a side effect, and fails with the new AGP version.
See also https://github.com/mozilla-mobile/fenix/issues/14175.

---------

Co-authored-by: MickeyMoz <sebastian@mozilla.com>
Co-authored-by: mcarare <48995920+mcarare@users.noreply.github.com>
Co-authored-by: dsmithpadilla <88508950+dsmithpadilla@users.noreply.github.com>
---
 app/build.gradle | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cecd28894..bacca9711 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -82,6 +82,8 @@ android {
                 "targetActivity": targetActivity,
                 "deepLinkScheme": deepLinkSchemeValue
         ]
+
+        buildConfigField "String[]", "SUPPORTED_LOCALE_ARRAY", getSupportedLocales()
     }
 
     def releaseTemplate = {
@@ -488,7 +490,6 @@ android.applicationVariants.configureEach { variant ->
     } else {
         buildConfigField "boolean", "LEAKCANARY", "false"
     }
-
 }
 
 // Generate Kotlin code for the Fenix Glean metrics.
@@ -819,25 +820,6 @@ tasks.register('printVariants') {
     }
 }
 
-tasks.register('buildTranslationArray') {
-    // This isn't running as a task, instead the array is build when the gradle file is parsed.
-    // https://github.com/mozilla-mobile/fenix/issues/14175
-    def foundLocales = new StringBuilder()
-    foundLocales.append("new String[]{")
-
-    fileTree("src/main/res").visit { FileVisitDetails details ->
-        if (details.file.path.endsWith("${File.separator}strings.xml")) {
-            def languageCode = details.file.parent.tokenize(File.separator).last().replaceAll('values-', '').replaceAll('-r', '-')
-            languageCode = (languageCode == "values") ? "en-US" : languageCode
-            foundLocales.append("\"").append(languageCode).append("\"").append(",")
-        }
-    }
-
-    foundLocales.append("}")
-    def foundLocalesString = foundLocales.toString().replaceAll(',}', '}')
-    android.defaultConfig.buildConfigField "String[]", "SUPPORTED_LOCALE_ARRAY", foundLocalesString
-}
-
 afterEvaluate {
 
     // Format test output. Ported from AC #2401
@@ -904,5 +886,24 @@ android.applicationVariants.configureEach { variant ->
     }
 }
 
+def getSupportedLocales() {
+    // This isn't running as a task, instead the array is build when the gradle file is parsed.
+    // https://github.com/mozilla-mobile/fenix/issues/14175
+    def foundLocales = new StringBuilder()
+    foundLocales.append("new String[]{")
+
+    fileTree("src/main/res").visit { FileVisitDetails details ->
+        if (details.file.path.endsWith("${File.separator}strings.xml")) {
+            def languageCode = details.file.parent.tokenize(File.separator).last().replaceAll('values-', '').replaceAll('-r', '-')
+            languageCode = (languageCode == "values") ? "en-US" : languageCode
+            foundLocales.append("\"").append(languageCode).append("\"").append(",")
+        }
+    }
+
+    foundLocales.append("}")
+    def foundLocalesString = foundLocales.toString().replaceAll(',}', '}')
+    return foundLocalesString
+}
+
 // Enable expiration by major version.
 ext.gleanExpireByVersion = Config.majorVersion()

From 0251620c54662e7879092057b1bf9f860363c5a1 Mon Sep 17 00:00:00 2001
From: "oana.horvath" <ohorvath@mozilla.com>
Date: Mon, 22 Jan 2024 12:44:41 +0200
Subject: [PATCH 015/222] Bug 1818183 - Fix shortcut not showing up in top
 sites UI test

---
 .../mozilla/fenix/ui/ComposeTopSitesTest.kt   | 23 +++++++++++++++++++
 .../java/org/mozilla/fenix/ui/TopSitesTest.kt | 23 +++++++++++++++++++
 .../fenix/ui/robots/ComposeTopSitesRobot.kt   |  6 ++---
 .../fenix/ui/robots/HomeScreenRobot.kt        |  7 +++---
 4 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTopSitesTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTopSitesTest.kt
index 5168ef1c7..a648e4d6d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTopSitesTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTopSitesTest.kt
@@ -66,8 +66,12 @@ class ComposeTopSitesTest {
     fun addAWebsiteAsATopSiteTest() {
         val defaultWebPage = getGenericAsset(mockWebServer, 1)
 
+        homeScreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+        }
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
             expandMenu()
             verifyAddToShortcutsButton(true)
@@ -84,8 +88,12 @@ class ComposeTopSitesTest {
     fun openTopSiteInANewTabTest() {
         val defaultWebPage = getGenericAsset(mockWebServer, 1)
 
+        homeScreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+        }
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
             expandMenu()
             verifyAddToShortcutsButton(true)
@@ -112,8 +120,12 @@ class ComposeTopSitesTest {
     fun openTopSiteInANewPrivateTabTest() {
         val defaultWebPage = getGenericAsset(mockWebServer, 1)
 
+        homeScreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+        }
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
             expandMenu()
             verifyAddToShortcutsButton(true)
@@ -135,6 +147,9 @@ class ComposeTopSitesTest {
         val defaultWebPage = getGenericAsset(mockWebServer, 1)
         val newPageTitle = generateRandomString(5)
 
+        homeScreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+        }
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
             waitForPageToLoad()
@@ -159,8 +174,12 @@ class ComposeTopSitesTest {
     fun removeTopSiteUsingMenuButtonTest() {
         val defaultWebPage = getGenericAsset(mockWebServer, 1)
 
+        homeScreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+        }
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
             expandMenu()
             verifyAddToShortcutsButton(true)
@@ -186,8 +205,12 @@ class ComposeTopSitesTest {
     fun removeTopSiteFromMainMenuTest() {
         val defaultWebPage = getGenericAsset(mockWebServer, 1)
 
+        homeScreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+        }
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
             expandMenu()
             verifyAddToShortcutsButton(true)
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
index 7858a5224..a8ecb1758 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
@@ -61,8 +61,12 @@ class TopSitesTest {
     fun addAWebsiteAsATopSiteTest() {
         val defaultWebPage = getGenericAsset(mockWebServer, 1)
 
+        homeScreen {
+            verifyExistingTopSitesList()
+        }
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
             expandMenu()
             verifyAddToShortcutsButton(shouldExist = true)
@@ -79,8 +83,12 @@ class TopSitesTest {
     fun openTopSiteInANewTabTest() {
         val defaultWebPage = getGenericAsset(mockWebServer, 1)
 
+        homeScreen {
+            verifyExistingTopSitesList()
+        }
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
             expandMenu()
             verifyAddToShortcutsButton(shouldExist = true)
@@ -107,8 +115,12 @@ class TopSitesTest {
     fun openTopSiteInANewPrivateTabTest() {
         val defaultWebPage = getGenericAsset(mockWebServer, 1)
 
+        homeScreen {
+            verifyExistingTopSitesList()
+        }
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
             expandMenu()
             verifyAddToShortcutsButton(shouldExist = true)
@@ -130,6 +142,9 @@ class TopSitesTest {
         val defaultWebPage = getGenericAsset(mockWebServer, 1)
         val newPageTitle = generateRandomString(5)
 
+        homeScreen {
+            verifyExistingTopSitesList()
+        }
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
             waitForPageToLoad()
@@ -154,8 +169,12 @@ class TopSitesTest {
     fun removeTopSiteUsingMenuButtonTest() {
         val defaultWebPage = getGenericAsset(mockWebServer, 1)
 
+        homeScreen {
+            verifyExistingTopSitesList()
+        }
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
             expandMenu()
             verifyAddToShortcutsButton(shouldExist = true)
@@ -181,8 +200,12 @@ class TopSitesTest {
     fun removeTopSiteFromMainMenuTest() {
         val defaultWebPage = getGenericAsset(mockWebServer, 1)
 
+        homeScreen {
+            verifyExistingTopSitesList()
+        }
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
             expandMenu()
             verifyAddToShortcutsButton(shouldExist = true)
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt
index 0edba483d..8493d3ee7 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt
@@ -16,14 +16,12 @@ import androidx.compose.ui.test.onFirst
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performScrollTo
 import androidx.compose.ui.test.performTouchInput
-import androidx.test.uiautomator.UiSelector
 import org.mozilla.fenix.helpers.HomeActivityComposeTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
-import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.packageName
 import org.mozilla.fenix.home.topsites.TopSitesTestTag
 
@@ -34,13 +32,13 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
 
     @OptIn(ExperimentalTestApi::class)
     fun verifyExistingTopSitesList() {
-        composeTestRule.waitUntilExactlyOneExists(hasTestTag(TopSitesTestTag.topSites), timeoutMillis = waitingTime)
+        composeTestRule.waitUntilAtLeastOneExists(hasTestTag(TopSitesTestTag.topSites), timeoutMillis = waitingTime)
     }
 
     @OptIn(ExperimentalTestApi::class)
     fun verifyExistingTopSiteItem(vararg titles: String) {
         titles.forEach { title ->
-            mDevice.findObject(UiSelector().textContains(title)).waitForExists(waitingTimeShort)
+            composeTestRule.waitUntilAtLeastOneExists(hasText(title), timeoutMillis = waitingTime)
             composeTestRule.topSiteItem(title).assertExists()
         }
     }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
index d3e78c462..286851db9 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
@@ -215,7 +215,9 @@ class HomeScreenRobot {
     fun verifyCommonMythsLink() =
         assertUIObjectExists(itemContainingText(getStringResource(R.string.private_browsing_common_myths)))
 
-    fun verifyExistingTopSitesList() = assertExistingTopSitesList()
+    fun verifyExistingTopSitesList() =
+        assertUIObjectExists(itemWithResId("$packageName:id/top_sites_list"))
+
     fun verifyNotExistingTopSitesList(title: String) = assertNotExistingTopSitesList(title)
     fun verifySponsoredShortcutDoesNotExist(sponsoredShortcutTitle: String, position: Int) =
         assertUIObjectExists(
@@ -846,9 +848,6 @@ private fun assertHomeComponent() =
 
 private fun threeDotButton() = onView(allOf(withId(R.id.menuButton)))
 
-private fun assertExistingTopSitesList() =
-    assertUIObjectExists(itemWithResId("$packageName:id/top_sites_list"))
-
 private fun assertExistingTopSitesTabs(title: String) {
     mDevice.findObject(
         UiSelector()

From e58d0ae97360639b10304541755c98f443f1c1ab Mon Sep 17 00:00:00 2001
From: jackyzy823 <jackyzy823@gmail.com>
Date: Wed, 30 Aug 2023 11:22:51 +0200
Subject: [PATCH 016/222] Bug 1850006 - conservative flag limits to mozilla
 services only

---
 app/src/main/java/org/mozilla/fenix/ext/Client.kt               | 2 +-
 app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt       | 1 +
 .../java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt    | 1 +
 .../org/mozilla/fenix/wallpapers/WallpaperMetadataFetcher.kt    | 2 +-
 .../org/mozilla/fenix/wallpapers/WallpaperDownloaderTest.kt     | 1 +
 .../mozilla/fenix/wallpapers/WallpaperMetadataFetcherTest.kt    | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/ext/Client.kt b/app/src/main/java/org/mozilla/fenix/ext/Client.kt
index 99d3e79e2..513aca10d 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/Client.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/Client.kt
@@ -21,7 +21,7 @@ suspend fun Client.bitmapForUrl(url: String): Bitmap? = withContext(Dispatchers.
     // Code below will cache it in Gecko's cache, which ensures that as long as we've fetched it once,
     // we will be able to display this avatar as long as the cache isn't purged (e.g. via 'clear user data').
     val body = try {
-        fetch(Request(url, useCaches = true)).body
+        fetch(Request(url, useCaches = true, conservative = true)).body
     } catch (e: IOException) {
         return@withContext null
     }
diff --git a/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt b/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
index a71b0e3cc..2808bb36e 100644
--- a/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
+++ b/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
@@ -133,6 +133,7 @@ object ProfilerUtils {
                 "Accept" to PROFILER_SERVER_HEADER,
             ),
             body = Request.Body.fromFile(outputFile),
+            conservative = true,
         )
         return context.components.core.client.fetch(request)
     }
diff --git a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt
index 2beff12a7..5c8fac128 100644
--- a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt
+++ b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt
@@ -73,6 +73,7 @@ class WallpaperDownloader(
         val request = Request(
             url = "$remoteHost/$remotePath",
             method = Request.Method.GET,
+            conservative = true,
         )
 
         return@withContext Result.runCatching {
diff --git a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperMetadataFetcher.kt b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperMetadataFetcher.kt
index 96a50ee57..74b24f954 100644
--- a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperMetadataFetcher.kt
+++ b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperMetadataFetcher.kt
@@ -32,7 +32,7 @@ class WallpaperMetadataFetcher(
      */
     suspend fun downloadWallpaperList(): List<Wallpaper> = withContext(Dispatchers.IO) {
         Result.runCatching {
-            val request = Request(url = metadataUrl, method = Request.Method.GET)
+            val request = Request(url = metadataUrl, method = Request.Method.GET, conservative = true)
             val response = client.fetch(request)
             response.body.useBufferedReader {
                 val json = it.readText()
diff --git a/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperDownloaderTest.kt b/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperDownloaderTest.kt
index 821f523b8..2736ca062 100644
--- a/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperDownloaderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperDownloaderTest.kt
@@ -141,5 +141,6 @@ class WallpaperDownloaderTest {
     private fun Wallpaper.generateRequest(type: String) = Request(
         url = "$remoteHost/${collection.name}/$name/$type.png",
         method = Request.Method.GET,
+        conservative = true,
     )
 }
diff --git a/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperMetadataFetcherTest.kt b/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperMetadataFetcherTest.kt
index ff1ad66ff..35fcd694e 100644
--- a/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperMetadataFetcherTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperMetadataFetcherTest.kt
@@ -29,6 +29,7 @@ class WallpaperMetadataFetcherTest {
         url = BuildConfig.WALLPAPER_URL.substringBefore("android") +
             "metadata/v$currentJsonVersion/wallpapers.json",
         method = Request.Method.GET,
+        conservative = true,
     )
     private val mockResponse = mockk<Response>()
     private val mockClient = mockk<Client> {

From 15aeb19be2c14fbe4c4a3ee0980905245f6f3bfb Mon Sep 17 00:00:00 2001
From: JohanLorenzo <JohanLorenzo@users.noreply.github.com>
Date: Tue, 23 Jan 2024 19:32:10 +0000
Subject: [PATCH 017/222] Update Fenix initial_experiments.json based on the
 current first-run experiments in experimenter

---
 app/src/main/res/raw/initial_experiments.json | 168 ++++++++++++++++++
 1 file changed, 168 insertions(+)

diff --git a/app/src/main/res/raw/initial_experiments.json b/app/src/main/res/raw/initial_experiments.json
index a28f39a84..d101bbd3e 100644
--- a/app/src/main/res/raw/initial_experiments.json
+++ b/app/src/main/res/raw/initial_experiments.json
@@ -56,6 +56,174 @@
       "localizations": null,
       "locales": null
     },
+    {
+      "schemaVersion": "1.12.0",
+      "slug": "beta-fx-122-android-set-to-default-notifications-timing-experiment",
+      "id": "beta-fx-122-android-set-to-default-notifications-timing-experiment",
+      "arguments": {},
+      "application": "org.mozilla.firefox",
+      "appName": "fenix",
+      "appId": "org.mozilla.firefox",
+      "channel": "release",
+      "userFacingName": "Fx 122 Android set to default notifications timing experiment",
+      "userFacingDescription": "Timing test for the set to default message on Firefox for Android (Fenix).",
+      "isEnrollmentPaused": false,
+      "isRollout": false,
+      "bucketConfig": {
+        "randomizationUnit": "nimbus_id",
+        "namespace": "fenix-messaging-release-19",
+        "start": 0,
+        "count": 10000,
+        "total": 10000
+      },
+      "featureIds": [
+        "messaging"
+      ],
+      "probeSets": [],
+      "outcomes": [
+        {
+          "slug": "default-browser",
+          "priority": "primary"
+        }
+      ],
+      "branches": [
+        {
+          "slug": "control",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "messaging",
+              "enabled": true,
+              "value": {
+                "messages": {
+                  "{experiment}-en": {
+                    "is-control": true,
+                    "surface": "notification",
+                    "style": "NOTIFICATION",
+                    "action": "MAKE_DEFAULT_BROWSER",
+                    "trigger": [
+                      "I_AM_NOT_DEFAULT_BROWSER"
+                    ],
+                    "experiment": "{experiment}"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        {
+          "slug": "treatment-a",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "messaging",
+              "enabled": true,
+              "value": {
+                "messages": {
+                  "{experiment}-en": {
+                    "title": "Firefox is Fast and Private",
+                    "text": "Make Firefox your default browser",
+                    "surface": "notification",
+                    "style": "NOTIFICATION",
+                    "action": "MAKE_DEFAULT_BROWSER",
+                    "trigger": [
+                      "DAY_1_AFTER_INSTALL",
+                      "I_AM_NOT_DEFAULT_BROWSER"
+                    ],
+                    "experiment": "{experiment}"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        {
+          "slug": "treatment-b",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "messaging",
+              "enabled": true,
+              "value": {
+                "messages": {
+                  "{experiment}-en": {
+                    "title": "Firefox is Fast and Private",
+                    "text": "Make Firefox your default browser",
+                    "surface": "notification",
+                    "style": "NOTIFICATION",
+                    "action": "MAKE_DEFAULT_BROWSER",
+                    "trigger": [
+                      "DAY_3_AFTER_INSTALL",
+                      "I_AM_NOT_DEFAULT_BROWSER"
+                    ],
+                    "experiment": "{experiment}"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        {
+          "slug": "treatment-c",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "messaging",
+              "enabled": true,
+              "value": {
+                "messages": {
+                  "{experiment}-en": {
+                    "title": "Firefox is Fast and Private",
+                    "text": "Make Firefox your default browser",
+                    "surface": "notification",
+                    "style": "NOTIFICATION",
+                    "action": "MAKE_DEFAULT_BROWSER",
+                    "trigger": [
+                      "DAY_6_AFTER_INSTALL",
+                      "I_AM_NOT_DEFAULT_BROWSER"
+                    ],
+                    "experiment": "{experiment}"
+                  }
+                },
+                "triggers": {
+                  "DAY_6_AFTER_INSTALL": "days_since_install == 6"
+                }
+              }
+            }
+          ]
+        }
+      ],
+      "targeting": "((is_already_enrolled) || ((isFirstRun == 'true') && (app_version|versionCompare('122.!') >= 0) && (language in ['en'])))",
+      "startDate": "2024-01-23",
+      "enrollmentEndDate": null,
+      "endDate": null,
+      "proposedDuration": 43,
+      "proposedEnrollment": 14,
+      "referenceBranch": "control",
+      "featureValidationOptOut": false,
+      "localizations": null,
+      "locales": null
+    },
     {
       "schemaVersion": "1.12.0",
       "slug": "splash-screen-test",

From e1f03ba3c9c2ead79df06ad508c92fcb0e703a7e Mon Sep 17 00:00:00 2001
From: jackyzy823 <jackyzy823@gmail.com>
Date: Sun, 18 Jun 2023 14:15:29 +0000
Subject: [PATCH 018/222] Bug 1839067 - Ensure response's body closed whether
 request is success or not.

---
 .../org/mozilla/fenix/settings/search/SearchStringValidator.kt  | 2 +-
 .../java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/SearchStringValidator.kt b/app/src/main/java/org/mozilla/fenix/settings/search/SearchStringValidator.kt
index 5249dcd17..0ae278057 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/search/SearchStringValidator.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/search/SearchStringValidator.kt
@@ -28,7 +28,7 @@ object SearchStringValidator {
         }
 
         // read the response stream to ensure the body is closed correctly. workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1603114
-        response.body.close()
+        response.close()
         return if (response.isSuccess ||
             isTestQueryParamNotFound(response.status)
         ) {
diff --git a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt
index 5c8fac128..c0f72944c 100644
--- a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt
+++ b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt
@@ -79,6 +79,7 @@ class WallpaperDownloader(
         return@withContext Result.runCatching {
             val response = client.fetch(request)
             if (!response.isSuccess) {
+                response.close()
                 throw IllegalStateException()
             }
             localFile.parentFile?.mkdirs()

From 5b7d7e11240f6f692510f87fb22a59e7df247988 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Wed, 24 Jan 2024 00:04:12 +0000
Subject: [PATCH 019/222] Import translations from android-l10n

---
 app/src/main/res/values-fr/strings.xml     | 91 +++++++++++++++++++++
 app/src/main/res/values-hsb/strings.xml    | 85 ++++++++++++++++++++
 app/src/main/res/values-hu/strings.xml     | 91 +++++++++++++++++++++
 app/src/main/res/values-ia/strings.xml     | 91 +++++++++++++++++++++
 app/src/main/res/values-is/strings.xml     | 92 ++++++++++++++++++++++
 app/src/main/res/values-kk/strings.xml     | 91 +++++++++++++++++++++
 app/src/main/res/values-nl/strings.xml     | 91 +++++++++++++++++++++
 app/src/main/res/values-pt-rBR/strings.xml | 31 ++++++++
 app/src/main/res/values-sv-rSE/strings.xml |  2 +
 app/src/main/res/values-tg/strings.xml     | 23 ++++++
 app/src/main/res/values-tr/strings.xml     | 75 ++++++++++++++++++
 app/src/main/res/values-vi/strings.xml     | 92 ++++++++++++++++++++++
 app/src/main/res/values-zh-rCN/strings.xml | 14 ++--
 app/src/main/res/values-zh-rTW/strings.xml | 91 +++++++++++++++++++++
 14 files changed, 953 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0a5bd1c21..b83331140 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -725,6 +725,8 @@
     <string name="preferences_sync_bookmarks">Marque-pages</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Identifiants</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Mots de passe</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Onglets ouverts</string>
     <!-- Preference for signing out -->
@@ -751,6 +753,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Cartes bancaires</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Moyens de paiement</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresses</string>
 
@@ -1721,8 +1725,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Identifiants et mots de passe</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Mots de passe</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Enregistrer les identifiants et les mots de passe</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Enregistrer les mots de passe</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Demander pour enregistrer</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1740,26 +1748,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Ajouter un identifiant</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Ajouter un mot de passe</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Synchroniser les identifiants</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synchroniser les mots de passe</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Synchroniser les identifiants entre vos appareils</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synchronisez les mots de passe entre vos appareils</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Identifiants enregistrés</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Mots de passe enregistrés</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Les identifiants que vous enregistrez ou synchronisez avec %s s’afficheront ici.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Les mots de passe que vous enregistrez ou synchronisez avec %s seront répertoriés ici. Tous les mots de passe que vous enregistrez sont chiffrés.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">En savoir plus sur Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">En savoir plus sur la synchronisation</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Exceptions</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Les identifiants et les mots de passe qui ne sont pas enregistrés seront affichés ici.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s n’enregistrera pas les mots de passe pour les sites listés ici.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Les identifiants et les mots de passe ne seront pas enregistrés pour ces sites.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s n’enregistrera pas les mots de passe pour ces sites.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Supprimer toutes les exceptions</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Rechercher des identifiants</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Rechercher des mots de passe</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Site</string>
     <!-- The header for the username for a login -->
@@ -1788,10 +1815,16 @@
     <string name="saved_login_hide_password">Masquer le mot de passe</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Déverrouillez pour afficher vos identifiants enregistrés</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Déverrouillez pour afficher vos mots de passe enregistrés</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Protégez vos identifiants et mots de passe</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Sécurisez les mots de passe enregistrés</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos identifiants de connexion et mots de passe enregistrés pour le cas où quelqu’un accède à votre appareil.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos mots de passe enregistrés si jamais quelqu’un accède à votre appareil.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Plus tard</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1810,6 +1843,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menu de tri des identifiants</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu de tri des mots de passe</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Remplissage automatique</string>
@@ -1817,10 +1853,16 @@
     <string name="preferences_addresses">Adresses</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Cartes bancaires</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Moyens de paiement</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Enregistrer et remplir automatiquement les cartes</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Enregistrer et renseigner les moyens de paiement</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Les données sont chiffrées</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s chiffre tous les moyens de paiement que vous enregistrez</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synchroniser les cartes entre vos appareils</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1828,17 +1870,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Ajouter une carte bancaire</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Ajouter une carte</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Gérer les cartes enregistrées</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gérer les cartes</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Ajouter une adresse</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Gérer les adresses</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Enregistrer et remplir automatiquement les adresses</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Enregistrer et remplir automatiquement les adresses</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Cela comprend des informations telles que des numéros, des adresses e-mail et des adresses d’expédition</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Y compris les numéros de téléphone et les adresses e-mail</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Ajouter une carte</string>
     <!-- Title of the "Edit card" screen -->
@@ -1859,6 +1910,8 @@
     <string name="credit_cards_delete_card_button">Supprimer la carte</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Voulez-vous vraiment supprimer cette carte bancaire ?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Supprimer la carte ?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Supprimer</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1874,14 +1927,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Veuillez saisir un numéro de carte bancaire valide</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Saisissez un numéro de carte valide</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Veuillez compléter ce champ</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Ajouter un nom</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Déverrouillez pour afficher vos cartes enregistrées</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Protégez vos cartes bancaires</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Sécurisez vos moyens de paiement enregistrés</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos cartes bancaires enregistrées si jamais quelqu’un accède à votre appareil.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos cartes enregistrées si jamais quelqu’un accède à votre appareil.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurer maintenant</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1891,6 +1952,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Déverrouillez pour utiliser les informations de cartes bancaires enregistrées</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Déverrouillez pour utiliser des moyens de paiement enregistrés</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Ajouter une adresse</string>
     <!-- Title of the "Edit address" screen -->
@@ -1928,6 +1991,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Voulez-vous vraiment supprimer cette adresse ?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Supprimer cette adresse ?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Supprimer</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2026,30 +2091,52 @@
     <string name="login_menu_edit_button">Modifier</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Voulez-vous vraiment supprimer cet identifiant ?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Voulez-vous vraiment supprimer ce mot de passe ?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Supprimer</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Annuler</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Options de l’identifiant</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Options de mot de passe</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Le champ de texte modifiable pour l’adresse web de l’identifiant.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Le champ de texte modifiable pour l’adresse du site web du mot de passe.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Le champ de texte modifiable pour le nom d’utilisateur de l’identifiant.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Le champ de texte modifiable pour le nom d’utilisateur du mot de passe.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Le champ de texte modifiable pour le mot de passe de l’identifiant.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Le champ de texte modifiable pour le mot de passe.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Enregistrez les modifications de l’identifiant.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Enregistrer les modifications.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Modifier</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Modifier le mot de passe</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Ajouter un nouvel identifiant</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Ajouter un mot de passe</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Mot de passe requis</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Saisissez un mot de passe</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Le nom d’utilisateur doit être renseigné.</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Saisissez un nom d’utilisateur</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Le nom d’hôte est requis</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Saisissez une adresse web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Recherche vocale</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2427,6 +2514,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Ne jamais traduire les pages en %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Ne jamais traduire ce site</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Remplace tous les autres paramètres</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Remplace les propositions de traduction</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Paramètres de traduction</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-hsb/strings.xml b/app/src/main/res/values-hsb/strings.xml
index 0a0dd5061..73fe1c1d7 100644
--- a/app/src/main/res/values-hsb/strings.xml
+++ b/app/src/main/res/values-hsb/strings.xml
@@ -719,6 +719,8 @@
     <string name="preferences_sync_bookmarks">Zapołožki</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Přizjewjenja</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Hesła</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Wočinjene rajtarki</string>
     <!-- Preference for signing out -->
@@ -746,6 +748,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Kreditne karty</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Płaćenske metody</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresy</string>
 
@@ -1694,8 +1698,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Přizjewjenja a hesła</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Hesła</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Přizjewjenja a hesła składować</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Hesła składować</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Před składowanjom so prašeć</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1713,26 +1721,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Přizjewjenje přidać</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Hesło přidać</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Přizjewjenja synchronizować</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Hesła synchronizować</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Přizjewjenja mjez gratami synchronizować</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Hesła přez graty synchronizować</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Składowane přizjewjenja</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Składowane hesła</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Přizjewjenja, kotrež składujeće abo z %s synchronizujeće, so tu pokazaja.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Hesła, kotrež składujeće abo z %s synchronizujeće, so tu nalistuja. Wšě hesła, kotrež składujeće, so zaklučuja.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Zhońće wjace wo Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Zhońće wjace wo sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Wuwzaća</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Přizjewjenja a hesła, kotrež so njeskładuja, so tu pokazaja.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s hesła za sydła njeskładuje, kotrež su tu nalistowane.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Přizjewjenja a hesła so za tute sydła njeskładuja.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s hesła za tute sydła njeskładuje.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Wšě wuwzaća zhašeć</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Přizjewjenja pytać</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Hesła přepytać</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sydło</string>
     <!-- The header for the username for a login -->
@@ -1761,10 +1788,16 @@
     <string name="saved_login_hide_password">Hesło schować</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Za zwobraznjenje wašich składowanych přizjewjenjow wotewrěć</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Za zwobraznjenje wašich składowanych hesłow wotewrěć</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Zawěsćće swoje přizjewjenja a hesła</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Zawěsćće swoje składowane hesła</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym přizjewjenjam a hesłam zadźěwał, jeli něchtó druhi waš grat ma.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym hesłam zadźěwał, jeli něchtó druhi waš grat ma.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Pozdźišo</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1785,6 +1818,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Meni přizjewjenskich datow sortěrować</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Meni „Hesła sortěrować“</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Awtomatisce wupjelnić</string>
@@ -1792,10 +1828,16 @@
     <string name="preferences_addresses">Adresy</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Kreditne karty</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Płaćenske metody</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Karty składować a awtomatisce wupjelnić</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Płaćenske metody składować a wupjelnić</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Daty su zaklučowane</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s wšě płaćenske metody zaklučuje, kotrež składujeće</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Karty přez graty synchronizować</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1803,17 +1845,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Kreditnu kartu přidać</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Kartu přidać</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Składowane karty rjadować</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Karty rjadować</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adresu přidać</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Adresy rjadować</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Adresy składować a awtomatisce wupjelnić</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Adresy składować a wupjelnić</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Informacije kaž ličby, e-mejlowe a rozsyłanske adresy zapřijeć</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Wobsahuje telefonowe čisła a e-mejlowe adresy</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Kartu přidać</string>
     <!-- Title of the "Edit card" screen -->
@@ -1834,6 +1885,8 @@
     <string name="credit_cards_delete_card_button">Kartu zhašeć</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Chceće woprawdźe tutu kreditnu kartu zhašeć?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Kartu zhašeć?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Zhašeć</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1849,14 +1902,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Prošu zapodajće płaćiwe čisło kreditneje karty</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Zapodajće płaćiwe kartowe čisło</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Prošu wupjelńće tute polo</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Přidajće mjeno</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Za zwobraznjenje wašich składowanych kartow wotewrěć</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Waše kreditne karty zawěsćić</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Zawěsćće swoje składowane płaćenske metody</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym kreditnym kartam zadźěwał, jeli něchtó druhi waš grat ma.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym kartam zadźěwał, jeli něchtó druhi waš grat ma.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Nětko konfigurować</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1904,6 +1965,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Chceće woprawdźe tutu adresu zhašeć?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Tutu adresu zhašeć?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Zhašeć</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2003,30 +2066,52 @@
     <string name="login_menu_edit_button">Wobdźěłać</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Chceće woprawdźe tute přizjewjenje zhašeć?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Chceće woprawdźe tute hesło zhašeć?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Zhašeć</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Přetorhnyć</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Přizjewjenske nastajenja</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Hesłowe nastajenja</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Wobdźěłujomne tekstowe polo za webadresu přizjewjenja.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Wobdźěłujomne tekstowe polo za adresu websydła hesła.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Wobdźěłujomne tekstowe polo za wužiwarske mjeno přizjewjenja.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Wobdźěłujomne tekstowe polo za wužiwarske mjeno hesła.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Wobdźěłujomne tekstowe polo za hesło přizjewjenja.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Wobdźěłujomne tekstowe polo za hesło.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Změny přizjewjenja składować</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Změny składować.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Wobdźěłać</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Hesło wobdźěłać</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Nowe přizjewjenje přidać</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Hesło přidać</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Hesło trěbne</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Hesło zapodać</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Wužiwarske mjeno trěbne</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Wužiwarske mjeno zapodać</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hostmjeno trěbne</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Webadresu zapodać</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Rěčenske pytanje</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index ad0df69ed..3bbb88c79 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -722,6 +722,8 @@
     <string name="preferences_sync_bookmarks">Könyvjelzők</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Bejelentkezések</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Jelszavak</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Nyitott lapok</string>
     <!-- Preference for signing out -->
@@ -748,6 +750,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Bankkártyák</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Fizetési módok</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Címek</string>
 
@@ -1700,8 +1704,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Bejelentkezések és jelszavak</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Jelszavak</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Bejelentkezések és jelszavak mentése</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Jelszavak mentése</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Kérdés mentés előtt</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1718,26 +1726,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Bejelentkezés hozzáadása</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Jelszó hozzáadása</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Bejelentkezések szinkronizálása</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Jelszavak szinkronizálása</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Bejelentkezések szinkronizálása az eszközök között</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Jelszavak szinkronizálása az eszközök közt</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Mentett bejelentkezések</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Mentett jelszavak</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Itt jelennek meg a mentett vagy a %s böngészővel szinkronizált bejelentkezések.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Itt jelennek meg a %sba mentett vagy szinkronizált jelszavak. Az összes mentett jelszó titkosítva van.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Tudjon meg többet a Syncről.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Tudjon meg többet a szinkronizálásról</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Kivételek</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Itt jelennek meg a nem mentett bejelentkezések és jelszavak.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">A %s nem menti el a jelszavakat az itt felsorolt webhelyektől.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">A bejelentkezéseket és a jelszavak nem lesznek elmentve ezeknél a webhelyeknél.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">A %s nem menti el a jelszavakat ezekről a webhelyektől.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Összes kivétel törlése</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Bejelentkezések keresése</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Jelszavak keresése</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Webhely</string>
     <!-- The header for the username for a login -->
@@ -1766,10 +1793,16 @@
     <string name="saved_login_hide_password">Jelszó elrejtése</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Feloldás a mentett bejelentkezések megtekintéshez</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Feloldás a mentett jelszavak megtekintéshez</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Helyezze biztonságba bejelentkezéseit és jelszavait</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Helyezze biztonságba a mentett jelszavait</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett bejelentkezéseit és jelszavait, ha valaki hozzáfér az eszközéhez.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett jelszavait, ha valaki hozzáfér az eszközéhez.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Később</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1788,6 +1821,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Bejelentkezések menü rendezése</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Jelszavak rendezése menü</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Automatikus kitöltés</string>
@@ -1795,10 +1831,16 @@
     <string name="preferences_addresses">Címek</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Bankkártyák</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Fizetési módok</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Kártyák mentése és automatikus kitöltése</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Fizetési módok mentése és kitöltése</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Az adatok titkosítottak</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">A %s titkosítja az összes elmentett fizetési módot</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Kártyák szinkronizálása az eszközök közt</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1806,8 +1848,12 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Bankkártya hozzáadása</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Kártya hozzáadása</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Mentett kártyák kezelése</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Kártyák kezelése</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Cím hozzáadása</string>
     <!-- Preference option for managing saved addresses -->
@@ -1815,9 +1861,14 @@
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Címek mentése és automatikus kitöltése</string>
 
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Címek mentése és kitöltése</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Olyan információk belevétele, mint a számok, e-mail-címek és szállítási címek</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Telefonszámok és e-mail-címek belevétele</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Kártya hozzáadása</string>
     <!-- Title of the "Edit card" screen -->
@@ -1838,6 +1889,8 @@
     <string name="credit_cards_delete_card_button">Kártya törlése</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Biztos, hogy törli ezt a bankkártyát?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Törli a kártyát?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Törlés</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1853,14 +1906,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Adjon meg egy érvényes bankkártyaszámot</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Adjon meg egy érvényes kártyaszámot</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Töltse ki ezt a mezőt</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Adjon hozzá egy nevet</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Feloldás a mentett kártyák megtekintéshez</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Biztosítsa bankkártyáit</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Helyezze biztonságba a fizetési módjait</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett bankkártyáit, ha valaki hozzáfér az eszközéhez.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett kártyáit, ha valaki hozzáfér az eszközéhez.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Beállítás most</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1871,6 +1932,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Oldja fel, hogy a tárolt bankkártya-információkat használja</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Oldja fel a zárolást a mentett fizetési módok használatához</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Cím hozzáadása</string>
     <!-- Title of the "Edit address" screen -->
@@ -1908,6 +1971,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Biztos, hogy törli ezt a címet?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Törli ezt a címet?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Törlés</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2006,30 +2071,52 @@
     <string name="login_menu_edit_button">Szerkesztés</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Biztos, hogy törölni szeretné ezt a bejelentkezést?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Biztos, hogy törli ezt a jelszót?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Törlés</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Mégse</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Bejelentkezési lehetőségek</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Jelszóbeállítások</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">A bejelentkezés webcíméhéz használandó szerkeszthető szövegmező.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">A jelszóhoz tartozó webhely címének szerkeszthető szövegmezője.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">A bejelentkezés felhasználónevéhez használandó szerkeszthető szövegmező.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">A jelszóhoz tartozó felhasználónév szerkeszthető szövegmezője.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">A bejelentkezés jelszavához használandó szerkeszthető szövegmező.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">A jelszó szerkeszthető szövegmezője.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Módosítások mentése a bejelentkezéshez.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Változások mentése.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Szerkesztés</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Jelszó szerkesztése</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Új bejelentkezés hozzáadása</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Jelszó hozzáadása</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Jelszó szükséges</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Adjon meg egy jelszót</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Felhasználónév szükséges</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Adjon meg egy felhasználónevet</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Gépnév szükséges</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Adjon meg egy webcímet</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Hangalapú keresés</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2410,6 +2497,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Soha ne fordítsa ezt: %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Sose fordítsa le ezt az oldalt</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Felülbírál minden más beállítást</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Felülbírálja a fordítás felajánlását</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Fordítási beállítások</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
index b2129b6d3..0a3a6bcb5 100644
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@@ -729,6 +729,8 @@
     <string name="preferences_sync_bookmarks">Marcapaginas</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Credentiales</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Contrasignos</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Schedas aperte</string>
     <!-- Preference for signing out -->
@@ -755,6 +757,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Cartas de credito</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Methodos de pagamento</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresses</string>
 
@@ -1736,8 +1740,12 @@
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Credentiales e contrasignos
 </string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Contrasignos</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Salvar credentiales e contrasignos</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Salvar contrasignos</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Demandar pro salvar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1756,26 +1764,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Adder credentiales</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Adder contrasigno</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Synchronisar credentiales</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synchronisar contrasignos</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Synchronisar credentiales inter le apparatos</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synchronisar contrasignos inter apparatos</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Credentiales salvate</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Contrasignos salvate</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Le credentiales que tu salva o synchronisa a in %s apparera hic.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Le contrasignos que tu salva o synchronisa in %s sera listate ci. Tote le contrasignos que tu salva es cryptate.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Apprender plus re Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Apprender plus re le synchronisation</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Exceptiones</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Credentiales e contrasignos que non es salvate essera monstrate hic.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s non salvara le password pro le sitos ci listate.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Credentiales e contrasignos non sera salvate pro iste sitos.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s non salvara le contrasignos pro iste sitos.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Deler tote le exceptiones</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Cercar credentiales</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Cercar contrasignos</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sito</string>
     <!-- The header for the username for a login -->
@@ -1804,10 +1831,16 @@
     <string name="saved_login_hide_password">Celar contrasigno</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Disbloca pro vider tu credentiales salvate</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Disbloca pro vider tu contrasignos salvate</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Assecurar tu credentiales e contrasignos</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Protege tu contrasignos salvate</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu credentiales e contrasignos salvate de esser accedite, si alcuno altere ha tu apparato.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu contrasignos de esser accedite, si alcuno altere ha tu apparato.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Plus tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1827,6 +1860,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordinar menu de credentiales</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Ordinar le menu del contrasignos</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Autoplenar</string>
@@ -1834,10 +1870,16 @@
     <string name="preferences_addresses">Adresses</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Cartas de credito</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Methodos de pagamento</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Gerer le cartas salvate</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Salvar e compilar methodos de pagamento automaticamente</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Datos es cryptate</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s crypta tote tu methodos de pagamento salvate</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synchronisar cartas inter apparatos</string>
 
@@ -1845,8 +1887,12 @@
     <string name="preferences_credit_cards_sync_cards">Synchronisar cartas</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Adde un carta de credito</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Adder carta</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Gerer le cartas salvate</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gerer le cartas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adder adresse</string>
     <!-- Preference option for managing saved addresses -->
@@ -1855,9 +1901,14 @@
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Salvar e autoplenar adresses</string>
 
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Salvar e compilar automaticamente adresses</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Includer informationes como numeros, email e adresses de expedition</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Include numeros de telephono e adresses email</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Adder carta</string>
     <!-- Title of the "Edit card" screen -->
@@ -1878,6 +1929,8 @@
     <string name="credit_cards_delete_card_button">Deler carta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Desira tu vermente deler iste carta de credito?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Deler carta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Deler</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1893,14 +1946,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Insere un numero valide de carta de credito</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Insere un numero de carta valide</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Completa iste campo</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Adde un nomine</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Disbloca pro vider tu cartas salvate</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Protege tu carta de credito</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Protege tu methodo de pagamento salvate</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu cartas de credito de esser accedite, si alcuno altere ha tu apparato.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu cartas de esser accedite, si alcuno altere ha tu apparato.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Implementar ora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1911,6 +1972,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Disbloca pro usar le informationes de carta de credito immagazinate</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Disblocar pro usar le methodo de pagamento salvate</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adder adresse</string>
     <!-- Title of the "Edit address" screen -->
@@ -1948,6 +2011,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Desira tu vermente deler iste adresses?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Deler iste adresses?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Deler</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2048,31 +2113,53 @@
     <string name="login_menu_edit_button">Rediger</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Desira tu vermente deler iste credentiales?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Desira tu vermente deler iste contrasigno?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Deler</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancellar</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Optiones de apertura de session</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Optiones de contrasigno</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Le campo de texto redigibile pro le adresse web del credentiales.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Le campo de texto redigibile pro le adresse web del contrasigno.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Le campo de texto redigibile pro le nomine de usator del accesso.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Le campo de texto redigibile pro le nomine de usator del contrasigno.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Le campo de texto redigibile pro le contrasigno del credentiales.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Le campo de texto redigibile pro le contrasigno.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Salvar cambiamentos a credentiales.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Salvar le cambiamentos.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Rediger</string>
 
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Modificar le contrasigno</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Adder nove credential</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Adder contrasigno</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Contrasigno requirite</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Insere un contrasigno</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Nomine de usator necesse.</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Insere un nomine de usator</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Nomine de servitor necesse.</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Insere un adresse web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Recerca vocal</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2447,6 +2534,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Non traducer jammais %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Non traducer jammais iste sito</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Supplanta tote le altere parametros</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Supplanta le selection re le proposito de traduction</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Parametros de traduction</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 6d014c497..9028c3eea 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -718,6 +718,8 @@
     <string name="preferences_sync_bookmarks">Bókamerki</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Innskráningar</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Lykilorð</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Opnir flipar</string>
     <!-- Preference for signing out -->
@@ -744,6 +746,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Greiðslukort</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Greiðslumátar</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Vistföng</string>
 
@@ -1682,8 +1686,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Innskráning og lykilorð</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Lykilorð</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Vista innskráningu og lykilorð</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Vista lykilorð</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Biðja um að vista</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1700,27 +1708,47 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Bæta við innskráningu</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Bæta við lykilorði</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Samstilla innskráningar</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Samstilla lykilorð</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Samstilla innskráningar milli tækja</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Samstilla lykilorð milli tækja</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Vistaðar innskráningar</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Vistuð lykilorð</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Innskráningarnar sem þú vistar eða samstillir við %s birtast hér.</string>
 
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Lykilorðin sem þú vistar eða samstillir við %s verða skráð hér. Öll lykilorð sem þú vistar eru dulrituð.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Læra meira um samstillingu.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Frekari upplýsingar um samstillingu</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Undanþágur</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Innskráningar og lykilorð sem ekki eru vistuð sjást hér.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s mun ekki vista lykilorð fyrir vefsvæði sem skráð eru hér.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Innskráningar og lykilorð verða ekki vistuð fyrir þessi vefsvæði.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s mun ekki vista lykilorð fyrir þessi vefsvæði.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eyða öllum undantekningum</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Leita að innskráningu</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Leita að lykilorðum</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Vefsvæði</string>
     <!-- The header for the username for a login -->
@@ -1749,10 +1777,16 @@
     <string name="saved_login_hide_password">Fela lykilorð</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Aflæstu til að skoða vistaðar innskráningar</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Aflæstu til að skoða vistuð lykilorð</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Verndaðu innskráningar þínar og lykilorð</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Tryggðu öryggi vistuðu lykilorðanna þinna</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Settu upp læsimynstur, PIN eða lykilorð til að vernda vistaðar innskráningar og lykilorð ef ske kynni að einhver annar komist yfir tækið þitt.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Settu upp læsimynstur, PIN-númer eða lykilorð til að vernda vistuðu lykilorðin þín ef ske kynni að einhver annar komist yfir tækið þitt.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Síðar</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1772,6 +1806,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Raða innskráningarvalmyndinni</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Raða lykilorðavalmynd</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Sjálfvirk útfylling</string>
@@ -1779,27 +1816,42 @@
     <string name="preferences_addresses">Tölvupóstföng</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Greiðslukort</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Greiðslumátar</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Vista og fylla sjálfkrafa út í greiðslukort</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Vista og fylla út greiðslumáta</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Gögn eru dulrituð</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s dulritar alla greiðslumáta sem þú vistar</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Samstilla greiðslukort milli tækja</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Samstilla kort</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Bæta við greiðslukorti</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Bæta við korti</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Sýsla með vistuð greiðslukort</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Sýsla með greiðslukort</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Bæta við tölvupóstfangi</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Sýsla með tölvupóstföng</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Vista og fylla sjálfkrafa út heimilisföng</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Vista og fylla út í heimilisföng</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Láta upplýsingar eins og símanúmer, tölvupóstföng og heimilisföng fylgja með</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Þar með talin símanúmer og tölvupóstföng</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Bæta við korti</string>
     <!-- Title of the "Edit card" screen -->
@@ -1821,6 +1873,8 @@
     <string name="credit_cards_delete_card_button">Eyða korti</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Ertu viss um að þú viljir eyða þessu greiðslukorti?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Eyða korti?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Eyða</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1833,14 +1887,22 @@
     <string name="credit_cards_saved_cards">Vistuð greiðslukort</string>
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Settu inn gilt kortanúmer</string>
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Settu inn gilt kortanúmer</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Fylltu út í þennan reit</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Bættu við nafni</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Aflæsa til að skoða vistuð greiðslukort</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Haltu kreditkortunum þínum öruggum</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Tryggðu öryggi vistuðu greiðslumátanna þinna</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Settu upp læsimynstur, PIN-númer eða lykilorð til að vernda vistuðu greiðslukortin þín ef ske kynni að einhver annar komist yfir tækið þitt.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Settu upp læsimynstur, PIN-númer eða lykilorð til að vernda vistuðu greiðslukortin þín ef ske kynni að einhver annar komist yfir tækið þitt.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Setja upp núna</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1850,6 +1912,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Aflæstu til að nota geymdar kreditkortaupplýsingar</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Aflæstu til að nota vistaða greiðslumáta</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Bæta við tölvupóstfangi</string>
     <!-- Title of the "Edit address" screen -->
@@ -1887,6 +1951,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Ertu viss um að þú viljir eyða þessu póstfangi?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Eyða þessu heimilisfangi?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Eyða</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1986,30 +2052,52 @@
     <string name="login_menu_edit_button">Breyta</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Ertu viss um að þú viljir eyða þessari innskráningu?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Ertu viss um að þú viljir eyða þessu lykilorði?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Eyða</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Hætta við</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Innskráningarvalkostir</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Valkostir lykilorðs</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Breytilegi textareiturinn fyrir veffang þessarar innskráningarinnar.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Breytanlegi textareiturinn fyrir veffang lykilorðsins.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Breytilegi textareiturinn fyrir notandanafn innskráningarinnar.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Breytanlegi textareiturinn fyrir notandanafn lykilorðsins.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Breytilegi textareiturinn fyrir lykilorð innskráningarinnar.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Breytanlegi textareiturinn fyrir lykilorðið.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Vista breytingar á innskráningu.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Vista breytingar.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Breyta</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Breyta lykilorði</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Bæta við nýrri innskráningu</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Bæta við lykilorði</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Lykilorðs krafist</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Settu inn lykilorð</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Notandanafn er nauðsynlegt</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Settu inn notandanafn</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hýsingarheiti er nauðsynlegt</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Settu inn slóð á vefsíðu</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Raddleit</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2386,6 +2474,10 @@
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Aldrei þýða þetta vefsvæði</string>
 
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Yfirtekur allar aðrar stillingar</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Yfirtekur tilboð um að þýða</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Þýðingastillingar</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index 4531746c9..d3f31dac6 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -719,6 +719,8 @@
     <string name="preferences_sync_bookmarks">Бетбелгілер</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Логиндер</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Парольдер</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Ашық беттер</string>
     <!-- Preference for signing out -->
@@ -744,6 +746,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Несиелік карталар</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Төлем әдістері</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Адрестер</string>
 
@@ -1686,8 +1690,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Логиндер және парольдер</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Парольдер</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Логиндер және парольдерді сақтау</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Парольдерді сақтау</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Сақтау алдында сұрау</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1706,26 +1714,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Логинді қосу</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Парольді қосу</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Логиндерді синхрондау</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Парольдерді синхрондау</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Логиндерді құрылғылар арасында синхрондау</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Парольдерді құрылғылар арасында синхрондау</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Сақталған логиндер</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Сақталған парольдер</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Сіз %s ішінде сақтаған немесе синхрондаған логиндер осында көрсетіледі.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Сіз %s ішіне сақтаған немесе синхрондаған парольдер осында тізіліп көрсетіледі. Сіз сақтаған барлық парольдер шифрленген.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Синхрондау туралы көбірек біліңіз.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Синхрондау туралы көбірек біліңіз</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Ережеден бөлек</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Сақталмаған логиндер мен парольдер осында көрсетіледі.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s осы жерде тізімделген сайттар үшін парольдерді сақтамайтын болады.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Бұл сайттар үшін логиндер мен парольдер сақталмайды.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s бұл сайттар үшін парольдерді сақтамайтын болады.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Барлық ережеден тыс жағдайларды өшіру</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Логиндерден іздеу</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Парольдерді іздеу</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Сайт</string>
     <!-- The header for the username for a login -->
@@ -1754,10 +1781,16 @@
     <string name="saved_login_hide_password">Парольді жасыру</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Сақталған логиндеріңізді көру үшін бұғаттауын ашыңыз</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Сақталған парольдеріңізді көру үшін бұғаттауын ашыңыз</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Логиндер және парольдерді қорғаңыз</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Сақталған парольдерді қорғаңыз</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Бөтен адам сіздің құрылғыңызда болса, одан сақталған логиндер мен парольдерді қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Бөтен адам сіздің құрылғыңызда болса, одан сақталған парольдеріңізді қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Кейінірек</string>
 
@@ -1776,6 +1809,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Логиндерді сұрыптау мәзірі</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Парольдерді сұрыптау мәзірі</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Автотолтыру</string>
@@ -1783,10 +1819,16 @@
     <string name="preferences_addresses">Адрестер</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Несиелік карталар</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Төлем әдістері</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Карталарды сақтау және автотолтыру</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Төлем әдістерін сақтау және толтыру</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Деректер шифрленген</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s сіз сақтаған барлық төлем әдістерін шифрлейді</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Карталарды құрылғылар арасында синхрондау</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1794,17 +1836,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Несиелік картаны қосу</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Картаны қосу</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Сақталған карталарды басқару</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Карталарды басқару</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Адресті қосу</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Адрестерді басқару</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Адрестерді сақтау және автотолтыру</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Адрестерді сақтау және толтыру</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Нөмірлер, эл. пошта және жеткізу адрестері сияқты ақпаратты қосу</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Телефон нөмірлері мен электрондық пошта адрестерін қамтиды</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Картаны қосу</string>
     <!-- Title of the "Edit card" screen -->
@@ -1825,6 +1876,8 @@
     <string name="credit_cards_delete_card_button">Картаны өшіру</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Бұл несие картасын өшіруді шынымен қалайсыз ба?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Картаны өшіру керек пе?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Өшіру</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1840,14 +1893,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Несиелік картаның жарамды нөмірін енгізіңіз</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Жарамды карта нөмірін енгізіңіз</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Бұл өрісті толтырыңыз</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Атын қосыңыз</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Сақталған карталарыңызды көру үшін бұғаттауын ашыңыз</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Несиелік карталарыңызды қорғаңыз</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Сақталған төлем әдістерін қорғаңыз</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Бөтен адам сіздің құрылғыңызда болса, одан сақталған несиелік карталарды қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Бөтен адам сіздің құрылғыңызда болса, одан сақталған карталарды қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Қазір баптау</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1858,6 +1919,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Сақталған несиелік карта ақпаратын қолдану үшін бұғаттауын ашыңыз</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Сақталған төлем әдістерін қолдану үшін құлыптан босатыңыз</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Адресті қосу</string>
     <!-- Title of the "Edit address" screen -->
@@ -1896,6 +1959,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Бұл адресті өшіруді шынымен қалайсыз ба?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Бұл адресті өшіру керек пе?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Өшіру</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1993,31 +2058,53 @@
     <string name="login_menu_edit_button">Түзету</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Бұл логинді өшіруді қалайсыз ба?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Бұл парольді өшіруді шынымен қалайсыз ба?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Өшіру</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Бас тарту</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Логин баптаулары</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Пароль опциялары</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Логиннің веб-адресі үшін түзетуге болатын мәтіндік өрісі.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Парольдің веб-адресі үшін түзетуге болатын мәтіндік өрісі.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Логиннің пайдаланушы аты үшін түзетуге болатын мәтіндік өрісі.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Парольдің пайдаланушы аты үшін түзетуге болатын мәтіндік өрісі.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Логиннің паролі үшін түзетуге болатын мәтіндік өрісі.</string>
 
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Пароль үшін түзетуге болатын мәтіндік өрісі.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Логин өзгерістерін сақтау.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Өзгерістерді сақтау.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Түзету</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Парольді түзету</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Жаңа логинді қосу</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Парольді қосу</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Пароль керек</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Парольді енгізіңіз</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Пайдаланушы аты керек</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Пайдаланушы атын енгізіңіз</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Хост атауы керек</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Веб адресін енгізіңіз</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Дауыстық іздеу</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2394,6 +2481,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">%1$s ешқашан аудармау</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Бұл сайтты ешқашан аудармау</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Барлық басқа баптауларды қайта анықтайды</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Аудару ұсыныстарын қайта анықтайды</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Аударма баптаулары</string>
 
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 950e0c015..0018da0fa 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -727,6 +727,8 @@
     <string name="preferences_sync_bookmarks">Bladwijzers</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Aanmeldingen</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Wachtwoorden</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Open tabbladen</string>
     <!-- Preference for signing out -->
@@ -753,6 +755,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Creditcards</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Betalingsmethoden</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adressen</string>
 
@@ -1701,8 +1705,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Aanmeldingen en wachtwoorden</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Wachtwoorden</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Aanmeldingen en wachtwoorden opslaan</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Wachtwoorden opslaan</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Vragen om op te slaan</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1719,26 +1727,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Aanmelding toevoegen</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Wachtwoord toevoegen</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Aanmeldingen synchroniseren</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Wachtwoorden synchroniseren</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Aanmeldingen op apparaten synchroniseren</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Wachtwoorden synchroniseren tussen apparaten</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Opgeslagen aanmeldingen</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Opgeslagen wachtwoorden</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">De aanmeldingen die u opslaat of synchroniseert met %s worden hier getoond.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">De wachtwoorden die u opslaat of synchroniseert met %s zullen hier worden vermeld. Alle wachtwoorden die u opslaat, zijn versleuteld.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Meer info over Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Meer info over synchronisatie</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Uitzonderingen</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Niet-opgeslagen aanmeldingen en wachtwoorden worden hier weergegeven.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s zal geen wachtwoorden voor de hier vermelde websites opslaan.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Aanmeldingen en wachtwoorden worden voor deze websites niet opgeslagen.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s zal geen wachtwoorden voor deze websites opslaan.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Alle uitzonderingen verwijderen</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Aanmeldingen zoeken</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Wachtwoorden zoeken</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Website</string>
     <!-- The header for the username for a login -->
@@ -1767,10 +1794,16 @@
     <string name="saved_login_hide_password">Wachtwoord verbergen</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Ontgrendel om uw opgeslagen aanmeldingen te bekijken</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Ontgrendel om uw opgeslagen wachtwoorden te bekijken</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Beveilig uw aanmeldingen en wachtwoorden</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Beveilig uw opgeslagen wachtwoorden</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen aanmeldingen en wachtwoorden te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen wachtwoorden te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Later</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1789,6 +1822,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menu Aanmeldingen sorteren</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Wachtwoordmenu sorteren</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Automatisch invullen</string>
@@ -1796,10 +1832,16 @@
     <string name="preferences_addresses">Adressen</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Creditcards</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Betalingsmethoden</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Kaarten opslaan en automatisch invullen</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Betalingsmethoden opslaan en invullen</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Gegevens zijn versleuteld</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s versleutelt alle betalingsmethoden die u opslaat</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Kaarten synchroniseren tussen apparaten</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1807,17 +1849,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Creditcard toevoegen</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Kaart toevoegen</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Opgeslagen kaarten beheren</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Kaarten beheren</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adres toevoegen</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Adressen beheren</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Adressen opslaan en automatisch invullen</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Adressen opslaan en invullen</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Informatie zoals nummers, e-mail- en verzendadressen toevoegen</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Inclusief telefoonnummers en e-mailadressen</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Kaart toevoegen</string>
     <!-- Title of the "Edit card" screen -->
@@ -1838,6 +1889,8 @@
     <string name="credit_cards_delete_card_button">Kaart verwijderen</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Weet u zeker dat u deze creditcard wilt verwijderen?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Kaart verwijderen?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Verwijderen</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1853,14 +1906,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Voer een geldig creditcardnummer in</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Voer een geldig kaartnummer in</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Vul dit veld in</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Voeg een naam toe</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Ontgrendel om uw opgeslagen kaarten te bekijken</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Beveilig uw creditcards</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Beveilig uw opgeslagen betalingsmethoden</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen creditcards te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen kaarten te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Nu instellen</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1871,6 +1932,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Ontgrendelen om opgeslagen creditcardgegevens te gebruiken</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Ontgrendel om opgeslagen betalingsmethoden te gebruiken</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adres toevoegen</string>
     <!-- Title of the "Edit address" screen -->
@@ -1908,6 +1971,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Weet u zeker dat u dit adres wilt verwijderen?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Dit adres verwijderen?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Verwijderen</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2006,30 +2071,52 @@
     <string name="login_menu_edit_button">Bewerken</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Weet u zeker dat u deze aanmelding wilt verwijderen?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Weet u zeker dat u dit wachtwoord wilt verwijderen?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Verwijderen</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Annuleren</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Aanmeldopties</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Wachtwoordopties</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Het bewerkbare tekstveld voor het webadres van de aanmelding.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Het bewerkbare tekstveld voor het websiteadres van het wachtwoord.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Het bewerkbare tekstveld voor de gebruikersnaam van de aanmelding.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Het bewerkbare tekstveld voor de gebruikersnaam van het wachtwoord.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Het bewerkbare tekstveld voor het wachtwoord van de aanmelding.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Het bewerkbare tekstveld voor het wachtwoord.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Wijzigingen aan aanmelding opslaan.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Wijzigingen opslaan.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Bewerken</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Wachtwoord bewerken</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Nieuwe aanmelding toevoegen</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Wachtwoord toevoegen</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Wachtwoord vereist</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Vul een wachtwoord in</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Gebruikersnaam vereist</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Vul een gebruikersnaam in</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hostnaam vereist</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Voer een websiteadres in</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Gesproken zoekopdracht</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2407,6 +2494,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">%1$s nooit vertalen</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Deze website nooit vertalen</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Overschrijft alle andere instellingen</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Negeert vertaalaanbiedingen</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Vertaalinstellingen</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5c95fc6c8..6e3a51aab 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -725,6 +725,8 @@
     <string name="preferences_sync_bookmarks">Favoritos</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Contas de acesso</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Senhas</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Abas abertas</string>
     <!-- Preference for signing out -->
@@ -751,6 +753,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Cartões de crédito</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Métodos de pagamento</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Endereços</string>
 
@@ -1697,8 +1701,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Contas e senhas</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Senhas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Salvar contas e senhas</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Salvar senhas</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Perguntar se deve salvar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1715,26 +1723,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Adicionar conta</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Adicionar senha</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronizar contas</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizar senhas</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sincronizar contas entre dispositivos</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronizar senhas entre dispositivos</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Contas salvas</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Senhas salvas</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">As contas que você salvar ou sincronizar no %s aparecem aqui.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">As senhas que você salva ou sincroniza no %s aparecem aqui. Todas as senhas que você salva são criptografadas.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Saiba mais sobre sincronização.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Saiba mais sobre sincronização</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Exceções</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Contas e senhas que não são salvas são mostradas aqui.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">O %s não salva senhas dos sites desta lista.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Contas e senhas desses sites não serão salvas.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">O %s não salva senhas desses sites.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Excluir todas as exceções</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Pesquisar contas</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Procurar senhas</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Site</string>
     <!-- The header for the username for a login -->
@@ -1763,9 +1790,13 @@
     <string name="saved_login_hide_password">Ocultar senha</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Desbloqueie para ver suas contas salvas</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desbloqueie para ver as senhas salvas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Proteja suas contas e senhas</string>
 
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Proteja as senhas salvas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a suas contas e senhas salvas, caso outras pessoas usem seu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 946c9c25e..ac4cbb3d8 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -727,6 +727,8 @@
     <string name="preferences_sync_bookmarks">Bokmärken</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Inloggningar</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Lösenord</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Öppna flikar</string>
     <!-- Preference for signing out -->
diff --git a/app/src/main/res/values-tg/strings.xml b/app/src/main/res/values-tg/strings.xml
index 06120253d..00441626d 100644
--- a/app/src/main/res/values-tg/strings.xml
+++ b/app/src/main/res/values-tg/strings.xml
@@ -722,6 +722,8 @@
     <string name="preferences_sync_bookmarks">Хатбаракҳо</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Воридшавиҳо</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Ниҳонвожаҳо</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Варақаҳои кушодашуда</string>
     <!-- Preference for signing out -->
@@ -749,6 +751,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Кортҳои кредитӣ</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Тарзҳои пардохт</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Нишониҳо</string>
 
@@ -1701,8 +1705,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Воридшавиҳо ва ниҳонвожаҳо</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Ниҳонвожаҳо</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Нигоҳ доштани воридшавиҳо ва ниҳонвожаҳо</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Нигоҳ доштани ниҳонвожаҳо</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Бо пешниҳоди нигоҳдорӣ</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1719,12 +1727,21 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Илова кардани воридшавӣ</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Илова кардани ниҳонвожа</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Воридшавиҳои ҳамоҳангшуда</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Ҳамоҳанг кардани ниҳонвожаҳо</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Ҳамоҳанг кардани воридшавиҳо байни дастгоҳҳо</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Ҳамоҳанг кардани ниҳонвожаҳо байни дастгоҳҳо</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Воридшавиҳои нигоҳдошташуда</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Ниҳонвожаҳои нигоҳдошташуда</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Воридшавиҳое, ки шумо дар %s нигоҳ медоред ё ҳамоҳанг мекунед, дар ин ҷо нишон дода мешаванд.</string>
     <!-- Preference to access list of saved logins -->
@@ -1739,6 +1756,8 @@
     <string name="preferences_passwords_exceptions_remove_all">Нест кардани ҳамаи истисноҳо</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Ҷустуҷӯи воридшавиҳо</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Ҷустуҷӯи ниҳонвожаҳо</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Сомона</string>
     <!-- The header for the username for a login -->
@@ -1797,8 +1816,12 @@
     <string name="preferences_addresses">Нишониҳо</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Кортҳои кредитӣ</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Тарзҳои пардохт</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Нигоҳ доштан ва ба таври худкор пур кардани кортҳо</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Нигоҳ доштан ва пур кардани тарзҳои пардохт</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Маълумот рамзгузорӣ карда шуд</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index eb70ce877..832b8d2c6 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -722,6 +722,8 @@
     <string name="preferences_sync_bookmarks">Yer imleri</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Hesaplar</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Parolalar</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Açık sekmeler</string>
     <!-- Preference for signing out -->
@@ -748,6 +750,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Kredi kartları</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Ödeme yöntemleri</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresler</string>
 
@@ -1694,8 +1698,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Hesaplar ve parolalar</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Parolalar</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Kullanıcı adı ve parolaları kaydet</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Parolaları kaydet</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Kaydetmeyi sor</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1712,26 +1720,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Hesap ekle</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Parola ekle</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Hesapları eşitle</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Parolaları eşitle</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Hesapları cihazlar arasında eşitle</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Parolaları cihazlar arasında eşitle</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Kayıtlı hesaplar</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Kayıtlı parolalar</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Kaydettiğiniz veya %s ile eşitlediğiniz hesaplar burada görünecektir.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">%s tarayıcısına kaydettiğiniz veya eşitlediğiniz parolalar burada listelenecektir. Kaydettiğiniz tüm parolalar şifrelenir.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Sync hakkında bilgi alın.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Eşitlemeyle ilgili bilgi al</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">İstisnalar</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Kaydedilmeyen hesaplar ve parolalar burada görünecektir.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s, burada listelenen sitelerin parolalarını kaydetmeyecektir.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Bu sitelere ait hesaplar ve parolalar kaydedilmeyecektir.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s bu sitelerin parolalarını kaydetmeyecektir.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Tüm istisnaları sil</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Hesaplarda ara</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Parolalarda ara</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Site</string>
     <!-- The header for the username for a login -->
@@ -1760,10 +1787,16 @@
     <string name="saved_login_hide_password">Parolayı gizle</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Kayıtlı hesaplarınızı görmek için kilidi açın</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Kayıtlı parolalarınızı görmek için kilidi açın</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Hesaplarınızı güvence altına alın</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Kayıtlı parolalarınızı güvence altına alın</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Cihazınız başka birinin eline geçerse kayıtlı hesaplarına erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Cihazınız başka birinin eline geçerse kayıtlı parolalarınıza erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Daha sonra</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1783,6 +1816,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Hesapları sırala menüsü</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Parolaları sırala menüsü</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Otomatik doldurma</string>
@@ -1790,10 +1826,16 @@
     <string name="preferences_addresses">Adresler</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Kredi kartları</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Ödeme yöntemleri</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Kartları kaydedip otomatik doldur</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Ödeme yöntemlerini kaydet ve doldur</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Veriler şifrelenir</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s kaydettiğiniz tüm ödeme yöntemlerini şifreler</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Kartları cihazlar arasında eşitle</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1801,17 +1843,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Kredi kartı ekle</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Kart ekle</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Kayıtlı kartları yönet</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Kartları yönet</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adres ekle</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Adresleri yönet</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Adresleri kaydedip otomatik doldur</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Adresleri kaydet ve doldur</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Numaralar, e-posta ve gönderim adresleri gibi bilgileri dahil et</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Telefon numaraları ve e-posta adresleri de dahildir</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Kart ekle</string>
     <!-- Title of the "Edit card" screen -->
@@ -1832,6 +1883,8 @@
     <string name="credit_cards_delete_card_button">Kartı sil</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Bu kredi kartını silmek istediğinizden emin misiniz?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Kart silinsin mi?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Sil</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1847,14 +1900,20 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Lütfen geçerli bir kredi kartı numarası girin</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Geçerli bir kart numarası girin</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Lütfen bu alanı doldurun</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Kayıtlı kartlarınızı görmek için kilidi açın</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Kredi kartlarını güvence altına al</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Kayıtlı ödeme yöntemlerinizi güvence altına alın</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Cihazınız başka birinin eline geçerse kayıtlı kartlarınıza erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Cihazınız başka birinin eline geçerse kayıtlı kartlarınıza erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Hemen ayarla</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1865,6 +1924,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Depolanan kredi kartı bilgilerini kullanmak için kilidi açın</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Kayıtlı ödeme yöntemlerinizi kullanmak için kilidi açın</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adres ekle</string>
     <!-- Title of the "Edit address" screen -->
@@ -1902,6 +1963,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Bu adresi silmek istediğinizden emin misiniz?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Bu adres silinsin mi?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Sil</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2000,12 +2063,16 @@
     <string name="login_menu_edit_button">Düzenle</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Bu hesabı silmek istediğinizden emin misiniz?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Bu parolayı silmek istediğinizden emin misiniz?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Sil</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Vazgeç</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Hesap seçenekleri</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Parola seçenekleri</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Hesabın web adresi için düzenlenebilir metin alanı.</string>
     <!--  The editable text field for a login's username. -->
@@ -2014,10 +2081,16 @@
     <string name="saved_login_password_description">Hesabın parolası için düzenlenebilir metin alanı.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Değişiklikleri hesaba kaydet.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Değişiklikleri kaydet.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Düzenle</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Parola düzenle</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Yeni hesap ekle</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Parola ekle</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Parola gerekli</string>
     <!--  The error message in add login view when username field is blank. -->
@@ -2400,6 +2473,8 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">%1$s dilini asla çevirme</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Bu siteyi asla çevirme</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Diğer tüm ayarları geçersiz kılar</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Çeviri ayarları</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 8142cf178..abfc03fa7 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -717,6 +717,8 @@
     <string name="preferences_sync_bookmarks">Dấu trang</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Đăng nhập</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Mật khẩu</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Các thẻ đang mở</string>
     <!-- Preference for signing out -->
@@ -743,6 +745,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Thẻ tín dụng</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Phương thức thanh toán</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Địa chỉ</string>
 
@@ -1679,8 +1683,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Thông tin đăng nhập và mật khẩu</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Mật khẩu</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Lưu thông tin đăng nhập và mật khẩu</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Lưu mật khẩu</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Yêu cầu để lưu</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1697,26 +1705,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Thêm thông tin đăng nhập</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Thêm mật khẩu</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Đồng bộ hóa thông tin đăng nhập</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Đồng bộ mật khẩu</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Đồng bộ hóa thông tin đăng nhập trên các thiết bị</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Đồng bộ hóa mật khẩu giữa các thiết bị</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Thông tin đăng nhập đã lưu</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Mật khẩu đã lưu</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Thông tin đăng nhập bạn lưu hoặc đồng bộ hóa với %s sẽ hiển thị tại đây.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Mật khẩu bạn lưu hoặc đồng bộ hóa với %s sẽ được liệt kê ở đây. Tất cả mật khẩu bạn lưu đều được mã hóa.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Tìm hiểu thêm về đồng bộ hóa.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Tìm hiểu thêm về đồng bộ hoá</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Ngoại lệ</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Thông tin đăng nhập và mật khẩu không được lưu sẽ được hiển thị ở đây.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s sẽ không lưu mật khẩu cho các trang được liệt kê ở đây.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Thông tin đăng nhập và mật khẩu sẽ không được lưu cho các trang web này.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s sẽ không lưu mật khẩu cho các trang web này.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Xóa tất cả ngoại lệ</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Tìm thông tin đăng nhập</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Tìm kiếm mật khẩu</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Trang</string>
     <!-- The header for the username for a login -->
@@ -1745,10 +1773,16 @@
     <string name="saved_login_hide_password">Ẩn mật khẩu</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Mở khóa để xem thông tin đăng nhập đã lưu của bạn</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Mở khóa để xem mật khẩu đã lưu của bạn</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Bảo mật thông tin đăng nhập và mật khẩu của bạn</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Giữ mật khẩu đã lưu của bạn một cách an toàn</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Thiết lập mẫu khóa thiết bị, mã PIN hoặc mật khẩu để bảo vệ thông tin đăng nhập và mật khẩu đã lưu của bạn khỏi bị truy cập nếu người khác lấy được thiết bị của bạn.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Đặt mật khẩu thiết bị dạng mẫu hình, mã PIN hoặc mật khẩu để bảo vệ mật khẩu đã lưu của bạn không bị truy cập nếu người khác lấy được thiết bị của bạn.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Để sau</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1767,6 +1801,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sắp xếp menu đăng nhập</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu sắp xếp mật khẩu</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Tự động điền</string>
@@ -1774,10 +1811,16 @@
     <string name="preferences_addresses">Địa chỉ</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Thẻ tín dụng</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Phương thức thanh toán</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Lưu và tự động điền thẻ tín dụng</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Lưu và điền phương thức thanh toán</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Dữ liệu được mã hóa</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s mã hóa tất cả các phương thức thanh toán bạn lưu</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Đồng bộ thông tin thẻ tín dụng trên các thiết bị</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1785,17 +1828,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Thêm thẻ tín dụng</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Thêm thẻ</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Quản lý thẻ tín dụng đã lưu</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Quản lý thẻ tín dụng</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Thêm địa chỉ</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Quản lý địa chỉ</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Lưu và tự động điền địa chỉ</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Lưu và điền địa chỉ</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Bao gồm thông tin như số, email và địa chỉ giao hàng</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Bao gồm số điện thoại và địa chỉ email</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Thêm thẻ</string>
     <!-- Title of the "Edit card" screen -->
@@ -1816,6 +1868,8 @@
     <string name="credit_cards_delete_card_button">Xóa thẻ</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Bạn có chắc chắn muốn xóa thẻ tín dụng này không?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Xoá thẻ?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Xóa</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1831,14 +1885,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Vui lòng nhập số thẻ tín dụng hợp lệ</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Nhập số thẻ hợp lệ</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Vui lòng điền vào trường này</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Thêm tên</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Mở khóa để xem các thẻ tín dụng đã lưu của bạn</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Bảo mật thẻ tín dụng của bạn</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Giữ các phương thức thanh toán đã lưu của bạn một cách an toàn</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Thiết lập màn hình khóa thiết bị với mẫu hình, mã PIN hoặc mật khẩu để bảo vệ thẻ tín dụng đã lưu của bạn không bị truy cập nếu người khác có thiết bị của bạn.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Đặt mật khẩu thiết bị dạng mẫu hình, mã PIN hoặc mật khẩu để bảo vệ thẻ đã lưu của bạn không bị truy cập nếu người khác lấy đuọc thiết bị của bạn.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Thiết lập ngay</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1848,6 +1910,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Mở khóa để sử dụng thông tin thẻ tín dụng được lưu trữ</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Mở khóa để sử dụng các phương thức thanh toán đã lưu</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Thêm địa chỉ</string>
     <!-- Title of the "Edit address" screen -->
@@ -1885,6 +1949,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Bạn có chắc chắn muốn xóa địa chỉ này không?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Xoá địa chỉ này?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Xóa</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1983,30 +2049,52 @@
     <string name="login_menu_edit_button">Chỉnh sửa</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Bạn có chắc chắn muốn xóa thông tin đăng nhập này không?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Bạn có chắc chắn muốn xóa mật khẩu này?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Xóa</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Hủy bỏ</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Tùy chọn thông tin đăng nhập</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Cài đặt mật khẩu</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Trường văn bản có thể chỉnh sửa cho địa chỉ web của thông tin đăng nhập.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Trường văn bản có thể chỉnh sửa cho địa chỉ trang web của mật khẩu.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Trường văn bản có thể chỉnh sửa cho tên người dùng của thông tin đăng nhập.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Trường văn bản có thể chỉnh sửa cho tên người dùng của mật khẩu.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Trường văn bản có thể chỉnh sửa cho mật khẩu của thông tin đăng nhập.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Trường văn bản có thể chỉnh sửa cho mật khẩu.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Lưu các thay đổi vào thông tin đăng nhập.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Lưu thay đổi.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Chỉnh sửa</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Chỉnh sửa mật khẩu</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Thêm thông tin đăng nhập mới</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Thêm mật khẩu</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Yêu cầu mật khẩu</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Nhập mật khẩu</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Yêu cầu tên đăng nhập</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Nhập tên người dùng</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Yêu cầu tên máy chủ</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Nhập địa chỉ trang web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Tìm kiếm bằng giọng nói</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2381,6 +2469,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Không bao giờ dịch %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Không bao giờ dịch trang này</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Ghi đè tất cả các cài đặt khác</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Ghi đè đề xuất dịch</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Cài đặt dịch</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index beb602490..abafc50e4 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -95,7 +95,7 @@
     <!-- Text for the info message. The first parameter is the name of the application.-->
     <string name="open_in_app_cfr_info_message_2">您可以将 %1$s 设为链接的打开方式。</string>
     <!-- Text for the positive action button -->
-    <string name="open_in_app_cfr_positive_button_text">转至设置</string>
+    <string name="open_in_app_cfr_positive_button_text">前往设置</string>
     <!-- Text for the negative action button -->
     <string name="open_in_app_cfr_negative_button_text">知道了</string>
 
@@ -112,9 +112,9 @@
 
 
     <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
-    <string name="camera_permissions_needed_message">需要访问相机。转到 Android 设置，点按权限，然后点按允许。</string>
+    <string name="camera_permissions_needed_message">需要访问相机。请前往 Android 设置，点按“权限”，然后点按“允许”。</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
-    <string name="camera_permissions_needed_positive_button_text">转至设置</string>
+    <string name="camera_permissions_needed_positive_button_text">前往设置</string>
     <!-- Text for the negative action button to dismiss the dialog. -->
     <string name="camera_permissions_needed_negative_button_text">知道了</string>
 
@@ -336,14 +336,14 @@
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
     <string name="onboarding_home_enable_notifications_negative_button">暂时不要</string>
 
-    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">我们乐于为您护航</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">这款由非营利组织支持的浏览器会自动阻止大公司在网上偷偷跟踪您。\n\n请阅读我们的隐私声明详细了解。</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">这款由非营利组织支持的浏览器会自动阻止大公司在网上偷偷跟踪您。\n\n请阅读我们的隐私声明详细了解。</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">隐私声明</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">隐私声明</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">设为默认浏览器</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -1162,7 +1162,7 @@
 
     <!-- Site Permissions -->
     <!-- Button label that take the user to the Android App setting -->
-    <string name="phone_feature_go_to_settings">转至设置</string>
+    <string name="phone_feature_go_to_settings">前往设置</string>
 
     <!-- Content description (not visible, for screen readers etc.): Quick settings sheet
         to give users access to site specific information / settings. For example:
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index db2e09cb1..1ba4d2a4a 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -728,6 +728,8 @@
     <string name="preferences_sync_bookmarks">書籤</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">登入資訊</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">密碼</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">開啟分頁</string>
     <!-- Preference for signing out -->
@@ -754,6 +756,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">信用卡</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">付款方式</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">地址</string>
 
@@ -1723,8 +1727,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">登入資訊與密碼</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">密碼</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">儲存登入資訊與密碼</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">已存密碼</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">詢問我是否儲存</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1741,26 +1749,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">新增登入資訊</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">新增密碼</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">同步登入資訊</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">同步密碼</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">在不同裝置間同步登入資訊</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">在不同裝置間同步密碼</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">儲存的登入資訊</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">已存密碼</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">您儲存或同步到 %s 的登入資訊將顯示於此處。</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">您儲存或同步到 %s 的密碼將顯示於此處，所有儲存的密碼資訊都會被加密。</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">了解 Sync 的更多資訊。</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">瞭解同步功能的更多資訊</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">例外網站</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">不儲存登入資訊與密碼的網站將顯示於此處。</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s 不會儲存下列網站的密碼。</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">將不儲存這些網站的登入資訊與密碼。</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s 不會儲存下列網站的密碼。</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">刪除所有例外</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">搜尋登入資訊</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">搜尋密碼</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">網站</string>
     <!-- The header for the username for a login -->
@@ -1789,10 +1816,16 @@
     <string name="saved_login_hide_password">隱藏密碼</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">解鎖後即可檢視儲存的登入資訊</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">解鎖後即可檢視儲存的密碼</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">保護您的登入資訊與密碼</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">保護您儲存的密碼</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存下來的登入資訊與密碼，避免別人盜用。</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存的密碼，避免別人盜用。</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">稍後處理</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1811,6 +1844,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">排序登入資訊選單</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">排序密碼選單</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">自動填寫</string>
@@ -1819,10 +1855,16 @@
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">信用卡</string>
 
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">付款方式</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">儲存並自動填寫卡片</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">儲存並自動填寫付款方式</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">資料有加密</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s 會加密您儲存的所有付款方式資料</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">在不同裝置間同步卡片資料</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1830,17 +1872,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">新增信用卡</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">新增付款卡片</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">管理已儲存的卡片</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">管理卡片</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">新增地址</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">管理已存地址</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">儲存並自動填寫地址</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">儲存並自動填寫地址</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">包含電話號碼、E-Mail、收件地址等資訊</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">包含電話號碼與電子郵件地址</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">新增付款卡片</string>
     <!-- Title of the "Edit card" screen -->
@@ -1861,6 +1912,8 @@
     <string name="credit_cards_delete_card_button">刪除卡片</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">你確定要刪除這張信用卡嗎？</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">要刪除卡片嗎？</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">刪除</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1876,14 +1929,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">請輸入有效的信用卡號</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">請輸入有效卡號</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">請填寫此欄位</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">請輸入持卡人姓名</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">解鎖後即可檢視儲存的卡片資訊</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">保護您的信用卡資訊</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">保護您儲存的付款方式</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存的信用卡資訊，避免別人盜用。</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存的卡片資訊，避免別人盜用。</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">立即設定</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1894,6 +1955,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">解鎖後，即可使用儲存的信用卡資訊</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">解鎖後即可使用儲存的付款方式</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">新增地址</string>
     <!-- Title of the "Edit address" screen -->
@@ -1931,6 +1994,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">您確定要刪除這筆地址嗎？</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">要刪除這個地址嗎？</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">刪除</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2029,30 +2094,52 @@
     <string name="login_menu_edit_button">編輯</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">您確定要刪除這筆登入資訊嗎？</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">你確定要刪除這筆密碼嗎？</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">刪除</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">取消</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">登入選項</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">密碼選項</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">登入資訊當中，網址的輸入欄位。</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">網址的輸入欄位。</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">登入資訊當中，使用者名稱的輸入欄位。</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">使用者名稱的輸入欄位。</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">登入資訊當中，密碼的輸入欄位。</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">密碼的輸入欄位。</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">儲存編輯過的登入資訊。</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">儲存變更。</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">編輯</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">編輯密碼</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">新增登入資訊</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">新增密碼</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">需要密碼</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">輸入密碼</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">必須輸入使用者名稱</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">輸入使用者名稱</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">必須輸入主機名稱</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">輸入網址</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">語音搜尋</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2426,6 +2513,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">永不翻譯 %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">永不翻譯此網站</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">覆蓋所有其他設定</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">覆蓋提供翻譯功能</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">翻譯設定</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->

From f63999e5551c166b64956745188cbcdb229f9902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Mon, 22 Jan 2024 13:48:30 +0100
Subject: [PATCH 020/222] Bug 1832147 - Remove the leaf feature from the
 profiler presets

"leaf" feature has been removed since [Bug 1571089](https://bugzilla.mozilla.org/show_bug.cgi?id=1571089)
and it's been removed from the presets in that bug as well. This commit
removes this feature from these presets as well to keep them in sync.
Note that having an unrecognised feature gets ignored automatically and
it doesn't throw any error, but still these presets should kept up-to-date.
---
 .../java/org/mozilla/fenix/perf/ProfilerUtils.kt     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt b/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
index 2808bb36e..953cc12ed 100644
--- a/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
+++ b/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
@@ -24,8 +24,14 @@ private const val TOKEN = "profileToken"
 private const val PROFILER_DATA_URL = "https://profiler.firefox.com/public/"
 
 private val firefox_features = arrayOf(
-    "screenshots", "js", "leaf", "stackwalk", "cpu", "java",
-    "processcpu", "ipcmessages", "java",
+    "screenshots",
+    "js",
+    "stackwalk",
+    "cpu",
+    "java",
+    "processcpu",
+    "ipcmessages",
+    "java",
 )
 private val firefox_threads = arrayOf(
     "GeckoMain",
@@ -49,7 +55,6 @@ private val graphics_threads = arrayOf(
 
 private val media_features = arrayOf(
     "js",
-    "leaf",
     "stackwalk",
     "cpu",
     "audiocallbacktracing",
@@ -67,7 +72,6 @@ private val media_threads = arrayOf(
 private val networking_features = arrayOf(
     "screenshots",
     "js",
-    "leaf",
     "stackwalk",
     "cpu",
     "java",

From 6915dd6599c10418a6cad86822bbc30bcf9a4503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Mon, 22 Jan 2024 13:54:09 +0100
Subject: [PATCH 021/222] Bug 1832147 - Remove extraneous "java" feature

It looks like the "java" feature appears twice in the firefox_features
list. Let's remove the second one.
---
 app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt b/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
index 953cc12ed..7e109de56 100644
--- a/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
+++ b/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
@@ -31,7 +31,6 @@ private val firefox_features = arrayOf(
     "java",
     "processcpu",
     "ipcmessages",
-    "java",
 )
 private val firefox_threads = arrayOf(
     "GeckoMain",

From 4cf2674ff3eed7857d1ca69e3fa41312bfba5bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Mon, 22 Jan 2024 14:07:12 +0100
Subject: [PATCH 022/222] Bug 1832147 - Sync the profiler preset features and
 threads

See here for the preset list inside Firefox:
https://searchfox.org/mozilla-central/rev/c130c69b7b863d5e28ab9524b65c27c7a9507c48/devtools/client/performance-new/shared/background.jsm.js#121
---
 app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt b/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
index 7e109de56..530c6f113 100644
--- a/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
+++ b/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
@@ -50,6 +50,7 @@ private val graphics_threads = arrayOf(
     "SceneBuilder",
     "WrWorker",
     "CanvasWorkers",
+    "TextureUpdate",
 )
 
 private val media_features = arrayOf(
@@ -65,7 +66,7 @@ private val media_threads = arrayOf(
     "cubeb", "audio", "BackgroundThreadPool", "camera", "capture", "Compositor", "decoder", "GeckoMain", "gmp",
     "graph", "grph", "InotifyEventThread", "IPDL Background", "media", "ModuleProcessThread", "PacerThread",
     "RemVidChild", "RenderBackend", "Renderer", "Socket Thread", "SwComposite",
-    "webrtc",
+    "webrtc", "TextureUpdate",
 )
 
 private val networking_features = arrayOf(
@@ -75,6 +76,7 @@ private val networking_features = arrayOf(
     "cpu",
     "java",
     "processcpu",
+    "bandwidth",
     "ipcmessages",
 )
 

From c443d4a37f032cedb1db166fc9cb1ebda0d6cb04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Mon, 22 Jan 2024 14:16:14 +0100
Subject: [PATCH 023/222] Bug 1832147 - Add a note to keep the profiler presets
 in sync

---
 app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt b/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
index 530c6f113..28a8211e5 100644
--- a/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
+++ b/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt
@@ -23,6 +23,9 @@ private const val PROFILER_SERVER_HEADER = "application/vnd.firefox-profiler+jso
 private const val TOKEN = "profileToken"
 private const val PROFILER_DATA_URL = "https://profiler.firefox.com/public/"
 
+// IMPORTANT NOTE: Please keep the profiler presets in sync with their Firefox Desktop counterparts:
+// https://searchfox.org/mozilla-central/rev/c130c69b7b863d5e28ab9524b65c27c7a9507c48/devtools/client/performance-new/shared/background.jsm.js#121
+
 private val firefox_features = arrayOf(
     "screenshots",
     "js",

From 03883cc976ee27113126d75d7d130c6271df931b Mon Sep 17 00:00:00 2001
From: Ben Dean-Kawamura <bdk@mozilla.com>
Date: Thu, 18 Jan 2024 09:59:18 -0500
Subject: [PATCH 024/222] Bug 1875294 - Record breadbcrumbs before crashing
 with UnsatsisfiedLinkError

Report breadcrumbs to Sentry before crashing with
`UnsatsisfiedLinkError`:

  - The files inside the app directory, to detect if the library is
    present or not.
  - The files inside the APK, to detect if a file inside the APK didn't
    get installed correctly.
  - The name of the installer package, so that we can know if the APK
    was installed from a 3rd-party source.
  - The path to the APK.  I don't really see this being useful, but it's
    needed to determine all the other info, so we might as well report
    it.

The idea here is that hopefully one of these will detect that something
was off with their install.  For example, maybe they installed an APK
for the wrong arch or maybe `libjnidispatch` was not extracted
correctly.  If not, at least we can rule these possibilities out as the
root cause.
---
 .../org/mozilla/fenix/FenixApplication.kt     | 76 +++++++++++++++++--
 1 file changed, 71 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
index 264b9dc71..43df89613 100644
--- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
+++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -112,8 +112,11 @@ import org.mozilla.fenix.session.VisibilityLifecycleCallback
 import org.mozilla.fenix.utils.Settings
 import org.mozilla.fenix.utils.Settings.Companion.TOP_SITES_PROVIDER_MAX_THRESHOLD
 import org.mozilla.fenix.wallpapers.Wallpaper
+import java.io.File
+import java.io.FileInputStream
 import java.util.UUID
 import java.util.concurrent.TimeUnit
+import java.util.zip.ZipInputStream
 import kotlin.math.roundToLong
 
 private const val RAM_THRESHOLD_MEGABYTES = 1024
@@ -521,13 +524,76 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
      * thread, early in the app startup sequence.
      */
     private fun beginSetupMegazord() {
-        // Note: Megazord.init() must be called as soon as possible ...
-        Megazord.init()
+        try {
+            // Note: Megazord.init() must be called as soon as possible ...
+            Megazord.init()
+
+            initializeRustErrors(components.analytics.crashReporter)
+            // ... but RustHttpConfig.setClient() and RustLog.enable() can be called later.
 
-        initializeRustErrors(components.analytics.crashReporter)
-        // ... but RustHttpConfig.setClient() and RustLog.enable() can be called later.
+            RustLog.enable()
+        } catch (e: UnsatisfiedLinkError) {
+            @Suppress("TooGenericExceptionCaught")
+            try {
+                reportUnsatisfiedLinkErrorBreadcrumbs()
+            } catch (e: Throwable) {
+                // This shouldn't happen, but if it does it's better to ignore the exception from
+                // the breadcrumb code and rethrow the initial exception.
+            }
+            throw e
+        }
+    }
 
-        RustLog.enable()
+    private fun reportUnsatisfiedLinkErrorBreadcrumbs() {
+        val breadcrumbStrings = mutableListOf<String>()
+        val apkPath = applicationContext.getApplicationInfo().sourceDir
+        breadcrumbStrings.add("APK: $apkPath")
+        val apkDir = File(apkPath).getParentFile()
+        val installSourcePackage = if (SDK_INT >= Build.VERSION_CODES.R) {
+            packageManager.getInstallSourceInfo(packageName).installingPackageName
+        } else {
+            @Suppress("DEPRECATION")
+            packageManager.getInstallerPackageName(packageName)
+        }
+        breadcrumbStrings.add("Installer package name: $installSourcePackage")
+
+        val installDirFileSet = if (apkDir != null) {
+            apkDir.walk()
+                .filter { it != apkDir && !it.isDirectory() }
+                .map { it.relativeTo(apkDir).toString() }
+                .filter { it.startsWith("lib/") }
+                .toHashSet()
+        } else {
+            HashSet()
+        }
+        val apkFileSet = ZipInputStream(FileInputStream(apkPath)).use {
+            generateSequence { it.nextEntry }
+                .map { it.name }
+                .filter { it.startsWith("lib/") }
+                .toHashSet()
+        }
+        fun formatFileSet(filenames: Set<String>) = if (filenames.size > 0) {
+            filenames.joinToString(", ")
+        } else {
+            "<none>"
+        }
+        val installDirOnly = formatFileSet(installDirFileSet - apkFileSet)
+        val apkFileOnly = formatFileSet(apkFileSet - installDirFileSet)
+        val both = formatFileSet(installDirFileSet union apkFileSet)
+
+        breadcrumbStrings.add("Files only inside lib/ dir: $installDirOnly")
+        breadcrumbStrings.add("Files only inside APK lib/ dir: $apkFileOnly")
+        breadcrumbStrings.add("Files inside both lib/ dirs: $both")
+
+        for (breadcrumbString in breadcrumbStrings) {
+            components.analytics.crashReporter.recordCrashBreadcrumb(
+                Breadcrumb(
+                    category = "Startup",
+                    message = breadcrumbString,
+                    level = Breadcrumb.Level.INFO,
+                ),
+            )
+        }
     }
 
     @OptIn(DelicateCoroutinesApi::class) // GlobalScope usage

From 6589162a995be9f1f02a73d641c387e46763e0f7 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Thu, 4 Jan 2024 17:07:02 -0500
Subject: [PATCH 025/222] Bug 1860472 - Clean temporary file Uploads.

---
 app/src/main/java/org/mozilla/fenix/FenixApplication.kt    | 1 +
 .../org/mozilla/fenix/addons/AddonPopupBaseFragment.kt     | 1 +
 .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt  | 1 +
 app/src/main/java/org/mozilla/fenix/components/Core.kt     | 7 +++++++
 4 files changed, 10 insertions(+)

diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
index 43df89613..b4f37a0af 100644
--- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
+++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -384,6 +384,7 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
                             components.fxSuggest.ingestionScheduler.stopPeriodicIngestion()
                         }
                     }
+                    components.core.fileUploadsDirCleaner.cleanUploadsDirectory()
                 }
                 // Account manager initialization needs to happen on the main thread.
                 GlobalScope.launch(Dispatchers.Main) {
diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt
index 168ab2fe9..b1c54ee1f 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt
@@ -43,6 +43,7 @@ abstract class AddonPopupBaseFragment : Fragment(), EngineSession.Observer, User
                     store = requireComponents.core.store,
                     customTabId = it.id,
                     fragmentManager = parentFragmentManager,
+                    fileUploadsDirCleaner = requireComponents.core.fileUploadsDirCleaner,
                     onNeedToRequestPermissions = { permissions ->
                         requestPermissions(permissions, REQUEST_CODE_PROMPT_PERMISSIONS)
                     },
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 7c667782a..cf237221d 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -696,6 +696,7 @@ abstract class BaseBrowserFragment :
                 fragmentManager = parentFragmentManager,
                 identityCredentialColorsProvider = colorsProvider,
                 tabsUseCases = requireComponents.useCases.tabsUseCases,
+                fileUploadsDirCleaner = requireComponents.core.fileUploadsDirCleaner,
                 creditCardValidationDelegate = DefaultCreditCardValidationDelegate(
                     context.components.core.lazyAutofillStorage,
                 ),
diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt
index e87e48814..22447bbe2 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -50,6 +50,8 @@ import mozilla.components.feature.media.MediaSessionFeature
 import mozilla.components.feature.media.middleware.LastMediaAccessMiddleware
 import mozilla.components.feature.media.middleware.RecordingDevicesMiddleware
 import mozilla.components.feature.prompts.PromptMiddleware
+import mozilla.components.feature.prompts.file.FileUploadsDirCleaner
+import mozilla.components.feature.prompts.file.FileUploadsDirCleanerMiddleware
 import mozilla.components.feature.pwa.ManifestStorage
 import mozilla.components.feature.pwa.WebAppShortcutManager
 import mozilla.components.feature.readerview.ReaderViewMiddleware
@@ -195,6 +197,10 @@ class Core(
         )
     }
 
+    val fileUploadsDirCleaner: FileUploadsDirCleaner by lazyMonitored {
+        FileUploadsDirCleaner { context.cacheDir }
+    }
+
     val geckoRuntime: GeckoRuntime by lazyMonitored {
         GeckoProvider.getOrCreateRuntime(
             context,
@@ -292,6 +298,7 @@ class Core(
                 SessionPrioritizationMiddleware(),
                 SaveToPDFMiddleware(context),
                 FxSuggestFactsMiddleware(),
+                FileUploadsDirCleanerMiddleware(fileUploadsDirCleaner),
             )
 
         BrowserStore(

From 29dab5ce0aea75bebaaeaaf5ac43407be54097df Mon Sep 17 00:00:00 2001
From: Noah Bond <nbond@mozilla.com>
Date: Tue, 23 Jan 2024 10:18:43 -0800
Subject: [PATCH 026/222] Bug 1876122 - Enable the debug drawer in Beta and
 Release

---
 .../java/org/mozilla/fenix/HomeActivity.kt    | 46 +++++++++----------
 .../fenix/settings/SecretSettingsFragment.kt  |  3 +-
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 7c94eae28..773c4e951 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -266,34 +266,32 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
 
         binding = ActivityHomeBinding.inflate(layoutInflater)
 
-        if (Config.channel.isNightlyOrDebug) {
-            lifecycleScope.launch {
-                val debugSettingsRepository = DefaultDebugSettingsRepository(
-                    context = this@HomeActivity,
-                    writeScope = this,
-                )
+        lifecycleScope.launch {
+            val debugSettingsRepository = DefaultDebugSettingsRepository(
+                context = this@HomeActivity,
+                writeScope = this,
+            )
 
-                debugSettingsRepository.debugDrawerEnabled
-                    .distinctUntilChanged()
-                    .collect { enabled ->
-                        with(binding.debugOverlay) {
-                            if (enabled) {
-                                visibility = View.VISIBLE
-
-                                setContent {
-                                    FenixOverlay(
-                                        browserStore = components.core.store,
-                                        inactiveTabsEnabled = settings().inactiveTabsAreEnabled,
-                                    )
-                                }
-                            } else {
-                                setContent {}
-
-                                visibility = View.GONE
+            debugSettingsRepository.debugDrawerEnabled
+                .distinctUntilChanged()
+                .collect { enabled ->
+                    with(binding.debugOverlay) {
+                        if (enabled) {
+                            visibility = View.VISIBLE
+
+                            setContent {
+                                FenixOverlay(
+                                    browserStore = components.core.store,
+                                    inactiveTabsEnabled = settings().inactiveTabsAreEnabled,
+                                )
                             }
+                        } else {
+                            setContent {}
+
+                            visibility = View.GONE
                         }
                     }
-            }
+                }
         }
 
         setContentView(binding.root)
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
index 86b2aabeb..ecffe568a 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
@@ -108,9 +108,8 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
         }
 
         lifecycleScope.launch {
-            // During initial development, this will only be available in Nightly or Debug builds.
             requirePreference<SwitchPreference>(R.string.pref_key_enable_debug_drawer).apply {
-                isVisible = Config.channel.isNightlyOrDebug
+                isVisible = true
                 isChecked = debugSettingsRepository.debugDrawerEnabled.first()
                 onPreferenceChangeListener =
                     Preference.OnPreferenceChangeListener { _, newValue ->

From 5580e589130d61222e25d73291aa861c6cd6f0e2 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Thu, 25 Jan 2024 00:03:34 +0000
Subject: [PATCH 027/222] Import translations from android-l10n

---
 app/src/main/res/values-br/strings.xml     |  64 +++++++++-
 app/src/main/res/values-bs/strings.xml     |  92 ++++++++++++++
 app/src/main/res/values-cy/strings.xml     |  92 ++++++++++++++
 app/src/main/res/values-dsb/strings.xml    |  91 ++++++++++++++
 app/src/main/res/values-el/strings.xml     |  90 ++++++++++++++
 app/src/main/res/values-en-rGB/strings.xml |  92 ++++++++++++++
 app/src/main/res/values-es-rAR/strings.xml |  91 ++++++++++++++
 app/src/main/res/values-es-rCL/strings.xml | 100 ++++++++++++++-
 app/src/main/res/values-fi/strings.xml     |  79 ++++++++++++
 app/src/main/res/values-gn/strings.xml     |  57 ++++++++-
 app/src/main/res/values-hsb/strings.xml    |   6 +
 app/src/main/res/values-hy-rAM/strings.xml |  91 ++++++++++++++
 app/src/main/res/values-sl/strings.xml     |  10 ++
 app/src/main/res/values-sv-rSE/strings.xml | 135 +++++++++++++++------
 app/src/main/res/values-ug/strings.xml     |  27 +++++
 app/src/main/res/values-uk/strings.xml     | 105 +++++++++++++++-
 16 files changed, 1172 insertions(+), 50 deletions(-)

diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index f80f2a7e0..25c988085 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -311,12 +311,12 @@
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
     <string name="onboarding_home_enable_notifications_negative_button">Ket bremañ</string>
 
-    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Ho surentez a zo talvoudus deomp</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">evezhiadennoù a-fet buhez prevez</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">evezhiadennoù a-fet buhez prevez</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Lakaat da verdeer dre ziouer</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -648,6 +648,8 @@
     <string name="preferences_sync_bookmarks">Sinedoù</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Titouroù kennaskañ</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Gerioù-tremen</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Ivinelloù digor</string>
     <!-- Preference for signing out -->
@@ -675,6 +677,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Kartennoù kred</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Doareoù paeañ</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Chomlecʼhioù</string>
 
@@ -1252,6 +1256,10 @@
     <!-- Notifications -->
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">Serriñ an ivinelloù prevez</string>
+
+    <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
+    <string name="notification_erase_title_android_14">Serriñ an ivinelloù prevez?</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">Marketing</string>
 
@@ -1602,8 +1610,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Titouroù kennaskañ</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Gerioù-tremen</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Enrollañ an titouroù kennaskañ</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Enrollañ ar gerioù-tremen</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Goulenn a-raok enrollañ</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1621,12 +1633,19 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Ouzhpennañ titouroù kennaskañ</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Ouzhpennañ ur ger-tremen</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Goubredañ an titouroù kennaskañ</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Goubredañ ar gerioù-tremen</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Goubredañ an titouroù kennaskañ dre an trevnadoù</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Titouroù kennaskañ enrollet</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Gerioù-tremen enrollet</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">An titouroù kennaskañ a enrollit pe c’houbredit e %s a vo diskouezet amañ.</string>
     <!-- Preference to access list of saved logins -->
@@ -1641,6 +1660,8 @@
     <string name="preferences_passwords_exceptions_remove_all">Dilemel an holl nemedennoù</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Klask titouroù kennaskañ</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Klask er gerioù-tremen</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Lec’hienn</string>
     <!-- The header for the username for a login -->
@@ -1672,6 +1693,8 @@
     <string name="logins_biometric_prompt_message">Dibrennit evit gwelet ho titouroù kennaskañ enrollet</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Diogelit ho titouroù kennaskañ</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Diogelit ho kerioù-tremen enrollet</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Arventennit ur patrom morailh, ur PIN pe ur ger-tremen evit gwareziñ ho titouroù kennaskañ enrollet da vezañ lennet gant unan bennak all.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1698,8 +1721,12 @@
     <string name="preferences_addresses">Chomlec’hioù</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Kartennoù kred</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Doareoù paeañ</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Enrollañ ha leuniañ ar c’hartennoù en un doare emgefreek</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Enrollañ ha leuniañ an doareoù paeañ</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Rineget eo ar roadennoù</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
@@ -1708,9 +1735,13 @@
     <string name="preferences_credit_cards_sync_cards">Goubredañ ar c\'hartennoù</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Ouzhpennañ ur gartenn gred</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Ouzhpennañ ur gartenn</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Merañ ar c’hartennoù enrollet</string>
 
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Merañ ar c’hartennoù</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Ouzhpennañ ur chomlec’h</string>
     <!-- Preference option for managing saved addresses -->
@@ -1718,6 +1749,8 @@
 
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Enrollañ ha leuniañ ar chomlec’hioù en un doare emgefreek</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Enrollañ ha leuniañ ar chomlec’hioù</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Enkorfañ a ra titouroù evel niverennoù, posteloù ha chomlec’hioù</string>
 
@@ -1742,6 +1775,8 @@
     <string name="credit_cards_delete_card_button">Dilemel ar gartenn</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Ha fellout a ra deocʼh dilemel ar gartenn gred-mañ?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Dilemel ar gartenn?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Dilemel</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1756,13 +1791,19 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Biziatait un niverenn kartenn gred talvoudek mar plij.</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Enankit un niverenn gartenn reizh</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Mar plij, leugnit ar maez-mañ</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Ouzhpennañ un anv</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Dibrennit da welet ho kartennoù enrollet</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Diogelit ho kartennoù kred</string>
 
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Diogelit ho toareoù paeañ enrollet</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Arventennit ur patrom prennañ, ur PIN pe ur ger-tremen evit gwareziñ ho kartennoù kred enrollet ma vez ho trevnad gant unan bennak all.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1812,6 +1853,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Ha sur oc’h e fell deoc’h dilemel ar chomlec’h-mañ?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Dilemel ar chomlec’h-mañ?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Dilemel</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1909,6 +1952,8 @@
     <string name="login_menu_edit_button">Embann</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Sur oc’h e fell deoc’h dilemel an titour-kennaskañ-mañ?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Sur ocʼh e fell deocʼh dilemel ar ger-tremen-mañ?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Dilemel</string>
     <!-- Negative action of a dialog asking to delete login -->
@@ -1923,16 +1968,28 @@
     <string name="saved_login_password_description">Ar vaezienn destenn kemmus evit ger-tremen an titour kennaskañ.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Enrollañ ar c’hemmoù d’an titouroù kennaskañ.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Enrollañ ar cʼhemmoù.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Embann</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Aozañ ar ger-tremen</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Ouzhpennañ titouroù kennaskañ nevez</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Ouzhpennañ ur ger-tremen</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Ger-tremen azgoulennet</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Enankit ur ger-tremen</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Anv-implijer rekis</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Enankit un anv-implijer</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Anv an ostiz rekis</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Enankit ur chomlecʼh web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Klask dre vouezh</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2197,6 +2254,9 @@
     <!-- Content description for headings announced by accessibility service. The first parameter is the text of the heading. Talkback will announce the first parameter and then speak the word "Heading" indicating to the user that this text is a heading for a section. -->
     <string name="a11y_heading">%s, titl</string>
 
+    <!-- Title for dialog displayed when trying to access links present in a text. -->
+    <string name="a11y_links_title">Ereoù</string>
+
     <!-- Translations feature-->
 
     <!-- Translation request dialog -->
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 28a1ed0e9..777059a7b 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -702,6 +702,8 @@
     <string name="preferences_sync_bookmarks">Zabilješke</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Prijave</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Lozinke</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Otvori tabove</string>
     <!-- Preference for signing out -->
@@ -728,6 +730,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Kreditne kartice</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Načini plaćanja</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adrese</string>
 
@@ -1665,8 +1669,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Prijave i lozinke</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Lozinke</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Spašene prijave i lozinke</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Sačuvaj lozinke</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Pitaj za spašavanje</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1683,26 +1691,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Dodaj prijavu</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Dodaj lozinku</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sinkroniziraj prijave</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sinhronizuj lozinke</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sinhronizirajte prijave na svim uređajima</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sinhronizuj lozinke na svim uređajima</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Spašene prijave</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Sačuvane lozinke</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Prijave koje spasite ili sinhronizujete sa %s će se prikazati ovdje.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Lozinke koje sačuvate ili sinhronizujete sa %s će biti navedene ovdje. Sve lozinke koje sačuvate su šifrovane.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Saznajte više o Syncu.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Saznajte više o sinhronizaciji</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Izuzeci</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Prijave i lozinke koje nisu spašene će biti prikazane ovdje.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s neće sačuvati lozinke za web stranice navedene ovdje.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Prijave i lozinke neće biti spašene za ove web stranice.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s neće sačuvati lozinke za ove stranice.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Obriši sve izuzetke</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Pretraži prijave</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Traži lozinke</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Stranica</string>
     <!-- The header for the username for a login -->
@@ -1732,10 +1760,16 @@
     <string name="saved_login_hide_password">Sakrij lozinku</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Otključajte za pregled spašenih prijava</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Otključajte da vidite sačuvane lozinke</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Osigurajte svoje prijave i lozinke</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Osigurajte svoje sačuvane lozinke</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Podesite pattern za zaključavanje uređaja, PIN ili lozinku da zaštitite vaše spašene prijave i lozinke od pristupa druge osobe koja ima vaš uređaj.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Postavite obrazac za zaključavanje uređaja, PIN ili lozinku da zaštitite svoje sačuvane lozinke od pristupa ako neko drugi ima vaš uređaj.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Kasnije</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1754,6 +1788,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sortiraj meni prijava</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Meni za sortiranje lozinki</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Automatsko popunjavanje</string>
@@ -1761,28 +1798,43 @@
     <string name="preferences_addresses">Adrese</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Kreditne kartice</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Načini plaćanja</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Sačuvajte i automatski popunjavajte kartice</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Sačuvaj i popuni načine plaćanja</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Podaci su šifrovani</string>
 
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s šifruje sve načine plaćanja koje sačuvate</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sinhronizujte kartice na svim uređajima</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sinhronizuj kartice</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Dodaj kreditnu karticu</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Dodaj karticu</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Upravljaj sačuvanim karticama</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Upravljajte karticama</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Dodaj adresu</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Upravljaj adresama</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Sačuvajte i automatski popunjavajte adrese</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Sačuvajte i popunite adrese</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Uključite informacije kao što su brojevi, e-mail i adrese za dostavu</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Uključuje brojeve telefona i email adrese</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Dodaj karticu</string>
     <!-- Title of the "Edit card" screen -->
@@ -1803,6 +1855,8 @@
     <string name="credit_cards_delete_card_button">Izbriši karticu</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Jeste li sigurni da želite izbrisati ovu kreditnu karticu?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Izbrisati karticu?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Izbriši</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1815,14 +1869,22 @@
     <string name="credit_cards_saved_cards">Sačuvane kartice</string>
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Unesite važeći broj kreditne kartice</string>
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Unesite važeći broj kartice</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Molimo popunite ovo polje</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Dodaj ime</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Otključajte da vidite svoje sačuvane kartice</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Osigurajte svoje kreditne kartice</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Osigurajte svoje sačuvane načine plaćanja</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Postavite obrazac za zaključavanje uređaja, PIN ili lozinku da zaštitite svoje sačuvane kreditne kartice od pristupa ako neko drugi ima vaš uređaj.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Postavite obrazac za zaključavanje uređaja, PIN ili lozinku da zaštitite svoje sačuvane kartice od pristupa ako neko drugi ima vaš uređaj.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Podesi odmah</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1832,6 +1894,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Otključajte za korištenje sačuvanih podataka o kreditnoj kartici</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Otključajte da koristite sačuvane načine plaćanja</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Dodaj adresu</string>
     <!-- Title of the "Edit address" screen -->
@@ -1868,6 +1932,8 @@
     <string name="addressess_delete_address_button">Izbriši adresu</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Jeste li sigurni da želite izbrisati ovu adresu?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Izbrisati ovu adresu?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Izbriši</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1966,31 +2032,53 @@
     <string name="login_menu_edit_button">Uredi</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Da li ste sigurni da želite obrisati ovu prijavu?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Jeste li sigurni da želite izbrisati ovu lozinku?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Obriši</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Otkaži</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Opcije prijave</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opcije lozinke</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Izmjenjivo tekstualno polje za web adresu prijave.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Tekstualno polje koje se može uređivati za adresu web stranice lozinke.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Izmjenjivo tekstualno polje za korisničko ime prijave.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Tekstualno polje koje se može uređivati za korisničko ime lozinke.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Izmjenjivo tekstualno polje za lozinku prijave.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Tekstualno polje koje se može uređivati za lozinku.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Spasite izmjene za prijavu.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Sačuvaj promjene.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Uredi</string>
 
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Uredi lozinku</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Dodaj novu prijavu</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Dodaj lozinku</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Potrebna lozinka</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Unesite lozinku</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Korisničko ime je obavezno</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Unesite korisničko ime</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Ime hosta je obavezno</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Unesite web adresu</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Glasovna pretraga</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2362,6 +2450,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Nikada ne prevodi %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Nikad ne prevodi ovu stranicu</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Poništava sve ostale postavke</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Poništava ponude za prevođenje</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Postavke prijevoda</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 0467d625b..b2bcf32c0 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -720,6 +720,8 @@
     <string name="preferences_sync_bookmarks">Nodau Tudalen</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Mewngofnodion</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Cyfrineiriau</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Tabiau agored</string>
     <!-- Preference for signing out -->
@@ -746,6 +748,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Cardiau credyd</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Dulliau talu</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Cyfeiriadau</string>
 
@@ -1686,8 +1690,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Mewngofnodion a chyfrineiriau</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Cyfrineiriau</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Cadw mewngofnodion a chyfrineiriau</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Arbed cyfrineiriau</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Gofyn i gadw</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1704,26 +1712,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Ychwanegu mewngofnod</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Ychwanegu cyfrinair</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Cydweddu mewngofnodion</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Cysoni cyfrineiriau</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Cydweddu mewngofnodion ar draws dyfeisiau</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Cysoni cyfrineiriau ar draws dyfeisiau</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Mewngofnodion wedi’u cadw</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Cyfrineiriau wedi\'u cadw</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Bydd y mewngofnodi rydych yn eu cadw neu’n cydweddu i %s i’w gweld yma.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Bydd y cyfrineiriau rydych yn eu cadw neu eu cysoni i %s yn cael eu rhestru yma. Mae\'r holl gyfrineiriau rydych chi\'n eu cadw wedi\'u hamgryptio.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Dysgu rhagor am Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Dysgwch fwy am gysoni</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Eithriadau</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Bydd mewngofnodion a chyfrineiriau sydd heb eu cadw i’w gweld yma.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">Ni fydd %s yn cadw cyfrineiriau ar gyfer gwefannau a restrir yma.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Ni fydd mewngofnodion a chyfrineiriau’n cael eu cadw ar gyfer y gwefannau hyn.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">Ni fydd %s yn cadw cyfrineiriau ar gyfer y gwefannau hyn.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Dileu pob eithriad</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Chwilio mewngofnodion</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Chwilio cyfrineiriau</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Gwefan</string>
     <!-- The header for the username for a login -->
@@ -1753,10 +1781,16 @@
     <string name="saved_login_hide_password">Cuddio cyfrinair</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Datgloi i weld eich mewngofnodi wedi’u cadw</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Datgloi i weld eich cyfrineiriau arbed</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Diogelu mewngofnodion a chyfrineiriau</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Diogelwch eich cyfrineiriau arbed</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Creu patrwm cloi dyfais, PIN, neu gyfrinair i ddiogelu eich mewngofnodion a’ch cyfrineiriau sydd wedi’u cadw rhag i rhywun arall sydd â mynediad i’ch dyfais.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Sefydlwch batrwm clo dyfais, PIN, neu gyfrinair i amddiffyn eich cyfrineiriau sydd wedi\'u cadw rhag cael mynediad iddynt os oes gan rywun arall eich dyfais.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Yn hwyrach</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1775,6 +1809,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Trefnu dewislen mewngofnodi</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Dewislen cyfrineiriau didoli</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Awtolanw</string>
@@ -1782,10 +1819,16 @@
     <string name="preferences_addresses">Cyfeiriadau</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Cardiau credyd</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Dulliau talu</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Cadw ac awtolanw cardiau</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Cadw a llanw dulliau talu</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Mae data wedi’i amgryptio</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">Mae %s yn amgryptio pob dull talu rydych yn ei gadw</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Cydweddu cardiau ar draws dyfeisiau</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1793,17 +1836,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Ychwanegu cerdyn credyd</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Ychwanegu cerdyn</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Rheoli cardiau wedi’u cadw</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Rheoli cardiau</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Ychwanegu cyfeiriad</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Rheoli cyfeiriadau</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Cadw ac awtolanw cyfeiriadau</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Cadw a llanw cyfeiriadau</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Cynhwyswch fanylion fel rhifau, cyfeiriadau e-bost a chludo</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Yn cynnwys rhifau ffôn a chyfeiriadau e-bost</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Ychwanegu cerdyn</string>
     <!-- Title of the "Edit card" screen -->
@@ -1824,6 +1876,8 @@
     <string name="credit_cards_delete_card_button">Dileu cerdyn</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Ydych chi’n siŵr eich bod am ddileu’r cerdyn credyd yma?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Dileu cerdyn?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Dileu</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1839,14 +1893,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Rhowch rif cerdyn credyd dilys</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Rhowch rif cerdyn dilys</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Llanwch y maes yma.</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Ychwanegu enw</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Datgloi i weld y cardiau rydych wedi’u cadw</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Diogelwch eich cerdyn credyd</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Sicrhewch eich dulliau talu sydd wedi\'u cadw</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Gosodwch batrwm cloi dyfais, PIN, neu gyfrinair i ddiogelu eich mewngofnodion a’ch cyfrineiriau sydd wedi’u cadw rhag i rhywun arall sydd â mynediad i’ch dyfais.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Sefydlwch batrwm clo dyfais, PIN, neu gyfrinair i amddiffyn eich cardiau sydd wedi\'u cadw rhag cael mynediad iddynt os oes gan rywun arall eich dyfais.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Gosod nawr</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1857,6 +1919,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Datglowch i ddefnyddio manylion cerdyn credyd wedi’i storio</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Datgloi i ddefnyddio dulliau talu wedi\'u cadw</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Ychwanegu cyfeiriad</string>
     <!-- Title of the "Edit address" screen -->
@@ -1894,6 +1958,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Ydych chi’n siŵr eich bod am ddileu’r cyfeiriad hwn?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Dileu\'r cyfeiriad hwn?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Dileu</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1992,30 +2058,52 @@
     <string name="login_menu_edit_button">Golygu</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Ydych chi’n siŵr eich bod eisiau dileu’r mewngofnod?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Ydych chi\'n siŵr eich bod am ddileu\'r cyfrinair hwn?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Dileu</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Diddymu</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Dewisiadau mewngofnodi</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opsiynau cyfrinair</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Maes testun golygadwy cyfeiriad gwe’r mewngofnodi.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Y maes testun y gellir ei olygu ar gyfer cyfeiriad gwefan y cyfrinair.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Maes testun golygadwy enw defnyddiwr y mewngofnodi.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Y maes testun y gellir ei olygu ar gyfer enw defnyddiwr y cyfrinair.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Maes testun golygadwy cyfrinair y mewngofnodi.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Y maes testun y gellir ei olygu ar gyfer y cyfrinair.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Cadw newidiadau i’r mewngofnodi.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Cadw newidiadau.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Golygu</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Golygu cyfrinair</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Ychwanegu mewngofnod newydd</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Ychwanegu cyfrinair</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Mae angen cyfrinair</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Rhowch gyfrinair</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Mae angen enw defnyddiwr</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Rhowch enw defnyddiwr</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Mae angen enw gwesteiwr</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Rhowch gyfeiriad gwe</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Chwilio llais</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2391,6 +2479,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Peidio â chyfieithu %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Peidio â chyfieithu\'r wefan hon</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Yn diystyru pob gosodiad arall</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Yn diystyru cynigion i gyfieithu</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Gosodiadau cyfieithu</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-dsb/strings.xml b/app/src/main/res/values-dsb/strings.xml
index f0548d150..a7f3174c3 100644
--- a/app/src/main/res/values-dsb/strings.xml
+++ b/app/src/main/res/values-dsb/strings.xml
@@ -717,6 +717,8 @@
     <string name="preferences_sync_bookmarks">Cytańske znamjenja</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Pśizjawjenja</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Gronidła</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Wócynjone rejtarki</string>
     <!-- Preference for signing out -->
@@ -743,6 +745,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Kreditowe kórty</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Płaśeńske metody</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adrese</string>
 
@@ -1687,8 +1691,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Pśizjawjenja a gronidła</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Gronidła</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Pśizjawjenja a gronidła składowaś</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Gronidła składowaś</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Pśed składowanim se pšašaś</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1705,26 +1713,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Pśizjawjenje pśidaś</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Gronidło pśidaś</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Pśizjawjenja synchronizěrowaś</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Gronidła synchronizěrowaś</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Pśizjawjenja mjazy rědami synchronizěrowaś</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Gronidła pśez rědy synchronizěrowaś</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Skłaźone pśizjawjenja</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Skłaźone gronidła</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Pśizjawjenja, kótarež składujośo abo z %s synchronizěrujośo, se how pokažu.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Gronidła, kótarež składujośo abo z %s synchronizěrujośo, se how nalicyju. Wšykne gronidła, kótarež składujośo, se koděruju.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Zgóńśo wěcej wó Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Zgóńśo wěcej wó sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Wuwześa</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Pśizjawjenja a gronidła, kótarež se njeskładuju, se how pokažu.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s gronidła za sedła njeskładujo, kótarež su how nalicone.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Pśizjawjenja a gronidła se za toś te sedła njeskładuju.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s gronidła za toś te sedła njeskładujo.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Wšykne wuwześa wulašowaś</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Pśizjawjenja pytaś</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Gronidła pśepytaś</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sedło</string>
     <!-- The header for the username for a login -->
@@ -1754,10 +1781,16 @@
     <string name="saved_login_hide_password">Gronidła schowaś</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Za zwobraznjowanje wašych skłaźonych pśizjawjenjow wótwóriś</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Za zwobraznjowanje wašych skłaźonych kreditowych gronidłow wótwóriś</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Zawěsććo swóje pśizjawjenja a gronidła</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Zawěsććo swóje skłaźone gronidła</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym pśizjawjenjam a gronidłam zajźował, jolic něchten drugi ma waš rěd.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym gronidłam zajźował, jolic něchten drugi ma waš rěd.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Pózdźej</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1777,6 +1810,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Meni pśizjawjeńskich datow sortěrowaś</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Meni „Gronidła sortěrowaś“</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Awtomatiski wupołniś</string>
@@ -1784,10 +1820,16 @@
     <string name="preferences_addresses">Adrese</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Kreditowe kórty</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Płaśeńske metody</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Kórty składowaś a awtomatiski wupołniś</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Płaśeńske metody składowaś a wupołniś</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Daty su skoděrowane</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s wšykne płaśeńske metody koděrujo, kótarež składujośo</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Kórty pśez rědy synchronizěrowaś</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1795,17 +1837,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Kreditowu kórtu pśidaś</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Kórtu pśidaś</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Skłaźone kórty zastojaś</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Kórty zastojaś</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adresu pśidaś</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Adrese zastojaś</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Adrese składowaś a awtomatiski wupołniś</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Adrese składowaś a wupołniś</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Informacije ako licby, e-mailowe a rozpósłańske adrese zapśimjeś</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Wopśimujo telefonowe numery a e-mailowe adrese</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Kórtu pśidaś</string>
     <!-- Title of the "Edit card" screen -->
@@ -1826,6 +1877,8 @@
     <string name="credit_cards_delete_card_button">Kórtu wulašowaś</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Cośo napšawdu toś tu kreditowu kórtu lašowaś?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Kórtu wulašowaś?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Lašowaś</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1841,14 +1894,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Pšosym zapódajśo płaśiwy numer kreditoweje kórty</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Zapódajśo płaśiwy kórtowy numer</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Pšosym wupołńśo toś to pólo</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Pśidajśo mě</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Za zwobraznjowanje wašych skłaźonych kreditowych kórtow wótwóriś</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Kreditowe kórty zawěsćiś</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Zawěsććo swóje skłaźone płaśeńske metody</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym kreditowym kórtam zajźował, jolic něchten drugi ma waš rěd.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym kórtam zajźował, jolic něchten drugi ma waš rěd.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Něnto konfigurěrowaś</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1859,6 +1920,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Blokěrowanje wótpóraś, aby se skłaźone informacije kreditoweje kórty wužywali</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Wótwóriś, aby wy skłaźone płaśeńske metody wužywał</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adresu pśidaś</string>
     <!-- Title of the "Edit address" screen -->
@@ -1896,6 +1959,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Cośo napšawdu toś tu adresu wulašowaś?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Toś tu adresu lašowaś?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Lašowaś</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1994,30 +2059,52 @@
     <string name="login_menu_edit_button">Wobźěłaś</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Cośo napšawdu toś to pśizjawjenje lašowaś?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Cośo napšawdu toś to gronidło lašowaś?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Lašowaś</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Pśetergnuś</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Pśizjawjeńske nastajenja</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Gronidłowe nastajenja</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Wobźěłujobne tekstowe pólo za webadresu pśizjawjenja.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Wobźěłujobne tekstowe pólo za adresu websedła gronidła.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Wobźěłujobne tekstowe pólo za wužywaŕske mě pśizjawjenja.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Wobźěłujobne tekstowe pólo za wužywaŕske mě gronidła.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Wobźěłujobne tekstowe pólo za gronidło pśizjawjenja.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Wobźěłujobne tekstowe pólo za gronidło.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Změny pśizjawjenja składowaś</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Změny składowaś.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Wobźěłaś</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Gronidło wobźěłaś</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Nowe pśizjawjenje pśidaś</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Gronidło pśidaś</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Gronidło trěbne</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Gronidło zapódaś</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Wužywaŕske mě trěbne.</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Wužywaŕske mě zapódaś</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hostmě trěbne.</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Webadresu zapódaś</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Głosowe pytanje</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2394,6 +2481,10 @@ To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produkt
     <string name="translation_option_bottom_sheet_never_translate_in_language">%1$s nigda njepśełožowaś</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Njepśełožujśo nigda toś to sedło</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Pśepisujo wšykne druge nastajenja</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Pśepisujo póbitowanja za pśełožowanje</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Pśełožowańske nastajenja</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 10ba9aa6d..4cc2310fa 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -340,6 +340,8 @@
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Μας αρέσει να σας προστατεύουμε</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Το πρόγραμμα περιήγησης του μη κερδοσκοπικού μας οργανισμού σταματά τις εταιρείες από το να σας ακολουθούν κρυφά σε όλο το διαδίκτυο.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Το πρόγραμμα περιήγησης του μη κερδοσκοπικού μας οργανισμού σταματά τις εταιρείες από το να σας ακολουθούν κρυφά σε όλο το διαδίκτυο.\n\nΜάθετε περισσότερα στη σημείωση απορρήτου μας.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -727,6 +729,8 @@
     <string name="preferences_sync_bookmarks">Σελιδοδείκτες</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Συνδέσεις</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Κωδικοί πρόσβασης</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Ανοικτές καρτέλες</string>
     <!-- Preference for signing out -->
@@ -753,6 +757,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Πιστωτικές κάρτες</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Μέθοδοι πληρωμής</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Διευθύνσεις</string>
 
@@ -1705,8 +1711,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Συνδέσεις και κωδικοί πρόσβασης</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Κωδικοί πρόσβασης</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Αποθήκευση συνδέσεων και κωδικών πρόσβασης</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Αποθήκευση κωδικών πρόσβασης</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Ερώτηση για αποθήκευση</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1724,26 +1734,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Προσθήκη σύνδεσης</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Προσθήκη κωδικού πρόσβασης</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Συγχρονισμός συνδέσεων</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Συγχρονισμός κωδικών πρόσβασης</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Συγχρονισμός συνδέσεων μεταξύ συσκευών</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Συγχρονισμός κωδικών πρόσβασης μεταξύ των συσκευών σας</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Αποθηκευμένες συνδέσεις</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Αποθηκευμένοι κωδικοί πρόσβασης</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Οι συνδέσεις που αποθηκεύετε ή συγχρονίζετε στο %s θα εμφανίζονται εδώ.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Οι κωδικοί πρόσβασης που αποθηκεύετε ή συγχρονίζετε στο %s θα εμφανίζονται εδώ. Όλοι οι κωδικοί πρόσβασης που αποθηκεύετε κρυπτογραφούνται.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Μάθετε περισσότερα σχετικά με το Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Μάθετε περισσότερα σχετικά με τον συγχρονισμό</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Εξαιρέσεις</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Εδώ εμφανίζονται οι συνδέσεις και οι κωδικοί πρόσβασης που δεν αποθηκεύονται.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">Το %s δεν θα αποθηκεύει κωδικούς πρόσβασης για τους ιστοτόπους που αναφέρονται εδώ.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Δεν θα αποθηκεύονται στοιχεία σύνδεσης για τους εξής ιστοτόπους.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">Το %s δεν θα αποθηκεύει κωδικούς πρόσβασης για αυτούς τους ιστοτόπους.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Διαγραφή όλων των εξαιρέσεων</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Αναζήτηση συνδέσεων</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Αναζήτηση κωδικών πρόσβασης</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Ιστότοπος</string>
     <!-- The header for the username for a login -->
@@ -1772,10 +1801,16 @@
     <string name="saved_login_hide_password">Απόκρυψη κωδικού πρόσβασης</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Ξεκλειδώστε για να δείτε τις αποθηκευμένες συνδέσεις σας</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Ξεκλειδώστε για να δείτε τους αποθηκευμένους κωδικούς πρόσβασής σας</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Προστασία στοιχείων σύνδεσης</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Προστασία των αποθηκευμένων κωδικών πρόσβασής σας</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Ορίστε ένα μοτίβο κλειδώματος συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για προστασία των αποθηκευμένων στοιχείων σύνδεσης, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Ορίστε ένα μοτίβο κλειδώματος συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για την προστασία των αποθηκευμένων κωδικών πρόσβασής σας, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Αργότερα</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1801,10 +1836,16 @@
     <string name="preferences_addresses">Διευθύνσεις</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Πιστωτικές κάρτες</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Μέθοδοι πληρωμής</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Αποθήκευση και αυτόματη συμπλήρωση στοιχείων καρτών</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Αποθήκευση και συμπλήρωση μεθόδων πληρωμής</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Τα δεδομένα κρυπτογραφούνται</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">Το %s κρυπτογραφεί όλες τις μεθόδους πληρωμής που αποθηκεύετε</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Συγχρονισμός καρτών μεταξύ συσκευών</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1812,8 +1853,12 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Προσθήκη πιστωτικής κάρτας</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Προσθήκη κάρτας</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Διαχείριση αποθηκευμένων καρτών</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Διαχείριση καρτών</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Προσθήκη διεύθυνσης</string>
     <!-- Preference option for managing saved addresses -->
@@ -1821,9 +1866,14 @@
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Αποθήκευση και αυτόματη συμπλήρωση διευθύνσεων</string>
 
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Αποθήκευση και συμπλήρωση διευθύνσεων</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Συμπεριλάβετε πληροφορίες, όπως αριθμούς, email και διευθύνσεις αποστολής</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Περιλαμβάνει αριθμούς τηλεφώνου και διευθύνσεις email</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Προσθήκη κάρτας</string>
     <!-- Title of the "Edit card" screen -->
@@ -1844,6 +1894,8 @@
     <string name="credit_cards_delete_card_button">Διαγραφή κάρτας</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Θέλετε σίγουρα να διαγράψετε αυτήν την πιστωτική κάρτα;</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Διαγραφή κάρτας;</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Διαγραφή</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1859,14 +1911,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Παρακαλώ εισαγάγετε έναν έγκυρο αριθμό πιστωτικής κάρτας</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Εισαγάγετε έγκυρο αριθμό κάρτας</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Παρακαλώ συμπληρώστε αυτό το πεδίο</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Προσθήκη ονόματος</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Ξεκλειδώστε για να δείτε τις αποθηκευμένες κάρτες σας</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Ασφαλίστε τις πιστωτικές κάρτες σας</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Προστασία των αποθηκευμένων μεθόδων πληρωμής σας</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Ορίστε ένα μοτίβο κλειδώματος συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για την προστασία των αποθηκευμένων πιστωτικών καρτών σας, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Ορίστε ένα μοτίβο κλειδώματος συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για την προστασία των αποθηκευμένων καρτών σας, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Ρύθμιση τώρα</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1877,6 +1937,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Ξεκλειδώστε για χρήση των στοιχείων πιστωτικής κάρτας</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Ξεκλειδώστε για χρήση των αποθηκευμένων μεθόδων πληρωμής</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Προσθήκη διεύθυνσης</string>
     <!-- Title of the "Edit address" screen -->
@@ -1914,6 +1976,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Θέλετε σίγουρα να διαγράψετε αυτήν τη διεύθυνση;</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Διαγραφή διεύθυνσης;</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Διαγραφή</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2015,30 +2079,52 @@
     <string name="login_menu_edit_button">Επεξεργασία</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Θέλετε σίγουρα να διαγράψετε αυτή τη σύνδεση;</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Θέλετε σίγουρα να διαγράψετε αυτόν τον κωδικό πρόσβασης;</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Διαγραφή</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Ακύρωση</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Επιλογές σύνδεσης</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Επιλογές κωδικών πρόσβασης</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Το επεξεργάσιμο πεδίο κειμένου της διεύθυνσης ιστού της σύνδεσης.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Το επεξεργάσιμο πεδίο κειμένου της διεύθυνσης ιστοτόπου του κωδικού πρόσβασης.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Το επεξεργάσιμο πεδίο κειμένου για το όνομα χρήστη της σύνδεσης.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Το επεξεργάσιμο πεδίο κειμένου για το όνομα χρήστη του κωδικού πρόσβασης.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Το επεξεργάσιμο πεδίο κειμένου για τον κωδικό πρόσβασης της σύνδεσης.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Το επεξεργάσιμο πεδίο κειμένου για τον κωδικό πρόσβασης.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Αποθήκευση αλλαγών στη σύνδεση.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Αποθήκευση αλλαγών.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Επεξεργασία</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Επεξεργασία κωδικού πρόσβασης</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Προσθήκη νέας σύνδεσης</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Προσθήκη κωδικού πρόσβασης</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Απαιτείται κωδικός πρόσβασης</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Εισαγάγετε έναν κωδικό πρόσβασης</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Απαιτείται όνομα χρήστη</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Εισαγάγετε ένα όνομα χρήστη</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Απαιτείται όνομα κεντρικού υπολογιστή</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Εισαγάγετε μια διεύθυνση ιστού</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Φωνητική αναζήτηση</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2414,6 +2500,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Ποτέ μετάφραση για τα %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Να μη μεταφράζεται ποτέ αυτός ο ιστότοπος</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Παρακάμπτει όλες τις άλλες ρυθμίσεις</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Παρακάμπτει τις προτάσεις για μετάφραση</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Ρυθμίσεις μεταφράσεων</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 7db23eba0..a6c8cbcab 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -716,6 +716,8 @@
     <string name="preferences_sync_bookmarks">Bookmarks</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Logins</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Passwords</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Open tabs</string>
     <!-- Preference for signing out -->
@@ -742,6 +744,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Credit cards</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Payment methods</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Addresses</string>
 
@@ -1679,8 +1683,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Logins and passwords</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Passwords</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Save logins and passwords</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Save passwords</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Ask to save</string>
 
@@ -1698,26 +1706,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Add login</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Add password</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Synchronise logins</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synchronise passwords</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Synchronise logins across devices</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synchronise passwords across devices</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Saved logins</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Saved passwords</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">The logins you save or synchronise to %s will show up here.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">The passwords you save or synchronise to %s will be listed here. All passwords you save are encrypted.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Learn more about Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Learn more about Sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Exceptions</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Logins and passwords that are not saved will be shown here.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s won’t save passwords for sites listed here.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Logins and passwords will not be saved for these sites.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s won’t save passwords for these sites.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Delete all exceptions</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Search logins</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Search passwords</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Site</string>
     <!-- The header for the username for a login -->
@@ -1746,10 +1774,16 @@
     <string name="saved_login_hide_password">Hide password</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Unlock to view your saved logins</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Unlock to view your saved passwords</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Secure your logins and passwords</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Secure your saved passwords</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Set up a device lock pattern, PIN, or password to protect your saved logins and passwords from being accessed if someone else has your device.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Set up a device lock pattern, PIN, or password to protect your saved passwords from being accessed if someone else has your device.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Later</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1768,6 +1802,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sort logins menu</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Sort passwords menu</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Autofill</string>
@@ -1775,10 +1812,16 @@
     <string name="preferences_addresses">Addresses</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Credit cards</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Payment methods</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Save and autofill cards</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Save and fill payment methods</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data is encrypted</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s encrypts all payment methods you save</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synchronise cards across devices</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1786,17 +1829,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Add credit card</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Add card</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Manage saved cards</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Manage cards</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Add address</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Manage addresses</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Save and autofill addresses</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Save and fill addresses</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Include information like numbers, email and shipping addresses</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Includes phone numbers and email addresses</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Add card</string>
     <!-- Title of the "Edit card" screen -->
@@ -1817,6 +1869,8 @@
     <string name="credit_cards_delete_card_button">Delete card</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Are you sure you want to delete this credit card?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Delete card?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Delete</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1832,14 +1886,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Please enter a valid credit card number</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Enter a valid card number</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Please fill out this field</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Add a name</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Unlock to view your saved cards</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Secure your credit cards</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Secure your saved payment methods</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Set up a device lock pattern, PIN, or password to protect your saved credit cards from being accessed if someone else has your device.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Set up a device lock pattern, PIN, or password to protect your saved cards from being accessed if someone else has your device.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Set up now</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1849,6 +1911,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Unlock to use stored credit card information</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Unlock to use saved payment methods</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Add address</string>
     <!-- Title of the "Edit address" screen -->
@@ -1886,6 +1950,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Are you sure you want to delete this address?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Delete this address?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Delete</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1984,30 +2050,52 @@
     <string name="login_menu_edit_button">Edit</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Are you sure you want to delete this login?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Are you sure you want to delete this password?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Delete</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancel</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Login options</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Password options</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">The editable text field for the web address of the login.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">The editable text field for the web site address of the password.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">The editable text field for the username of the login.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">The editable text field for the username of the password.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">The editable text field for the password of the login.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">The editable text field for the password.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Save changes to login.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Save changes.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Edit</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Edit password</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Add new login</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Add password</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Password required</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Enter a password</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Username required</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Enter a username</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hostname required</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Enter a web address</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Voice search</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2381,6 +2469,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Never translate %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Never translate this site</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Overrides all other settings</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Overrides offers to translate</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Translation settings</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 340e866e7..f165c25c7 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -725,6 +725,8 @@
     <string name="preferences_sync_bookmarks">Marcadores</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Inicios de sesión</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Contraseñas</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Pestañas abiertas</string>
     <!-- Preference for signing out -->
@@ -753,6 +755,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Tarjetas de crédito</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Direcciones</string>
 
@@ -1711,8 +1715,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Inicios de sesión y contraseñas</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Contraseñas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Guardar inicios de sesión y contraseñas</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Guardar contraseñas</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Solicitar guardar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1729,26 +1737,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Agregar inicio de sesión</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Agregar contraseña</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronizar inicios de sesión</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizar contraseñas</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sincronizar inicios de sesión entre dispositivos</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronizar contraseñas entre dispositivos</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Inicios de sesión guardados</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Contraseñas guardadas</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Aquí se van a ver los inicios de sesión que guardes o sincronices con %s.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Las contraseñas que guardés o sincronicés con %s aparecerán acá. Todas las contraseñas que guardés están encriptadas.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Conocé más acerca de Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Conocé más acerca de la sincronización</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Excepciones</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Los inicios de sesión y las contraseñas que no se guardan se mostrarán aquí.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s no guardará las contraseñas de los sitios listados acá.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Los inicios de sesión y las contraseñas no se van a guardar para estos sitios.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s no guardará las contraseñas de estos sitios.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eliminar todas las excepciones</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Buscar inicios de sesión</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Buscar contraseñas</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sitio</string>
     <!-- The header for the username for a login -->
@@ -1777,10 +1804,16 @@
     <string name="saved_login_hide_password">Ocultar contraseña</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Desbloqueá para ver tus inicios de sesión guardados</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desbloqueá para ver las contraseñas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Asegurá inicios de sesión y contraseñas</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Asegurá tus contraseñas guardadas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Configurá un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus inicios de sesión y contraseñas guardadas por si alguien más tiene tu dispositivo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Configurá un patrón de bloqueo del dispositivo, PIN o contraseña para proteger el acceso a tus contraseñas guardadas si alguien más tiene tu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Más tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1799,6 +1832,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordenar menú de inicio de sesión</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menú ordenar contraseñas</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Autocompletar</string>
@@ -1806,10 +1842,16 @@
     <string name="preferences_addresses">Direcciones</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Tarjetas de crédito</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Guardar y autocompletar tarjetas</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Guardar y completar métodos de pago</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Los datos están cifrados</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s cifra todos los métodos de pago guardados</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar tarjetas entre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1817,17 +1859,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Agregar tarjeta de crédito</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Agregar tarjeta</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Administrar tarjetas guardadas</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Administrar tarjetas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Agregar dirección</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Administrar direcciones</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Guardar y autocompletar direcciones</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Guardar y completar direcciones</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Incluir información como números, correos electrónicos y direcciones de envíos</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Incluye números de teléfono y direcciones de correo electrónico</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Agregar tarjeta</string>
     <!-- Title of the "Edit card" screen -->
@@ -1848,6 +1899,8 @@
     <string name="credit_cards_delete_card_button">Borrar tarjeta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">¿Estás seguro de querer borrar esta tarjeta de crédito?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">¿Borrar tarjeta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Borrar</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1863,15 +1916,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Ingresá un número de tarjeta de crédito válido</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Ingresá un número de tarjeta válido</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Se debe completar este campo</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Agregar un nombre</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloqueá para ver las tarjetas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Asegurá tus tarjetas de crédito</string>
 
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Asegura tus métodos de pago guardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configurá un patrón de bloqueo del dispositivo, PIN o contraseña para proteger el acceso a tus tarjetas de crédito guardadas si alguien más tiene tu dispositivo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configura un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus tarjetas guardadas de otras personas.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1882,6 +1943,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Desbloquear para usar la información almacenada de la tarjeta de crédito</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desbloquear para usar los métodos de pago guardados</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Agregar dirección</string>
     <!-- Title of the "Edit address" screen -->
@@ -1919,6 +1982,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">¿Estás seguro de querer borrar esta dirección?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">¿Borrar esta dirección?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Borrar</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2019,30 +2084,52 @@
     <string name="login_menu_edit_button">Editar</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">¿Estás seguro de que querés eliminar este inicio de sesión?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">¿Estás seguro de que querés eliminar esta contraseña?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Eliminar</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancelar</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Opciones de inicio de sesión</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opciones de contraseña</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">El campo de texto editable para la dirección web del inicio de sesión.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">El campo de texto editable para la dirección del sitio web de la contraseña.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">El campo de texto editable para el nombre de usuario del inicio de sesión.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario de la contraseña.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">El campo de texto editable para la contraseña del inicio de sesión.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">El campo de texto editable para la contraseña.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Guardar cambios para el inicio de sesión.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Guardar cambios</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Editar</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Editar contraseña</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Agregar nuevo inicio de sesión</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Agregar contraseña</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Se necesita contraseña</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Ingresar una contraseña</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Se requiere nombre de usuario</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Ingresar un nombre de usuario</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Se requiere nombre de host</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Ingresar una dirección web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Búsqueda por voz</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2418,6 +2505,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Nunca traducir %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Nunca traducir este sitio</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Anula todas las demás configuraciones</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Anula las ofertas de traducción</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Configuración de traducción</string>
 
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index 94ce0e215..1d017aff4 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -326,13 +326,18 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ahora no</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Aviso de privacidad de Firefox</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Nos encanta mantenerte a salvo</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Nuestro navegador respaldado por una organización sin fines de lucro ayuda a evitar que las empresas te sigan en secreto en la web.\n\nObtén más información en nuestro aviso de privacidad.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Nuestro navegador respaldado por una organización sin fines de lucro ayuda a evitar que las empresas te sigan en secreto por la web.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Nuestro navegador respaldado por una organización sin fines de lucro ayuda a evitar que las empresas te sigan en secreto en la web.\n\nObtén más información en nuestro aviso de privacidad.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">política de privacidad</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">política de privacidad</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Establecer como navegador predeterminado</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -713,6 +718,8 @@
     <string name="preferences_sync_bookmarks">Marcadores</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Credenciales</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Contraseñas</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Pestañas abiertas</string>
     <!-- Preference for signing out -->
@@ -739,6 +746,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Tarjetas de crédito</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Direcciones</string>
 
@@ -1679,8 +1688,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Credenciales y contraseñas</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Contraseñas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Guardar credenciales y contraseñas</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Guardar contraseñas</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Preguntar si guardar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1697,27 +1710,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Añadir conexión</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Añadir contraseña</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronizar credenciales</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizar contraseñas</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sincronizar credenciales en todos los dispositivos</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronizar contraseñas entre dispositivos</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Credenciales guardadas</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Contraseñas guardadas</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Las credenciales que guardas o sincronizas con %s serán mostradas aquí.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Las contraseñas que guardes o sincronices con %s aparecerán aquí. Todas las contraseñas que guardes quedan cifradas.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Aprender más acerca de Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Aprende más acerca de la sincronización</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Excepciones</string>
 
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Las credenciales y contraseñas que no son guardadas serán mostradas aquí.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s no guardará las contraseñas de los sitios listados aquí.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Las credenciales y contraseñas no serán guardadas para estos sitios.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s no guardará las contraseñas para estos sitios.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eliminar todas las excepciones</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Buscar credenciales</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Buscar contraseñas</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sitio</string>
     <!-- The header for the username for a login -->
@@ -1746,10 +1778,16 @@
     <string name="saved_login_hide_password">Ocultar contraseña</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Desbloquea para ver tus credenciales guardadas</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desbloquea para ver tus contraseñas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Asegura tus credenciales y contraseñas</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Asegura tus contraseñas guardadas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus credenciales y contraseñas guardadas, y así no sean accedidas si alguien más tiene tu dispositivo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus contraseñas guardadas, y así no sean accedidas si alguien más tiene tu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Más tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1769,6 +1807,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menú para ordenar credenciales</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menú ordenar contraseñas</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Autollenado</string>
@@ -1776,10 +1817,16 @@
     <string name="preferences_addresses">Direcciones</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Tarjetas de crédito</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Guardar y autocompletar tarjetas</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Guardar y completar métodos de pago</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Los datos están encriptados</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s cifra todos los métodos de pago que guardas</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar tarjetas entre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1787,17 +1834,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Añadir tarjeta de crédito</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Añadir tarjeta</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Gestionar tarjetas guardadas</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gestionar tarjetas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Añadir dirección</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Administrar direcciones</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Guardar y autocompletar direcciones</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Guardar y completar direcciones</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Incluye información como números, correos electrónicos y direcciones</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Incluye números de teléfono y direcciones de correo electrónico</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Añadir tarjeta</string>
     <!-- Title of the "Edit card" screen -->
@@ -1818,6 +1874,8 @@
     <string name="credit_cards_delete_card_button">Eliminar tarjeta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">¿De verdad quieres eliminar esta tarjeta de crédito?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">¿Eliminar tarjeta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Eliminar</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1833,14 +1891,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Por favor, ingresa un número de tarjeta de crédito válido</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Ingresa un número de tarjeta válido</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Complete este campo</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Añadir un nombre</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloquea para ver tus tarjetas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Asegura tus tarjetas de crédito</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Asegura tus métodos de pago guardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus tarjetas de crédito guardadas, y así no sean accedidas si alguien más tiene tu dispositivo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus tarjetas guardadas, y así no sean accedidas si alguien más tiene tu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1850,6 +1916,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Desbloquea para usar información de la tarjeta de crédito almacenada</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desbloquea para usar métodos de pago guardados</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Añadir dirección</string>
     <!-- Title of the "Edit address" screen -->
@@ -1887,6 +1955,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">¿De verdad quieres eliminar esta dirección?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">¿Eliminar esta dirección?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Eliminar</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1985,30 +2055,52 @@
     <string name="login_menu_edit_button">Editar</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">¿De verdad quieres eliminar esta conexión?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">¿Estas seguro de eliminar esta contraseña?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Eliminar</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancelar</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Opciones de credenciales</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opciones de contraseña</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">El campo de texto editable para la dirección web de la credencial.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">El campo de texto editable para la dirección del sitio web de la contraseña.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">El campo de texto editable para el nombre de usuario de la credencial.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario de la contraseña.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">El campo de texto editable para la contraseña de la credencial.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">El campo de texto editable para la contraseña.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Guardar cambios a la credencial.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Guardar cambios.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Editar</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Editar contraseña</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Añadir nueva credencial</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Añadir contraseña</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Contraseña requerida</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Ingresar una contraseña</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Nombre de usuario requerido</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Ingresar un nombre de usuario</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Nombre de servidor requerido</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Ingresar una dirección web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Búsqueda por voz</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2383,6 +2475,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Nunca traducir del %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Nunca traducir este sitio</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Anula todas las demás configuraciones</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Anula los ofrecimientos de traducción</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Ajustes de traducción</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 2d36cd22a..af4573f63 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -726,6 +726,8 @@
     <string name="preferences_sync_bookmarks">Kirjanmerkit</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Kirjautumistiedot</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Salasanat</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Avoimet välilehdet</string>
     <!-- Preference for signing out -->
@@ -752,6 +754,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Luottokortit</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Maksutavat</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Osoitteet</string>
 
@@ -1707,8 +1711,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Käyttäjätunnukset ja salasanat</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Salasanat</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Tallenna käyttäjätunnukset ja salasanat</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Tallenna salasanat</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Kysy tallennusta</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1726,26 +1734,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Lisää kirjautumistieto</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Lisää salasana</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Synkronoi kirjautumistiedot</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synkronoi salasanat</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Synkronoi kirjautumistiedot laitteiden välillä</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synkronoi salasanat eri laitteiden välillä</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Tallennetut kirjautumistiedot</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Tallennetut salasanat</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">%siin tallentamasi tai synkronoimasi kirjautumistiedot näkyvät täällä.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">%siin tallentamasi tai synkronoimasi salasanat näkyvät tässä. Kaikki tallentamasi salasanat ovat salattuja.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Lue lisää Syncista.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Lisätietoja synkronoinnista</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Poikkeukset</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Käyttäjätunnukset ja salanat, joita ei tallenneta, näytetään täällä.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s ei tallenna tässä lueteltujen sivustojen salasanoja.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Käyttäjätunnuksia ja salasanoja ei tallenneta näille sivustoille.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s ei tallenna näiden sivustojen salasanoja.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Poista kaikki poikkeukset</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Etsi kirjautumistiedoista</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Etsi salasanoja</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sivusto</string>
     <!-- The header for the username for a login -->
@@ -1774,10 +1801,16 @@
     <string name="saved_login_hide_password">Piilota salasana</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Avaa lukitus nähdäksesi tallennetut kirjautumistiedot</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Avaa lukitus nähdäksesi tallennetut salasanat</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Suojaa käyttäjätunnuksesi ja salasanasi</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Suojaa tallennetut salasanat</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Aseta laitteen avaukseen tarkoitettu kuvio, PIN-koodi tai salasana suojataksesi tallennetut kirjautumistiedot ja salasanat siltä varalta, että joku saa laitteesi haltuunsa.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Määritä laitteen lukituskuvio, PIN-koodi tai salasana suojataksesi tallennettuja salasanojasi, jos laitteesi on jollain toisella.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Myöhemmin</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1797,6 +1830,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Järjestä kirjautumistietojen valikko</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Salasanojen järjestysvalikko</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Automaattinen täyttö</string>
@@ -1804,10 +1840,16 @@
     <string name="preferences_addresses">Osoitteet</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Luottokortit</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Maksutavat</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Tallenna ja täytä kortit automaattisesti</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Tallenna ja täytä maksutavat</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Tiedot on salattu</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s salaa kaikki tallentamasi maksutavat</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synkronoi kortit laitteiden välillä</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1815,17 +1857,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Lisää luottokortti</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Lisää kortti</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Hallinnoi tallennettuja kortteja</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Hallitse kortteja</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Lisää osoite</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Hallitse osoitteita</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Tallenna ja täytä osoitteet automaattisesti</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Tallenna ja täytä osoitteet</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Sisällytä tiedot kuten numerot, sähköpostiosoitteet ja toimitusosoitteet</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Sisältää puhelinnumerot ja sähköpostiosoitteet</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Lisää kortti</string>
     <!-- Title of the "Edit card" screen -->
@@ -1846,6 +1897,8 @@
     <string name="credit_cards_delete_card_button">Poista kortti</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Haluatko varmasti poistaa tämän luottokortin?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Poistetaanko kortti?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Poista</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1861,14 +1914,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Kirjoita kelvollinen luottokortin numero</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Anna kelvollinen kortin numero</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Täytä tämä kenttä</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Lisää nimi</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Avaa lukitus nähdäksesi tallennetut kortit</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Suojaa luottokorttisi</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Suojaa tallennetut maksutavat</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Aseta laitteen avaukseen tarkoitettu kuvio, PIN-koodi tai salasana suojataksesi tallennetut luottokorttitiedot siltä varalta, että joku saa laitteesi haltuunsa.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Määritä laitteen lukituskuvio, PIN-koodi tai salasana suojataksesi tallennettuja korttejasi, jos laitteesi on jollain toisella.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Aseta nyt</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1879,6 +1940,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Avaa lukitus käyttääksesi tallennettuja luottokorttitietoja</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Avaa lukitus käyttääksesi tallennettuja maksutapoja</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Lisää osoite</string>
     <!-- Title of the "Edit address" screen -->
@@ -1916,6 +1979,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Haluatko varmasti poistaa tämän osoitteen?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Poistetaanko tämä osoite?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Poista</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2015,6 +2080,8 @@
     <string name="login_menu_edit_button">Muokkaa</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Haluatko varmasti poistaa tämän kirjautumistiedon?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Haluatko varmasti poistaa tämän salasanan?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Poista</string>
     <!-- Negative action of a dialog asking to delete login -->
@@ -2029,16 +2096,28 @@
     <string name="saved_login_password_description">Muokattava tekstikenttä kirjautumisen salasanaa varten.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Tallenna muutokset kirjautumistietoihin.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Tallenna muutokset.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Muokkaa</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Muokkaa salasanaa</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Lisää uusi kirjautumistieto</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Lisää salasana</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Salasana vaaditaan</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Kirjoita salasana</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Käyttäjätunnus vaaditaan</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Kirjoita käyttäjätunnus</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Isäntänimi vaaditaan</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Kirjoita verkko-osoite</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Äänihaku</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
diff --git a/app/src/main/res/values-gn/strings.xml b/app/src/main/res/values-gn/strings.xml
index 36ffdb618..5d0da0318 100644
--- a/app/src/main/res/values-gn/strings.xml
+++ b/app/src/main/res/values-gn/strings.xml
@@ -330,13 +330,18 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ani ko’ág̃a</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Firefox marandu’i ñemigua</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Rovy’ã eimére tekorosãme</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Ore kundahára ojeykekóva viru rehegua’ỹva oipytyvõ mba’apohaguasukuéra nde rapykuehóvo ñemihápe ñandutípe.\n\nEikuaavéta ore marandu’i ñemiguápe.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Ore kundahára oykeko atyguasu viru’ỹgua oipytyvõ omboykévo umi mba’apohaguasu ani nde rapykueho ñanduti rupive.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Ore kundahára ojeykekóva viru rehegua’ỹva oipytyvõ mba’apohaguasukuéra nde rapykuehóvo ñemihápe ñandutípe.\n\nEikuaavéta ore marandu’i ñemiguápe.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">marandu’i ñemiguáva</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">marandu’i ñemiguáva</string>
 
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Ejapo kundahára ijypyguávarõ</string>
@@ -726,6 +731,8 @@
     <string name="preferences_sync_bookmarks">Techaukaha</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Tembiapo ñepyrũ</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Ñe’ẽñemi</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Tendayke ijurujáva</string>
     <!-- Preference for signing out -->
@@ -752,6 +759,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Kuatia’atã ñemurã</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Mba’éicha ehepyme’ẽta</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Kundaharape</string>
 
@@ -1720,8 +1729,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Tembiapo ñepyrũ ha ñe’ẽñemi</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Ñe’ẽñemi</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Eñongatu tembiapo ñepyrũ ha ñe’ẽñemi</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Eñongatu ñe’ẽñemi</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Ejerure ñemoneĩ eñongatu hag̃ua</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1740,16 +1753,25 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Embojuaju jeike</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Embojuaju ñe’ẽñemi</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Embojuehe tembiapo ñepyrũ</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Embojuehe ñe’ẽñemi</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Embojuehe tembiapo ñepyrũ mba’e’oka pa’ũme</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Tembiapo ñepyrũ ñongatupyre</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Ñe’ẽñemi ñongatupyre</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Ko’ápe ojehecháta tembiapo ñepyrũ eñongatu térã embojuehéva %s ndive.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Eikuaave Sync rehegua</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Eikuaave ñembojuehe rehegua</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Oĩ’ỹva</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
@@ -1760,6 +1782,8 @@
     <string name="preferences_passwords_exceptions_remove_all">Emboguete opaite oĩ’ỹva</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Eheka tembiapo ñepyrũ</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Eheka ñe’ẽñemi</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Tenda</string>
     <!-- The header for the username for a login -->
@@ -1812,6 +1836,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Emoĩporã poravorã tembiapo ñepyrũgua</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Emoĩporã ñe’ẽñemi poravorã</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Myanyhẽ jehegui</string>
@@ -1819,9 +1846,13 @@
     <string name="preferences_addresses">Kundaharape</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Kuatia’atã ñemurã</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Mba’éicha ehepyme’ẽta</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Eñongatu ha emyanyhẽ kuatia’atã</string>
 
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Eñongatu ha emyanyhẽ mba’éicha ehepyme’ẽta</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Mba’ekuaarã ipapapypa</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
@@ -1831,8 +1862,12 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Embojuaju kuatia’atã ñemurã</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Embojuaju kuatia’atã</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Eñangareko kuatia’atã ñongatupyrére</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Eñangareko kuatia’atã</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Embojuaju kundaharape</string>
     <!-- Preference option for managing saved addresses -->
@@ -1840,6 +1875,8 @@
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Eñongatu ha emyanyhẽ kundaharape</string>
 
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Eñongatu ha emyanyhẽ kundaharape</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Emoĩ marandu ipapapy, ñanduti veve ha kundaharape ñemondorãva</string>
 
@@ -1863,6 +1900,8 @@
     <string name="credit_cards_delete_card_button">Emboguete kuatia’atã</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">¿Emboguesépa añetehápe ko kuatia’atã ñemurã?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">¿Emboguete kuatia’atã?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Mboguete</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1880,6 +1919,8 @@
 
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Ikatúpiko emyanyhẽ ko kora</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Embojuaju téra</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Embojuruja ehecha hag̃ua kuatia’atã ñongatupyre</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
@@ -2039,6 +2080,8 @@
     <string name="dialog_delete_negative">Heja</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Jeporavorã tembiapo ñepyrũgua</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Ñe’ẽñemi jeporavorã</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Moñe’ẽha kora isako’ikuaáava ñanduti kundaharape rembiapo ñepyrũme.</string>
     <!--  The editable text field for a login's username. -->
@@ -2047,14 +2090,24 @@
     <string name="saved_login_password_description">Moñe’ẽha kora isako’ikuaáava ñe’ẽñemi rembiapo ñepyrũme.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Eñongatu moambue tembiapo ñepyrũme.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Moambue ñongatu.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Mbosako’i</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Embosako’i ñe’ẽñemi</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Embojuaju terarenda pyahu</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Embojuaju ñe’ẽñemi</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Tekotevẽ ñe’ẽñemi</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Emoinge ñe’ẽñemi</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Poruhára réra jerurepyre</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Ehai poruhára réra</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Mohendahavusu réra jerurepyre</string>
     <!-- Voice search button content description  -->
diff --git a/app/src/main/res/values-hsb/strings.xml b/app/src/main/res/values-hsb/strings.xml
index 73fe1c1d7..9858af0a4 100644
--- a/app/src/main/res/values-hsb/strings.xml
+++ b/app/src/main/res/values-hsb/strings.xml
@@ -1928,6 +1928,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Blokowanje zběhnyć, zo bychu so składowane informacije kreditneje karty wužiwali</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Wotewrěć, zo byšće składowane płaćenske metody wužiwał</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adresu přidać</string>
     <!-- Title of the "Edit address" screen -->
@@ -2487,6 +2489,10 @@ To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produk
     <string name="translation_option_bottom_sheet_never_translate_in_language">Ženje njepřełožować: %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Tute websydło ženje njepřełožić</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Přepisuje wšě druhe nastajenja</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Přepisuje poskitki za přełožowanje</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Přełožowanske nastajenja</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml
index 5d107209e..033294777 100644
--- a/app/src/main/res/values-hy-rAM/strings.xml
+++ b/app/src/main/res/values-hy-rAM/strings.xml
@@ -716,6 +716,8 @@
     <string name="preferences_sync_bookmarks">Էջանիշեր</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Մուտքանուններ</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Գաղտնաբառեր</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Բացել ներդիրներ</string>
     <!-- Preference for signing out -->
@@ -742,6 +744,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Բանկային քարտեր</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Վճարամիջոցներ</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Հասցեներ</string>
 
@@ -1684,8 +1688,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Մուտքանուններ և գաղտնաբառեր</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Գաղտնաբառեր</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Պահպանել մուտքանունները և գաղտնաբառերը</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Պահել գաղտնաբառերը</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Հարցնել պահպանելիս</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1702,26 +1710,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Ավելացնել մուտքագրում</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Հավելել գաղտնաբառ</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Համաժամեցնել մուտքանունները</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Համաժամեցնել գաղտնաբառերը</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Համաժամեցնել մուտքագրումները սարքերի միջև</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Համաժամեցնել գաղտնաբառերը սարքերի միջև</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Պահպանված մուտքանուններ</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Պահված գաղտնաբառեր</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">%s-ի հետ ձեր պահպանած կամ համաժամեցրած մուտքագրումները կցուցադրվեն այստեղ:</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Այն գաղտնաբառերը, որոնք դուք պահում կամ համաժամացնում եք %s-ի հետ, կցուցադրվեն այստեղ: Ձեր պահած բոլոր գաղտնաբառերը գաղտնագրված են:</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Իմանալ ավելին համաժամեցման մասին:</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Իմանալ ավելին Սինքի մասին</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Բացառություններ</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Մուտքանունները և գաղտնաբառերը, որոնք չեն պահպանվել, կցուցադրվեն այստեղ:</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s-ը չի պահի այստեղ թվարկված կայքերի գաղտնաբառերը:</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Մուտքանունները և գաղտնաբառերը չեն պահպանվի այս կայքերի համար:</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s-ը չի պահի այս կայքերի գաղտնաբառերը:</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Ջնջել բոլոր բացառությունները</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Որոնել մուտքանուններ</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Որոնել գաղտնաբառեր</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Կայք</string>
 
@@ -1751,10 +1778,16 @@
     <string name="saved_login_hide_password">Թաքցնել գաղտնաբառը</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Ապակողպեք՝ դիտելու համար պահպանված մուտքանունները</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Ապակողպեք՝ դիտելու համար պահված գաղտնաբառերը</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Անվտանգ դարձրեք ձեր մուտքանունները և գաղտնաբառերը</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Անվտանգ դարձրեք ձեր պահված գաղտնաբառերը</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Ստեղծեք սարքի կողպեքի նմուշ, PIN կամ գաղտնաբառ՝ ձեր պահպանված մուտքանունները և գաղտնաբառերը մուտք գործելուց պաշտպանելու համար, եթե ձեր սարքը ուրիշի ձեռքն ընկնի:</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Տեղակայեք սարքի կողպման նախշ, PIN կամ գաղտնաբառ՝ պաշտպանելու պահված գաղտնաբառերն այն դեպքում, եթե որևէ մեկը ևս մուտք ունենա Ձեր սարքին:</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Հետո</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1774,6 +1807,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Տեսակավորել մուտագրումների ցանկը</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Տեսակավորել գաղտնաբառերի ցանկը</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Ինքնալցում</string>
@@ -1781,27 +1817,42 @@
     <string name="preferences_addresses">Հասցեներ</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Բանկային քարտեր</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Վճարամիջոցներ</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Պահել և ինքնալրացնել քարտերը</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Պահել և լրացնել վճարամիջոցները</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Տվյալները գաղտնագրված են</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s-ը գաղտնագրում է ձեր պահած  բոլոր վճարամիջոցները</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Համաժամեցնել քարտերը սարքերի միջև</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Համաժամեցնել քարտերը</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Ավելացնել բանկային քարտ</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Հավելել քարտ</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Կառավարել պահված քարտերը</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Կառավարել քարտերը</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Ավելացնել հասցե</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Կառավարեք հասցեները</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Պահել և ինքնալրացնել քարտերը</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Պահել և լրացնել հասցեները</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Ներառել տեղեկություններ, ինչպիսիք են համարները, էլ.փոստը և առաքման հասցեները</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Ներառում է հեռախոսահամարներ և էլ. փոստի հասցեներ</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Ավելացնել քարտ</string>
     <!-- Title of the "Edit card" screen -->
@@ -1822,6 +1873,8 @@
     <string name="credit_cards_delete_card_button">Ջնջել քարտը</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս բանկային քարտը:</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Ջնջե՞լ քարտը</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Ջնջել</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1837,14 +1890,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Մուտքագրեք բանկային վավեր քարտի համար</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Մուտքագրեք ճիշտ քարտի համար</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Լրացրեք այս դաշտը</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Հավելել անուն</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Ապակողպեք՝ դիտելու համար պահպանված քարտերը</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Անվտանգ դարձրեք ձեր բանկային քարտերը</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Անվտանգ դարձրեք ձեր պահած վճարամիջոցները</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Տեղակայեք սարքի կողպման նախշ, PIN կամ գաղտնաբառ՝ պաշտպանելու պահված բանկային քարտերը այն դեպքում, եթե որևէ մեկը ևս մուտք ունի Ձեր սարքին:</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Տեղակայեք սարքի կողպման նախշ, PIN կամ գաղտնաբառ՝ պաշտպանելու ձեր քարտերն այն դեպքում, եթե որևէ մեկը ևս մուտք ունենա Ձեր սարքին:</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Տեղակայել հիմա</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1854,6 +1915,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Ապակողպեք՝ օգտագործելու համար բանկային քարտերի պահված տեղեկությունները</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Ապակողպեք՝ պահված վճարամիջոցն օգտագործելու համար</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Ավելացնել հասցե</string>
     <!-- Title of the "Edit address" screen -->
@@ -1890,6 +1953,8 @@
     <string name="addressess_delete_address_button">Ջնջել հասցեն</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Ջնջե՞լ այս հասցեն:</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Ջնջե՞լ այս հասցեն:</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Ջնջել</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1987,30 +2052,52 @@
     <string name="login_menu_edit_button">Խմբագրել</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս մուտքանունը:</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս գաղտնաբառը:</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Ջնջել</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Չեղարկել</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Մուտքի ընտրանքներ</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Գաղտնաբառի ընտրանքներ</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Խմբագրելի տեքստի դաշտը մուտքի վեբ հասցեի համար:</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Խմբագրելի տեքստի դաշտ գաղտնաբառի վեբ հասցեի համար:</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Խմբագրելի տեքստի դաշտը մուտք գործողի համար:</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Խմբագրելի տեքստի դաշտ գաղտնաբառի օգտվողի համար:</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Խմբագրելի տեքստի դաշտը մուտքի գաղտնաբառի համար:</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Խմբագրելի տեքստի դաշտ գաղտնաբառի համար:</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Պահպանել փոփոխությունները մուտքագրման համար:</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Պահել փոփոխությունները:</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Խմբագրել</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Խմբագրել գաղտնաբառը</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Հավելել նոր մուտքագրում</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Հավելել գաղտնաբառ</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Գաղտնաբառ է պահանջվում</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Մուտքագրեք գաղտնաբառ</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Օգտվողի անունը պարտադիր է</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Մուտքագրեք օգտվողի անունը</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Հոսթի անունը պարտադիր է</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Մուտքագրել վեբ հասցեն</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Ձայնային որոնում</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2387,6 +2474,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Երբեք չթարգմանել %1$s-ը</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Երբեք չթարգմանել այս կայքը</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Անտեսում է բոլոր մյուս կարգավորումները</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Անտեսում է թարգմանելու առաջարկները</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Թարգմանության կարգավորումներ</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 9f332f94b..dcb16bbaa 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -2484,6 +2484,11 @@
     <!-- Title of the automatic translation preference screen that will appear on the toolbar.-->
     <string name="automatic_translation_toolbar_title_preference">Samodejno prevajanje</string>
 
+    <!-- Automatic translation options preference screen -->
+    <!-- Preference option for offering to translate. Radio button title text.-->
+    <string name="automatic_translation_option_offer_to_translate_title_preference">Ponudi prevajanje (privzeto)</string>
+    <!-- Preference option for offering to translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_offer_to_translate_summary_preference">%1$s naj ponuja prevod strani v tem jeziku.</string>
     <!-- Preference option for always translate. Radio button title text. -->
     <string name="automatic_translation_option_always_translate_title_preference">Vedno prevedi</string>
     <!-- Preference option for always translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
@@ -2535,6 +2540,11 @@
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
     <string name="download_language_file_dialog_negative_button_text">Prekliči</string>
 
+    <!-- Debug drawer -->
+    <!-- The user-facing title of the Debug Drawer feature. -->
+    <string name="debug_drawer_title">Orodja za razhroščevanje</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate back within the debug drawer. -->
+    <string name="debug_drawer_back_button_content_description">Pojdi nazaj</string>
     <!-- The title of the Tab Tools feature in the Debug Drawer. -->
     <string name="debug_drawer_tab_tools_title">Orodja za zavihke</string>
     <!-- The title of the tab count section in Tab Tools. -->
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index ac4cbb3d8..0f62e84db 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -266,8 +266,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skanna</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Sökmotor</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Inställningar för sökmotor</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -323,14 +321,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Aviseringar hjälper dig att göra mer med %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Aviseringar hjälper dig att göra mer med %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synkronisera dina flikar mellan enheter, hantera nedladdningar, få tips om hur du får ut det mesta av %s:s integritetsskydd och mer.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synkronisera dina flikar mellan enheter, hantera nedladdningar, få tips om hur du får ut det mesta av %s:s integritetsskydd och mer.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Fortsätt</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Fortsätt</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Inte nu</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Inte nu</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -448,21 +446,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Endast HTTPS-läge</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducering av kakbanner</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blockering av kakbanners</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blockering av kakbanner vid privat surfning</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Minska kakbanners</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Av</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">På</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s försöker automatiskt avvisa kak-förfrågningar på kakbanners.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Av för denna webbplats</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -480,35 +468,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Webbplatsen stöds inte för närvarande</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Vill du aktivera reducering av kakbanners för %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Vill du aktivera blockering av kakbanner för %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Vill du stänga av reducering av kakbanners för %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Vill du stänga av blockering av kakbanner för %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s kan inte automatiskt avvisa kakförfrågningar på den här webbplatsen. Du kan skicka en begäran om att stödja den här webbplatsen i framtiden.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s rensar webbplatsens kakor och uppdaterar sidan. Rensa alla kakor kan logga ut dig eller tömma kundvagnar.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Stäng av och %1$s rensar kakor och laddar om den här webbplatsen. Detta kan logga ut dig eller tömma kundvagnar.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s försöker automatiskt avvisa alla kak-förfrågningar på webbplatser som stöds.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Slå på och %1$s försöker automatiskt neka alla kakbanners på den här webbplatsen.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Tillåta %1$s att avvisa kakbanners?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s kan automatiskt avvisa flera kakbannerförfrågningar.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Inte nu</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Du kommer att se färre kak-förfrågningar</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Tillåt</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s har precis avvisat kakor åt dig</string>
@@ -756,6 +725,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Kreditkort</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Betalningsmetoder</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresser</string>
 
@@ -1296,8 +1267,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Ignorera</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Det går inte att skriva ut</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Det gick inte att skriva ut den här sidan</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Skriv ut</string>
@@ -1707,8 +1676,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Inloggningar och lösenord</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Lösenord</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Spara inloggningar och lösenord</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Spara lösenord</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Fråga för att spara</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1725,26 +1698,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Lägg till inloggning</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Lägg till lösenord</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Synkronisera inloggningar</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synkronisera lösenord</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Synkronisera inloggningar mellan enheter</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synkronisera lösenord mellan enheter</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Sparade inloggningar</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Sparade lösenord</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">De inloggningar som du sparar eller synkroniserar till %s kommer att dyka upp här.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Lösenorden du sparar eller synkroniserar till %s kommer att listas här. Alla lösenord du sparar är krypterade.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Läs mer om Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Läs mer om synkronisering</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Undantag</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Inloggningar och lösenord som inte sparas visas här.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s kommer inte att spara lösenord för webbplatser som listas här.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Inloggningar och lösenord sparas inte för dessa webbplatser.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s kommer inte att spara lösenord för dessa webbplatser.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Ta bort alla undantag</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Sök inloggningar</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Sök efter lösenord</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Webbplats</string>
     <!-- The header for the username for a login -->
@@ -1773,10 +1766,16 @@
     <string name="saved_login_hide_password">Dölj lösenord</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Lås upp för att se dina sparade inloggningar</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Lås upp för att se dina sparade lösenord</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Säkra dina inloggningar och lösenord</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Säkra dina sparade lösenord</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Konfigurera enhetens låsmönster, PIN eller lösenord för att skydda dina sparade inloggningar och lösenord från åtkomst om någon annan har din enhet.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Konfigurera ett enhetslåsmönster, PIN-kod eller lösenord för att skydda dina sparade lösenord från åtkomst om någon annan använder din enhet.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Senare</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1795,6 +1794,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sortera inloggningsmenyn</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menyn sortera lösenord</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Autofyll</string>
@@ -1802,10 +1804,16 @@
     <string name="preferences_addresses">Adresser</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Kreditkort</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Betalningsmetoder</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Spara och fyll i kreditkort automatiskt</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Spara och fyll i betalningsmetoder</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data är krypterad</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s krypterar alla betalningsmetoder som du sparar</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synkronisera kort mellan enheter</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1813,17 +1821,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Lägg till kreditkort</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Lägg till kort</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Hantera sparade kreditkort</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Hantera kort</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Lägg till adress</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Hantera adresser</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Spara och fyll i adresser automatiskt</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Spara och fyll i adresser</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Inkludera information som nummer, e-post och leveransadresser</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Inkluderar telefonnummer och e-postadresser</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Lägg till kreditkort</string>
     <!-- Title of the "Edit card" screen -->
@@ -1844,6 +1861,8 @@
     <string name="credit_cards_delete_card_button">Ta bort kort</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Är du säker på att du vill ta bort det här kreditkortet?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Ta bort kort?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Ta bort</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1859,14 +1878,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Ange ett giltigt kreditkortsnummer</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Ange ett giltigt kortnummer</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Fyll i det här fältet</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Lägg till ett namn</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Lås upp för att se dina sparade kreditkort</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Säkra dina kreditkort</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Säkra dina sparade betalningsmetoder</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Konfigurera enhetens låsmönster, PIN eller lösenord för att skydda dina sparade kreditkort från åtkomst om någon annan har din enhet.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Konfigurera ett enhetslåsmönster, PIN-kod eller lösenord för att skydda dina sparade kort från att användas om någon annan använder din enhet.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Konfigurera nu</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1877,6 +1904,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Lås upp för att använda lagrad kreditkortsinformation</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Lås upp för att använda sparade betalningsmetoder</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Lägg till adress</string>
     <!-- Title of the "Edit address" screen -->
@@ -1914,6 +1943,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Är du säker på att du vill ta bort den här adressen?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Ta bort den här adressen?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Ta bort</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2013,30 +2044,52 @@
     <string name="login_menu_edit_button">Redigera</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Är du säker på att du vill ta bort den här inloggningen?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Är du säker på att du vill ta bort det här lösenordet?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Ta bort</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Avbryt</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Inloggningsalternativ</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Lösenordsalternativ</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Det redigerbara textfältet för inloggningens webbadress.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Det redigerbara textfältet för webbplatsadressen för lösenordet.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Det redigerbara textfältet för inloggningens användarnamn.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Det redigerbara textfältet för användarnamnet till lösenordet.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Det redigerbara textfältet för inloggningens lösenord.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Det redigerbara textfältet för lösenordet.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Spara ändringar för inloggning.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Spara ändringar.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Redigera</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Redigera lösenord</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Lägg till ny inloggning</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Lägg till lösenord</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Lösenord krävs</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Ange ett lösenord</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Användarnamn krävs</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Ange ett användarnamn</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Värdnamn krävs</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Ange en webbadress</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Röstsökning</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2205,8 +2258,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Höjdpunkter</b> är från %s recensioner under de senaste 80 dagarna som vi tror är pålitliga.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Läs mer om %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">hur %s av Mozilla bestämmer recensionens kvalitet</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">hur %s bestämmer recensionens kvalitet</string>
     <!-- Text for title of settings section. -->
@@ -2412,6 +2463,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Översätt aldrig %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Översätt aldrig denna sida</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Åsidosätter alla andra inställningar</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Åsidosätter erbjudanden om översättning</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Översättningsinställningar</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index e8663ee52..1ff7fc2ed 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -712,6 +712,8 @@
     <string name="preferences_sync_bookmarks">خەتكۈچ</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">كىرىش</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">ئىم</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">بەتكۈچ ئاچ</string>
     <!-- Preference for signing out -->
@@ -736,6 +738,8 @@
     <string name="default_device_name_2">%2$s %3$s دىكى %1$s</string>
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">ئىناۋەتلىك كارتا</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">چىقىم قىلىش ئۇسۇلى</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">ئادرېس</string>
 
@@ -1678,8 +1682,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">كىرىش ۋە ئىم</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">ئىم</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">كىرىش ۋە ئىم ساقلا</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">ئىم ساقلا</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">ساقلاشنى سورا</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1695,26 +1703,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">كىرىشنى قوش</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">ئىم قوش</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">كىرىشنى قەدەمداشلا</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">ئىم قەدەمداشلا</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">ئۈسكۈنىلەر ئارا قەدەمداشلا</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">ئىمنى ئۈسكۈنىلەر ئارا قەدەمداشلايدۇ</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">ساقلانغان كىرىش</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">ساقلانغان ئىم</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">سىز ساقلىغان كىرىش ياكى %s بىلەن بولغان قەدەمداش بۇ جايدا كۆرۈنىدۇ.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">سىز ساقلىغان ياكى %s غا قەدەمداشلىغان ئىم بۇ يەردە كۆرسىتىلىدۇ. سىز ساقلىغان بارلىق ئىم مەخپىيلەشتۈرۈلگەن.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">قەدەمداش ھەققىدىكى تەپسىلاتلار.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">قەدەمداش ھەققىدىكى تەپسىلاتلار</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">مۇستەسنا</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">ساقلانمىغان كىرىش ۋە ئىم بۇ يەردە كۆرسىتىلىدۇ.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">بۇ جايدا كۆرسىتىلگەن تور بېكەتلەر ئۈچۈن %s ئىم ساقلىمايدۇ.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">بۇ تور بېكەتلەرنىڭ كىرىش ۋە ئىم ئۇچۇرلىرى ساقلانمايدۇ.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">بۇ تور بېكەتلەر ئۈچۈن %s ئىم ساقلىمايدۇ.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">ھەممە مۇستەسنالارنى ئۆچۈرىدۇ</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">كىرىش خاتىرىسىنى ئىزدە</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">پارول ئىزدەش</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">بېكەت</string>
     <!-- The header for the username for a login -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 5fdf81adc..056b76065 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -329,13 +329,18 @@
     <string name="onboarding_home_enable_notifications_negative_button">Не зараз</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Положення про приватність Firefox</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Ми дбаємо про вашу безпеку</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Наш некомерційний браузер не дозволяє компаніям таємно стежити за вами в інтернеті.\n\nДокладніше в нашому Положенні про приватність.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Наш некомерційний браузер допомагає блокувати таємне стеження компаній за вами в інтернеті.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Наш некомерційний браузер не дозволяє компаніям таємно стежити за вами в інтернеті.\n\nДокладніше в нашому Положенні про приватність.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">політиці приватності</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">політиці приватності</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Встановити типовим браузером</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -720,6 +725,8 @@
     <string name="preferences_sync_bookmarks">Закладки</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Паролі</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Паролі</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Вкладки</string>
     <!-- Preference for signing out -->
@@ -746,6 +753,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Кредитні картки</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Способи оплати</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Адреси</string>
 
@@ -1691,8 +1700,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Паролі</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Паролі</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Зберігати паролі</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Зберігати паролі</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Питати про збереження</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1709,27 +1722,47 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Додати пароль</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Додати пароль</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Синхронізація паролів</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Синхронізувати паролі</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Синхронізувати паролі між пристроями</string>
 
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Синхронізація паролів між пристроями</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Збережені паролі</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Збережені паролі</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Тут з’являтимуться ваші збережені та синхронізовані з %s паролі.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Тут з\'являтимуться паролі, які ви зберігаєте чи синхронізуєте в %s. Усі паролі зашифровано.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Докладніше про синхронізацію.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Докладніше про синхронізацію</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Винятки</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Не збережені паролі з’являтимуться тут.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s не зберігатиме паролі для вказаних тут сайтів.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Паролі для цих сайтів не зберігатимуться.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s не зберігатиме паролі для цих сайтів.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Видалити всі винятки</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Шукати паролі</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Пошук паролів</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Сайт</string>
     <!-- The header for the username for a login -->
@@ -1759,10 +1792,16 @@
     <string name="saved_login_hide_password">Приховати пароль</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Розблокуйте для перегляду збережених паролів</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Розблокуйте, щоб переглянути збережені паролі</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Захистіть свої паролі</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Захистіть збережені паролі</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Встановіть графічний ключ, ПІН, чи пароль блокування пристрою, щоб захистити збережені паролі від інших, хто може отримати доступ до вашого пристрою.</string>
+    <string name="logins_warning_dialog_message">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених паролів від інших, хто може отримати доступ до вашого пристрою.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених паролів від інших, хто може отримати доступ до вашого пристрою.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Пізніше</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1782,6 +1821,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Меню впорядкування паролів</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Меню сортування паролів</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Автозаповнення</string>
@@ -1789,10 +1831,16 @@
     <string name="preferences_addresses">Адреси</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Кредитні картки</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Способи оплати</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Зберігати та автоматично заповнювати дані карток</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Зберігати й заповнювати способи оплати</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Дані зашифровано</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s шифрує всі збережені способи оплати</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Синхронізувати картки між пристроями</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1800,17 +1848,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Додати кредитну картку</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Додати картку</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Керувати збереженими картками</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Керувати картками</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Додати адресу</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Керувати адресами</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Зберігати та автоматично заповнювати адреси</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Зберігати й заповнювати адреси</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Включити дані, як-от номери, електронні адреси та адреси доставлення</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Містить номери телефонів і адреси електронної пошти</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Додати картку</string>
     <!-- Title of the "Edit card" screen -->
@@ -1831,6 +1888,8 @@
     <string name="credit_cards_delete_card_button">Видалити картку</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Ви впевнені, що хочете видалити цю кредитну картку?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Видалити картку?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Видалити</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1846,14 +1905,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Введіть дійсний номер кредитної картки</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Введіть дійсний номер картки</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Будь ласка, заповніть це поле</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Додайте назву</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Розблокуйте для перегляду збережених карток</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Захистіть свої банківські картки</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Захистіть свої збережені способи оплати</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених банківських карток від інших, хто може отримати доступ до вашого пристрою.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Встановіть графічний ключ, ПІН, чи пароль, щоб захистити збережені банківські картки від інших, хто може отримати доступ до вашого пристрою.</string>
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених банківських карток від інших, хто може отримати доступ до вашого пристрою.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Встановити</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1864,6 +1931,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Розблокуйте, щоб використовувати збережену інформацію про кредитну картку</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Розблокуйте, щоб використати збережені способи оплати</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Додати адресу</string>
     <!-- Title of the "Edit address" screen -->
@@ -1901,6 +1970,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Ви дійсно хочете видалити цю адресу?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Видалити цю адресу?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Видалити</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2000,30 +2071,52 @@
     <string name="login_menu_edit_button">Змінити</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Ви дійсно хочете видалити цей запис?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Ви дійсно хочете видалити цей пароль?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Видалити</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Скасувати</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Опції запису</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Параметри пароля</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Текстове поле для редагування вебадреси запису.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Текстове поле для редагування адреси вебсайту.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Текстове поле для редагування імені користувача запису.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Текстове поле для редагування імені користувача.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Текстове поле для редагування пароля запису.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Текстове поле для редагування пароля.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Зберегти зміни.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Зберегти зміни.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Змінити</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Редагувати пароль</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Додати новий пароль</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Додати пароль</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Потрібен пароль</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Введіть пароль</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Необхідно вказати ім’я користувача</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Введіть ім’я користувача</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Необхідно вказати назву вузла</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Введіть адресу вебсайту</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Голосовий пошук</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2398,6 +2491,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Ніколи не перекладати %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Ніколи не перекладати цей сайт</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Перевизначає усі інші налаштування</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Перевизначає пропозиції перекладу</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Налаштування перекладу</string>
 

From ef1cf1928f5e47d3d09216a8b5ac95c7044379cb Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 23 Jan 2024 13:09:59 +0200
Subject: [PATCH 028/222] Bug 1876026 - Add more test logs to
 AddToHomeScreenRobot

---
 .../fenix/ui/robots/AddToHomeScreenRobot.kt   | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt
index 5d0c83e9a..5d1bd8338 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.ui.robots
 
 import android.os.Build
+import android.util.Log
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.ComposeTestRule
 import androidx.compose.ui.test.onNodeWithTag
@@ -13,6 +14,7 @@ import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiScrollable
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
@@ -27,24 +29,37 @@ import java.util.regex.Pattern
  */
 class AddToHomeScreenRobot {
 
-    fun verifyAddPrivateBrowsingShortcutButton(composeTestRule: ComposeTestRule) =
+    fun verifyAddPrivateBrowsingShortcutButton(composeTestRule: ComposeTestRule) {
         composeTestRule.onNodeWithTag("private.add").assertIsDisplayed()
+        Log.i(TAG, "verifyAddPrivateBrowsingShortcutButton: Verified \"Add to Home screen\" private browsing shortcut dialog button is displayed")
+    }
 
-    fun verifyNoThanksPrivateBrowsingShortcutButton(composeTestRule: ComposeTestRule) =
+    fun verifyNoThanksPrivateBrowsingShortcutButton(composeTestRule: ComposeTestRule) {
         composeTestRule.onNodeWithTag("private.cancel").assertIsDisplayed()
+        Log.i(TAG, "verifyNoThanksPrivateBrowsingShortcutButton: Verified \"No thanks\" private browsing shortcut dialog button is displayed")
+    }
 
-    fun clickAddPrivateBrowsingShortcutButton(composeTestRule: ComposeTestRule) =
+    fun clickAddPrivateBrowsingShortcutButton(composeTestRule: ComposeTestRule) {
         composeTestRule.onNodeWithTag("private.add").performClick()
+        Log.i(TAG, "clickAddPrivateBrowsingShortcutButton: Clicked \"Add to Home screen\" private browsing shortcut dialog button")
+    }
 
-    fun addShortcutName(title: String) = shortcutTextField.setText(title)
+    fun addShortcutName(title: String) {
+        shortcutTextField().setText(title)
+        Log.i(TAG, "addShortcutName: Set shortcut name to: $title")
+    }
 
     fun verifyShortcutTextFieldTitle(title: String) = assertUIObjectExists(shortcutTitle(title))
 
-    fun clickAddShortcutButton() =
-        confirmAddToHomeScreenButton.clickAndWaitForNewWindow(waitingTime)
+    fun clickAddShortcutButton() {
+        confirmAddToHomeScreenButton().clickAndWaitForNewWindow(waitingTime)
+        Log.i(TAG, "clickAddShortcutButton: Clicked \"Add\" button from \"Add to home screen\" dialog")
+    }
 
-    fun clickCancelShortcutButton() =
-        cancelAddToHomeScreenButton.click()
+    fun clickCancelShortcutButton() {
+        cancelAddToHomeScreenButton().click()
+        Log.i(TAG, "clickCancelShortcutButton: Clicked \"Cancel\" button from \"Add to home screen\" dialog")
+    }
 
     fun clickAddAutomaticallyButton() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -56,7 +71,9 @@ class AddToHomeScreenRobot {
                 ),
                 waitingTime,
             )
+            Log.i(TAG, "clickAddAutomaticallyButton: Waited for \"Add automatically\" system dialog button")
             addAutomaticallyButton().click()
+            Log.i(TAG, "clickAddAutomaticallyButton: Clicked \"Add automatically\" system dialog button")
         }
     }
 
@@ -69,7 +86,9 @@ class AddToHomeScreenRobot {
                 Until.findObject(By.text(title)),
                 waitingTime,
             )
+            Log.i(TAG, "openHomeScreenShortcut: Waited for $title home screen shortcut")
             mDevice.findObject((UiSelector().text(title))).clickAndWaitForNewWindow(waitingTime)
+            Log.i(TAG, "openHomeScreenShortcut: Clicked $title home screen shortcut")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -77,15 +96,18 @@ class AddToHomeScreenRobot {
 
         fun searchAndOpenHomeScreenShortcut(title: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
             mDevice.pressHome()
+            Log.i(TAG, "searchAndOpenHomeScreenShortcut: Pressed device home button")
 
             fun homeScreenView() = UiScrollable(UiSelector().scrollable(true))
             homeScreenView().waitForExists(waitingTime)
+            Log.i(TAG, "searchAndOpenHomeScreenShortcut: Waiting for home screen view")
 
             fun shortcut() =
                 homeScreenView()
                     .setAsHorizontalList()
                     .getChildByText(UiSelector().textContains(title), title, true)
             shortcut().clickAndWaitForNewWindow()
+            Log.i(TAG, "searchAndOpenHomeScreenShortcut: Clicked home screen shortcut: $title")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -101,11 +123,11 @@ fun addToHomeScreen(interact: AddToHomeScreenRobot.() -> Unit): AddToHomeScreenR
 private fun addAutomaticallyButton() =
     mDevice.findObject(UiSelector().textContains("add automatically"))
 
-private val cancelAddToHomeScreenButton =
+private fun cancelAddToHomeScreenButton() =
     itemWithResId("$packageName:id/cancel_button")
-private val confirmAddToHomeScreenButton =
+private fun confirmAddToHomeScreenButton() =
     itemWithResId("$packageName:id/add_button")
-private val shortcutTextField =
+private fun shortcutTextField() =
     itemWithResId("$packageName:id/shortcut_text")
 private fun shortcutTitle(title: String) =
     itemWithResIdAndText("$packageName:id/shortcut_text", title)

From 5d45dacf7b71e98691a400999d447728eac7302f Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 23 Jan 2024 15:05:15 +0200
Subject: [PATCH 029/222] Bug 1876036 - Add more test logs to BookmarksRobot

---
 .../mozilla/fenix/ui/robots/BookmarksRobot.kt | 254 ++++++++++--------
 1 file changed, 138 insertions(+), 116 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
index 7247f0075..a8a143ae6 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
@@ -7,6 +7,7 @@
 package org.mozilla.fenix.ui.robots
 
 import android.net.Uri
+import android.util.Log
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.clearText
 import androidx.test.espresso.action.ViewActions.longClick
@@ -32,6 +33,7 @@ import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.containsString
 import org.junit.Assert.assertEquals
 import org.mozilla.fenix.R
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
@@ -40,7 +42,6 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
-import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
 import org.mozilla.fenix.helpers.TestHelper.mDevice
@@ -54,47 +55,103 @@ import org.mozilla.fenix.helpers.ext.waitNotNull
 class BookmarksRobot {
 
     fun verifyBookmarksMenuView() {
+        Log.i(TAG, "verifyBookmarksMenuView: Looking for bookmarks view")
         mDevice.findObject(
             UiSelector().text("Bookmarks"),
         ).waitForExists(waitingTime)
 
-        assertBookmarksView()
+        onView(
+            allOf(
+                withText("Bookmarks"),
+                withParent(withId(R.id.navigationToolbar)),
+            ),
+        ).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyBookmarksMenuView: Verified bookmarks view is displayed")
     }
 
-    fun verifyAddFolderButton() = assertAddFolderButton()
+    fun verifyAddFolderButton() {
+        addFolderButton().check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        Log.i(TAG, "verifyAddFolderButton: Verified add bookmarks folder button is visible")
+    }
 
-    fun verifyCloseButton() = assertCloseButton()
+    fun verifyCloseButton() {
+        closeButton().check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        Log.i(TAG, "verifyCloseButton: Verified close bookmarks section button is visible")
+    }
 
     fun verifyDeleteMultipleBookmarksSnackBar() = assertSnackBarText("Bookmarks deleted")
 
-    fun verifyBookmarkFavicon(forUrl: Uri) = assertBookmarkFavicon(forUrl)
+    fun verifyBookmarkFavicon(forUrl: Uri) {
+        bookmarkFavicon(forUrl.toString()).check(
+            matches(
+                withEffectiveVisibility(
+                    ViewMatchers.Visibility.VISIBLE,
+                ),
+            ),
+        )
+        Log.i(TAG, "verifyBookmarkFavicon: Verified bookmarks favicon for $forUrl is visible")
+    }
 
-    fun verifyBookmarkedURL(url: String) = assertBookmarkURL(url)
+    fun verifyBookmarkedURL(url: String) {
+        bookmarkURL(url).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyBookmarkedURL: Verified bookmarks url: $url is displayed")
+    }
 
     fun verifyFolderTitle(title: String) {
+        Log.i(TAG, "verifyFolderTitle: Looking for bookmarks folder with title: $title")
         mDevice.findObject(UiSelector().text(title)).waitForExists(waitingTime)
-        assertFolderTitle(title)
+        onView(withText(title)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyFolderTitle: Verified bookmarks folder with title: $title is displayed")
     }
 
-    fun verifyBookmarkFolderIsNotCreated(title: String) = assertBookmarkFolderIsNotCreated(title)
+    fun verifyBookmarkFolderIsNotCreated(title: String) {
+        Log.i(TAG, "verifyBookmarkFolderIsNotCreated: Looking for bookmarks view")
+        mDevice.findObject(
+            UiSelector()
+                .resourceId("$packageName:id/bookmarks_wrapper"),
+        ).waitForExists(waitingTime)
+
+        assertUIObjectExists(itemContainingText(title), exists = false)
+    }
 
     fun verifyBookmarkTitle(title: String) {
+        Log.i(TAG, "verifyBookmarkTitle: Looking for bookmark with title: $title")
         mDevice.findObject(UiSelector().text(title)).waitForExists(waitingTime)
-        assertBookmarkTitle(title)
+        onView(withText(title)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyBookmarkTitle: Verified bookmark with title: $title is displayed")
     }
 
-    fun verifyBookmarkIsDeleted(expectedTitle: String) = assertBookmarkIsDeleted(expectedTitle)
+    fun verifyBookmarkIsDeleted(expectedTitle: String) {
+        Log.i(TAG, "verifyBookmarkIsDeleted: Looking for bookmarks view")
+        mDevice.findObject(
+            UiSelector()
+                .resourceId("$packageName:id/bookmarks_wrapper"),
+        ).waitForExists(waitingTime)
+
+        assertUIObjectExists(
+            itemWithResIdContainingText(
+                "$packageName:id/title",
+                expectedTitle,
+            ),
+            exists = false,
+        )
+    }
 
     fun verifyDeleteSnackBarText() = assertSnackBarText("Deleted")
 
-    fun verifyUndoDeleteSnackBarButton() = assertUndoDeleteSnackBarButton()
+    fun verifyUndoDeleteSnackBarButton() {
+        snackBarUndoButton().check(matches(withText("UNDO")))
+        Log.i(TAG, "verifyUndoDeleteSnackBarButton: Verified bookmark deletion undo snack bar button")
+    }
 
     fun verifySnackBarHidden() {
         mDevice.waitNotNull(
             Until.gone(By.text("UNDO")),
-            TestAssetHelper.waitingTime,
+            waitingTime,
         )
+        Log.i(TAG, "verifySnackBarHidden: Waited until undo snack bar button is gone")
         onView(withId(R.id.snackbar_layout)).check(doesNotExist())
+        Log.i(TAG, "verifySnackBarHidden: Verified bookmark snack bar does not exist")
     }
 
     fun verifyCopySnackBarText() = assertSnackBarText("URL copied")
@@ -112,19 +169,30 @@ class BookmarksRobot {
 
     fun verifyKeyboardHidden() = assertKeyboardVisibility(isExpectedToBeVisible = false)
 
-    fun verifyKeyboardVisible() = assertKeyboardVisibility(isExpectedToBeVisible = true)
-
-    fun verifyShareOverlay() = assertShareOverlay()
+    fun verifyShareOverlay() {
+        onView(withId(R.id.shareWrapper)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyShareOverlay: Verified bookmarks sharing overlay is displayed")
+    }
 
-    fun verifyShareBookmarkFavicon() = assertShareBookmarkFavicon()
+    fun verifyShareBookmarkFavicon() {
+        onView(withId(R.id.share_tab_favicon)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyShareBookmarkFavicon: Verified shared bookmarks favicon is displayed")
+    }
 
-    fun verifyShareBookmarkTitle() = assertShareBookmarkTitle()
+    fun verifyShareBookmarkTitle() {
+        onView(withId(R.id.share_tab_title)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyShareBookmarkTitle: Verified shared bookmarks title is displayed")
+    }
 
-    fun verifyShareBookmarkUrl() = assertShareBookmarkUrl()
+    fun verifyShareBookmarkUrl() {
+        onView(withId(R.id.share_tab_url)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyShareBookmarkUrl: Verified shared bookmarks url is displayed")
+    }
 
     fun verifySelectDefaultFolderSnackBarText() = assertSnackBarText("Can’t edit default folders")
 
     fun verifyCurrentFolderTitle(title: String) {
+        Log.i(TAG, "verifyCurrentFolderTitle: Looking for bookmark with title: $title")
         mDevice.findObject(
             UiSelector().resourceId("$packageName:id/navigationToolbar")
                 .textContains(title),
@@ -138,9 +206,11 @@ class BookmarksRobot {
             ),
         )
             .check(matches(isDisplayed()))
+        Log.i(TAG, "verifyCurrentFolderTitle: Verified bookmark with title: $title is displayed")
     }
 
     fun waitForBookmarksFolderContentToExist(parentFolderName: String, childFolderName: String) {
+        Log.i(TAG, "waitForBookmarksFolderContentToExist: Looking for navigation toolbar containing bookmark folder with title: $parentFolderName")
         mDevice.findObject(
             UiSelector().resourceId("$packageName:id/navigationToolbar")
                 .textContains(parentFolderName),
@@ -150,16 +220,17 @@ class BookmarksRobot {
         mDevice.waitNotNull(Until.findObject(By.text(childFolderName)), waitingTime)
     }
 
-    fun verifySyncSignInButton() =
+    fun verifySyncSignInButton() {
         syncSignInButton().check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-
-    fun verifyDeleteFolderConfirmationMessage() = assertDeleteFolderConfirmationMessage()
+        Log.i(TAG, "verifySyncSignInButton: Verified sign in to sync button is visible")
+    }
 
     fun cancelFolderDeletion() {
         onView(withText("CANCEL"))
             .inRoot(RootMatchers.isDialog())
             .check(matches(isDisplayed()))
             .click()
+        Log.i(TAG, "cancelFolderDeletion: Clicked \"Cancel\" bookmarks folder deletion dialog button")
     }
 
     fun createFolder(name: String, parent: String? = null) {
@@ -180,63 +251,85 @@ class BookmarksRobot {
     fun clickAddFolderButton() {
         mDevice.waitNotNull(
             Until.findObject(By.desc("Add folder")),
-            TestAssetHelper.waitingTime,
+            waitingTime,
         )
         addFolderButton().click()
+        Log.i(TAG, "clickAddFolderButton: Clicked add bookmarks folder button")
     }
 
-    fun clickAddNewFolderButtonFromSelectFolderView() =
+    fun clickAddNewFolderButtonFromSelectFolderView() {
         itemWithResId("$packageName:id/add_folder_button")
             .also {
                 it.waitForExists(waitingTime)
                 it.click()
             }
+        Log.i(TAG, "clickAddNewFolderButtonFromSelectFolderView: Clicked add bookmarks folder button from folder selection view")
+    }
 
     fun addNewFolderName(name: String) {
         addFolderTitleField()
             .click()
             .perform(replaceText(name))
+        Log.i(TAG, "addNewFolderName: Bookmarks folder name was set to: $name")
     }
 
     fun saveNewFolder() {
         saveFolderButton().click()
+        Log.i(TAG, "saveNewFolder: Clicked save folder button")
     }
 
     fun navigateUp() {
         goBackButton().click()
+        Log.i(TAG, "navigateUp: Clicked navigate up toolbar button")
     }
 
     fun clickUndoDeleteButton() {
         snackBarUndoButton().click()
+        Log.i(TAG, "clickUndoDeleteButton: Clicked undo snack bar button")
     }
 
     fun changeBookmarkTitle(newTitle: String) {
         bookmarkNameEditBox()
             .perform(clearText())
             .perform(typeText(newTitle))
+        Log.i(TAG, "changeBookmarkTitle: Bookmark title was set to: $newTitle")
     }
 
     fun changeBookmarkUrl(newUrl: String) {
         bookmarkURLEditBox()
             .perform(clearText())
             .perform(typeText(newUrl))
+        Log.i(TAG, "changeBookmarkUrl: Bookmark url was set to: $newUrl")
     }
 
     fun saveEditBookmark() {
         saveBookmarkButton().click()
+        Log.i(TAG, "saveEditBookmark: Clicked save bookmark button")
+        Log.i(TAG, "saveEditBookmark: Looking for bookmarks list")
         mDevice.findObject(UiSelector().resourceId("org.mozilla.fenix.debug:id/bookmark_list")).waitForExists(waitingTime)
     }
 
-    fun clickParentFolderSelector() = bookmarkFolderSelector().click()
+    fun clickParentFolderSelector() {
+        bookmarkFolderSelector().click()
+        Log.i(TAG, "clickParentFolderSelector: Clicked folder selector")
+    }
 
-    fun selectFolder(title: String) = onView(withText(title)).click()
+    fun selectFolder(title: String) {
+        onView(withText(title)).click()
+        Log.i(TAG, "selectFolder: Selected folder: $title")
+    }
 
-    fun longTapDesktopFolder(title: String) = onView(withText(title)).perform(longClick())
+    fun longTapDesktopFolder(title: String) {
+        onView(withText(title)).perform(longClick())
+        Log.i(TAG, "longTapDesktopFolder: Log tapped folder with title: $title")
+    }
 
     fun cancelDeletion() {
         val cancelButton = mDevice.findObject(UiSelector().textContains("CANCEL"))
+        Log.i(TAG, "saveEditBookmark: Looking for \"Cancel\" bookmarks deletion button")
         cancelButton.waitForExists(waitingTime)
         cancelButton.click()
+        Log.i(TAG, "saveEditBookmark: Clicked \"Cancel\" bookmarks deletion button")
     }
 
     fun confirmDeletion() {
@@ -244,26 +337,18 @@ class BookmarksRobot {
             .inRoot(RootMatchers.isDialog())
             .check(matches(isDisplayed()))
             .click()
+        Log.i(TAG, "confirmDeletion: Clicked \"Delete\" bookmarks deletion button")
     }
 
-    fun clickDeleteInEditModeButton() = deleteInEditModeButton().click()
-
-    fun searchBookmarkedItem(bookmarkedItem: String) {
-        itemWithResId("$packageName:id/mozac_browser_toolbar_edit_url_view").also {
-            it.waitForExists(waitingTime)
-            it.setText(bookmarkedItem)
-        }
-        mDevice.waitForWindowUpdate(packageName, waitingTimeShort)
+    fun clickDeleteInEditModeButton() {
+        deleteInEditModeButton().click()
+        Log.i(TAG, "clickDeleteInEditModeButton: Clicked delete bookmarks button while in edit mode")
     }
 
-    fun verifySearchedBookmarkExists(bookmarkUrl: String, exists: Boolean = true) =
-        assertUIObjectExists(itemContainingText(bookmarkUrl), exists = exists)
-
-    fun dismissBookmarksSearchBar() = mDevice.pressBack()
-
     class Transition {
         fun closeMenu(interact: HomeScreenRobot.() -> Unit): Transition {
             closeButton().click()
+            Log.i(TAG, "closeMenu: Clicked close bookmarks section button")
 
             HomeScreenRobot().interact()
             return Transition()
@@ -272,6 +357,7 @@ class BookmarksRobot {
         fun openThreeDotMenu(bookmark: String, interact: ThreeDotMenuBookmarksRobot.() -> Unit): ThreeDotMenuBookmarksRobot.Transition {
             mDevice.waitNotNull(Until.findObject(res("$packageName:id/overflow_menu")))
             threeDotMenu(bookmark).click()
+            Log.i(TAG, "openThreeDotMenu: Clicked three dot button for bookmark item: $bookmark")
 
             ThreeDotMenuBookmarksRobot().interact()
             return ThreeDotMenuBookmarksRobot.Transition()
@@ -279,6 +365,7 @@ class BookmarksRobot {
 
         fun clickSingInToSyncButton(interact: SettingsTurnOnSyncRobot.() -> Unit): SettingsTurnOnSyncRobot.Transition {
             syncSignInButton().click()
+            Log.i(TAG, "clickSingInToSyncButton: Clicked sign in to sync button")
 
             SettingsTurnOnSyncRobot().interact()
             return SettingsTurnOnSyncRobot.Transition()
@@ -286,6 +373,7 @@ class BookmarksRobot {
 
         fun goBack(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
             goBackButton().click()
+            Log.i(TAG, "goBack: Clicked go back button")
 
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
@@ -293,6 +381,7 @@ class BookmarksRobot {
 
         fun goBackToBrowserScreen(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
             goBackButton().click()
+            Log.i(TAG, "goBackToBrowserScreen: Clicked go back button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -300,17 +389,20 @@ class BookmarksRobot {
 
         fun closeEditBookmarkSection(interact: BookmarksRobot.() -> Unit): Transition {
             goBackButton().click()
+            Log.i(TAG, "goBackToBrowserScreen: Clicked go back button")
 
             BookmarksRobot().interact()
             return Transition()
         }
 
         fun openBookmarkWithTitle(bookmarkTitle: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "openBookmarkWithTitle: Looking for bookmark with title: $bookmarkTitle")
             itemWithResIdAndText("$packageName:id/title", bookmarkTitle)
                 .also {
                     it.waitForExists(waitingTime)
                     it.clickAndWaitForNewWindow(waitingTimeShort)
                 }
+            Log.i(TAG, "openBookmarkWithTitle: Clicked bookmark with title: $bookmarkTitle")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -318,6 +410,7 @@ class BookmarksRobot {
 
         fun clickSearchButton(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
             itemWithResId("$packageName:id/bookmark_search").click()
+            Log.i(TAG, "clickSearchButton: Clicked search bookmarks button")
 
             SearchRobot().interact()
             return SearchRobot.Transition()
@@ -376,91 +469,20 @@ private fun deleteInEditModeButton() = onView(withId(R.id.delete_bookmark_button
 
 private fun syncSignInButton() = onView(withId(R.id.bookmark_folders_sign_in))
 
-private fun assertBookmarksView() {
-    onView(
-        allOf(
-            withText("Bookmarks"),
-            withParent(withId(R.id.navigationToolbar)),
-        ),
-    )
-        .check(matches(isDisplayed()))
-}
-
-private fun assertAddFolderButton() =
-    addFolderButton().check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-
-private fun assertCloseButton() = closeButton().check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-
 private fun assertEmptyBookmarksList() =
     onView(withId(R.id.bookmarks_empty_view)).check(matches(withText("No bookmarks here")))
 
-private fun assertBookmarkFolderIsNotCreated(title: String) {
-    mDevice.findObject(
-        UiSelector()
-            .resourceId("$packageName:id/bookmarks_wrapper"),
-    ).waitForExists(waitingTime)
-
-    assertUIObjectExists(itemContainingText(title), exists = false)
-}
-
-private fun assertBookmarkFavicon(forUrl: Uri) = bookmarkFavicon(forUrl.toString()).check(
-    matches(
-        withEffectiveVisibility(
-            ViewMatchers.Visibility.VISIBLE,
-        ),
-    ),
-)
-
-private fun assertBookmarkURL(expectedURL: String) =
-    bookmarkURL(expectedURL).check(matches(isDisplayed()))
-
-private fun assertFolderTitle(expectedTitle: String) =
-    onView(withText(expectedTitle)).check(matches(isDisplayed()))
-
-private fun assertBookmarkTitle(expectedTitle: String) =
-    onView(withText(expectedTitle)).check(matches(isDisplayed()))
-
-private fun assertBookmarkIsDeleted(expectedTitle: String) {
-    mDevice.findObject(
-        UiSelector()
-            .resourceId("$packageName:id/bookmarks_wrapper"),
-    ).waitForExists(waitingTime)
-
-    assertUIObjectExists(
-        itemWithResIdContainingText(
-            "$packageName:id/title",
-            expectedTitle,
-        ),
-        exists = false,
-    )
-}
-private fun assertUndoDeleteSnackBarButton() =
-    snackBarUndoButton().check(matches(withText("UNDO")))
-
-private fun assertSnackBarText(text: String) =
+private fun assertSnackBarText(text: String) {
     snackBarText().check(matches(withText(containsString(text))))
+    Log.i(TAG, "assertSnackBarText: Verified $text snack bar")
+}
 
-private fun assertKeyboardVisibility(isExpectedToBeVisible: Boolean) =
+private fun assertKeyboardVisibility(isExpectedToBeVisible: Boolean) {
     assertEquals(
         isExpectedToBeVisible,
         mDevice
             .executeShellCommand("dumpsys input_method | grep mInputShown")
             .contains("mInputShown=true"),
     )
-
-private fun assertShareOverlay() =
-    onView(withId(R.id.shareWrapper)).check(matches(isDisplayed()))
-
-private fun assertShareBookmarkTitle() =
-    onView(withId(R.id.share_tab_title)).check(matches(isDisplayed()))
-
-private fun assertShareBookmarkFavicon() =
-    onView(withId(R.id.share_tab_favicon)).check(matches(isDisplayed()))
-
-private fun assertShareBookmarkUrl() =
-    onView(withId(R.id.share_tab_url)).check(matches(isDisplayed()))
-
-private fun assertDeleteFolderConfirmationMessage() =
-    onView(withText(R.string.bookmark_delete_folder_confirmation_dialog))
-        .inRoot(RootMatchers.isDialog())
-        .check(matches(isDisplayed()))
+    Log.i(TAG, "assertKeyboardVisibility: Verified that the keyboard is visible: $isExpectedToBeVisible")
+}

From 9aaeacc16f1abe41f644cec17d0ef1a7389f3245 Mon Sep 17 00:00:00 2001
From: DreVla <vlad.dreghici@gmail.com>
Date: Mon, 22 Jan 2024 11:58:16 +0200
Subject: [PATCH 030/222] Bug 1861744 - Don't display pending to delete
 bookmarks when refresh

When deleting bookmarks, we do not instantly remove them due to
having the possibility of undoing the deletion. Because of this,
when the bookmarks are pending to delete, they can still be displayed
when pulling down to refresh and then acted on. This patch aims to
fix this issue by subtracting the pending to delete bookmarks
when they are refreshed by pulling down.
---
 .../java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
index 2108dc143..466467589 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
@@ -281,6 +281,7 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
         context?.let {
             requireContext().bookmarkStorage
                 .getTree(guid, recursive)
+                ?.minus(pendingBookmarksToDelete)
                 ?.let { desktopFolders.withOptionalDesktopFolders(it) }
         }
     }

From 1dbf0145d5ad65af652700eac59e6ebd7c201b48 Mon Sep 17 00:00:00 2001
From: ohall-m <ohall@mozilla.com>
Date: Wed, 24 Jan 2024 13:02:23 -0500
Subject: [PATCH 031/222] Bug 1876332 - Refactoring out Translations Controller
 and Interactor

This patch refactors out the translations controller and interactor to
transition fully to a redux pattern.

Leaving the translations use cases for reference browser usage.
---
 .../translations/TranslationsController.kt    | 84 -----------------
 .../TranslationsDialogFragment.kt             | 19 +---
 .../translations/TranslationsInteractor.kt    | 54 -----------
 .../TranslationsControllerTest.kt             | 94 -------------------
 .../TranslationsInteractorTest.kt             | 78 ---------------
 5 files changed, 1 insertion(+), 328 deletions(-)
 delete mode 100644 app/src/main/java/org/mozilla/fenix/translations/TranslationsController.kt
 delete mode 100644 app/src/main/java/org/mozilla/fenix/translations/TranslationsInteractor.kt
 delete mode 100644 app/src/test/java/org/mozilla/fenix/components/translations/TranslationsControllerTest.kt
 delete mode 100644 app/src/test/java/org/mozilla/fenix/components/translations/TranslationsInteractorTest.kt

diff --git a/app/src/main/java/org/mozilla/fenix/translations/TranslationsController.kt b/app/src/main/java/org/mozilla/fenix/translations/TranslationsController.kt
deleted file mode 100644
index f29014ae8..000000000
--- a/app/src/main/java/org/mozilla/fenix/translations/TranslationsController.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.translations
-
-import mozilla.components.browser.state.selector.findTab
-import mozilla.components.browser.state.store.BrowserStore
-import mozilla.components.concept.engine.translate.DetectedLanguages
-import mozilla.components.concept.engine.translate.TranslationOptions
-import mozilla.components.feature.session.SessionUseCases
-import mozilla.components.support.base.log.logger.Logger
-
-/**
- * Manages requests to complete operations with other components.
- *
- * @param translationUseCase The use case for performing a translation.
- * @param browserStore The browser store to use for this controller.
- * @param tabId The tab to perform operations or complete requests for.
- */
-class TranslationsController(
-    private val translationUseCase: SessionUseCases.TranslateUseCase,
-    private val browserStore: BrowserStore,
-    private val tabId: String,
-
-) {
-    private val logger = Logger("TranslationsController")
-
-    /**
-     * Retrieves detected information about the language on the browser page, the user's preferred
-     * language, and if the detected page language is supported.
-     *
-     * @return The [DetectedLanguages] object that contains page and user preference information.
-     */
-    fun getDetectedLanguages(): DetectedLanguages? {
-        logger.info("Retrieving translations language support from the browser store.")
-        return browserStore.state.findTab(tabId)?.translationsState?.translationEngineState?.detectedLanguages
-    }
-
-    /**
-     * Translates the page on the given [tabId]. Will fallback to default expectations if
-     * [fromLanguage] and [toLanguage] are not provided.
-     *
-     * @param tabId The ID of the tab to translate.
-     * @param fromLanguage The BCP-47 language code to translate from. If null, the default will
-     * be set to the page language.
-     * @param toLanguage The BCP-47 language code to translate to. If null, the default will
-     * be set to the user's preferred language.
-     * @param options Optional options to specify and additional criteria for the translation.
-     */
-    fun translate(
-        tabId: String?,
-        fromLanguage: String?,
-        toLanguage: String?,
-        options: TranslationOptions?,
-    ) {
-        if (fromLanguage != null && toLanguage != null) {
-            logger.info("Requesting a translation.")
-            translationUseCase.invoke(tabId, fromLanguage, toLanguage, options)
-            return
-        }
-
-        // Fallback to find defaults
-        var defaultFromLanguage = fromLanguage
-        var defaultToLanguage = toLanguage
-        val detectedLanguages = getDetectedLanguages()
-
-        if (defaultFromLanguage == null) {
-            defaultFromLanguage = detectedLanguages?.documentLangTag
-            logger.info("Setting translating to use a default 'from' of $defaultFromLanguage.")
-        }
-
-        if (defaultToLanguage == null) {
-            defaultToLanguage = detectedLanguages?.userPreferredLangTag
-            logger.info("Setting translating to use a default 'to' of $defaultToLanguage.")
-        }
-
-        if (defaultFromLanguage != null && defaultToLanguage != null) {
-            logger.info("Requesting a translation based on defaults.")
-            translationUseCase.invoke(tabId, defaultFromLanguage, defaultToLanguage, options)
-            return
-        }
-    }
-}
diff --git a/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogFragment.kt
index 78c0cd73a..442bd8112 100644
--- a/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogFragment.kt
@@ -26,7 +26,6 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
-import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.settings.SupportUtils
 import org.mozilla.fenix.theme.FirefoxTheme
@@ -45,7 +44,6 @@ class TranslationsDialogFragment : BottomSheetDialogFragment() {
 
     private var behavior: BottomSheetBehavior<View>? = null
     private val args by navArgs<TranslationsDialogFragmentArgs>()
-    private lateinit var interactor: TranslationsInteractor
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
         super.onCreateDialog(savedInstanceState).apply {
@@ -63,14 +61,6 @@ class TranslationsDialogFragment : BottomSheetDialogFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?,
     ): View = ComposeView(requireContext()).apply {
-        interactor = TranslationsInteractor(
-            translationsController = TranslationsController(
-                translationUseCase = requireComponents.useCases.sessionUseCases.translate,
-                browserStore = requireComponents.core.store,
-                tabId = args.sessionId,
-            ),
-        )
-
         setContent {
             FirefoxTheme {
                 var translationsVisibility by remember {
@@ -125,14 +115,7 @@ class TranslationsDialogFragment : BottomSheetDialogFragment() {
                                             from = BrowserDirection.FromTranslationsDialogFragment,
                                         )
                                     },
-                                    onTranslateButtonClick = {
-                                        interactor.onTranslate(
-                                            tabId = args.sessionId,
-                                            fromLanguage = null,
-                                            toLanguage = null,
-                                            null,
-                                        )
-                                    },
+                                    onTranslateButtonClick = {},
                                     onNotNowButtonClick = { dismiss() },
                                 )
                             }
diff --git a/app/src/main/java/org/mozilla/fenix/translations/TranslationsInteractor.kt b/app/src/main/java/org/mozilla/fenix/translations/TranslationsInteractor.kt
deleted file mode 100644
index cf98bd616..000000000
--- a/app/src/main/java/org/mozilla/fenix/translations/TranslationsInteractor.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.translations
-
-import mozilla.components.concept.engine.translate.DetectedLanguages
-import mozilla.components.concept.engine.translate.TranslationOptions
-import mozilla.components.support.base.log.logger.Logger
-
-/**
- * Manages coordinating the functionality interactions for use in the views.
- *
- * @param translationsController The translations controller that requests data and
- * interactions.
- */
-class TranslationsInteractor(
-    private val translationsController: TranslationsController,
-) {
-    private val logger = Logger("TranslationsInteractor")
-
-    /**
-     * Retrieves the [DetectedLanguages] applicable to the page.
-     *
-     * @return The [DetectedLanguages] object that contains page and user preference information.
-     */
-    fun detectedLanguages(): DetectedLanguages? {
-        logger.info("Requesting translations language support from the controller.")
-        return translationsController.getDetectedLanguages()
-    }
-
-    /**
-     * Translates the page on the given [tabId].
-     * If null is provided for [fromLanguage] or [toLanguage], the engine will attempt to
-     * find a sensible default.
-     *
-     * @param tabId The ID of the tab to translate.
-     * @param fromLanguage The BCP-47 language code to translate from. Usually will be the detected
-     * page language. If set as null, will revert to a default page language, if known.
-     * @param toLanguage The BCP-47 language code to translate to. Usually will be the user's
-     * preferred language. If set as null, will revert to a default of the user's preferred
-     * language, if known.
-     * @param options Optional options to specify and additional criteria for the translation.
-     */
-    fun onTranslate(
-        tabId: String?,
-        fromLanguage: String?,
-        toLanguage: String?,
-        options: TranslationOptions?,
-    ) {
-        logger.info("Requesting a translation from the controller.")
-        translationsController.translate(tabId, fromLanguage, toLanguage, options)
-    }
-}
diff --git a/app/src/test/java/org/mozilla/fenix/components/translations/TranslationsControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/translations/TranslationsControllerTest.kt
deleted file mode 100644
index a9b580061..000000000
--- a/app/src/test/java/org/mozilla/fenix/components/translations/TranslationsControllerTest.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.components.translations
-
-import mozilla.components.browser.state.selector.findTab
-import mozilla.components.browser.state.state.BrowserState
-import mozilla.components.browser.state.state.TabSessionState
-import mozilla.components.browser.state.state.TranslationsState
-import mozilla.components.browser.state.state.createTab
-import mozilla.components.browser.state.store.BrowserStore
-import mozilla.components.concept.engine.translate.DetectedLanguages
-import mozilla.components.concept.engine.translate.TranslationEngineState
-import mozilla.components.concept.engine.translate.TranslationOptions
-import mozilla.components.feature.session.SessionUseCases
-import mozilla.components.support.test.mock
-import mozilla.components.support.test.whenever
-import org.junit.Assert.assertNotNull
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mockito.spy
-import org.mockito.Mockito.verify
-import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
-import org.mozilla.fenix.translations.TranslationsController
-
-@RunWith(FenixRobolectricTestRunner::class)
-class TranslationsControllerTest {
-
-    val tab: TabSessionState = spy(
-        createTab(
-            url = "https://www.firefox.com",
-            title = "Firefox",
-            id = "1",
-        ),
-    )
-    private val tabs = spy(listOf(tab))
-    private val browserState = spy(BrowserState(tabs = tabs))
-    private val browserStore = spy(BrowserStore(browserState))
-
-    private val translationsUseCase: SessionUseCases.TranslateUseCase = mock()
-    private val translationsController = spy(TranslationsController(translationUseCase = translationsUseCase, browserStore = browserStore, tabId = tab.id))
-
-    @Test
-    fun `Controller translate called the translate use case as expected`() {
-        val from = "en"
-        val to = "es"
-        val options = TranslationOptions(false)
-        translationsController.translate(tab.id, from, to, options)
-        verify(translationsUseCase).invoke(tab.id, from, to, options)
-    }
-
-    @Test
-    fun `Controller translate called the translate use case as expected when languages were null`() {
-        val mockFrom = "es"
-        val mockTo = "en"
-        val mockDetectedLanguages = DetectedLanguages(
-            documentLangTag = mockFrom,
-            supportedDocumentLang = true,
-            userPreferredLangTag = mockTo,
-        )
-        whenever(translationsController.getDetectedLanguages()).thenReturn(mockDetectedLanguages)
-
-        val from = null
-        val to = null
-        val options = TranslationOptions(false)
-        translationsController.translate(tab.id, from, to, options)
-
-        verify(translationsUseCase).invoke(tab.id, mockFrom, mockTo, options)
-    }
-
-    @Test
-    fun `Controller detectedLanguages retrieved the languages as expected`() {
-        val mockFrom = "es"
-        val mockTo = "en"
-        val mockDetectedLanguages = DetectedLanguages(
-            documentLangTag = mockFrom,
-            supportedDocumentLang = true,
-            userPreferredLangTag = mockTo,
-        )
-        val mockState = TranslationsState(
-            translationEngineState = TranslationEngineState(mockDetectedLanguages),
-        )
-
-        whenever(browserState.findTab(tab.id)?.translationsState).thenReturn(mockState)
-
-        val test = translationsController.getDetectedLanguages()
-
-        assertNotNull(test)
-        assertTrue(test?.documentLangTag == mockDetectedLanguages.documentLangTag)
-        assertTrue(test?.userPreferredLangTag == mockDetectedLanguages.userPreferredLangTag)
-    }
-}
diff --git a/app/src/test/java/org/mozilla/fenix/components/translations/TranslationsInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/components/translations/TranslationsInteractorTest.kt
deleted file mode 100644
index e367aa056..000000000
--- a/app/src/test/java/org/mozilla/fenix/components/translations/TranslationsInteractorTest.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.components.translations
-
-import mozilla.components.browser.state.state.BrowserState
-import mozilla.components.browser.state.state.TabSessionState
-import mozilla.components.browser.state.state.createTab
-import mozilla.components.browser.state.store.BrowserStore
-import mozilla.components.concept.engine.translate.DetectedLanguages
-import mozilla.components.concept.engine.translate.TranslationOptions
-import mozilla.components.feature.session.SessionUseCases
-import mozilla.components.support.test.mock
-import mozilla.components.support.test.whenever
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mockito.never
-import org.mockito.Mockito.spy
-import org.mockito.Mockito.verify
-import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
-import org.mozilla.fenix.translations.TranslationsController
-import org.mozilla.fenix.translations.TranslationsInteractor
-
-@RunWith(FenixRobolectricTestRunner::class)
-class TranslationsInteractorTest {
-
-    val tab: TabSessionState = spy(
-        createTab(
-            url = "https://www.firefox.com",
-            title = "Firefox",
-            id = "1",
-        ),
-    )
-    private val tabs = spy(listOf(tab))
-    private val browserState = spy(BrowserState(tabs = tabs))
-    private val browserStore = spy(BrowserStore(browserState))
-
-    private val translationsUseCase: SessionUseCases.TranslateUseCase = mock()
-    private val translationsController = spy(TranslationsController(translationUseCase = translationsUseCase, browserStore = browserStore, tabId = tab.id))
-    private val interactor = TranslationsInteractor(translationsController)
-
-    @Test
-    fun `Interactor onTranslate called the translate controller as expected`() {
-        val from = "en"
-        val to = "es"
-        val options = TranslationOptions(false)
-        interactor.onTranslate(tab.id, from, to, options)
-        verify(translationsController).translate(tab.id, from, to, options)
-        verify(translationsController, never()).getDetectedLanguages()
-    }
-
-    @Test
-    fun `Interactor onTranslate called the translate controller as expected when languages are null`() {
-        val mockFrom = "es"
-        val mockTo = "en"
-        val mockDetectedLanguages = DetectedLanguages(
-            documentLangTag = mockFrom,
-            supportedDocumentLang = true,
-            userPreferredLangTag = mockTo,
-        )
-        whenever(translationsController.getDetectedLanguages()).thenReturn(mockDetectedLanguages)
-
-        val from = null
-        val to = null
-        val options = TranslationOptions(false)
-        interactor.onTranslate(tab.id, from, to, options)
-        verify(translationsController).translate(tab.id, from, to, options)
-        verify(translationsController).getDetectedLanguages()
-        verify(translationsUseCase).invoke(tab.id, mockFrom, mockTo, options)
-    }
-
-    @Test
-    fun `Interactor detectedLanguages called the controller to pull detected languages`() {
-        interactor.detectedLanguages()
-        verify(translationsController).getDetectedLanguages()
-    }
-}

From 4cfc195fa4243c507bf55a6cd4ed57bf650c0962 Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Thu, 25 Jan 2024 10:28:42 +0000
Subject: [PATCH 032/222] Bug 1876486 - Removed redundant val
 homeActivityInitTimeStampNanoSeconds from HomeActivity

---
 app/src/main/java/org/mozilla/fenix/HomeActivity.kt | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 773c4e951..d54d9d691 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -14,7 +14,6 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.StrictMode
-import android.os.SystemClock
 import android.text.TextUtils
 import android.text.format.DateUtils
 import android.util.AttributeSet
@@ -152,12 +151,6 @@ import java.util.Locale
  */
 @SuppressWarnings("TooManyFunctions", "LargeClass", "LongMethod")
 open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
-    // DO NOT MOVE ANYTHING ABOVE THIS, GETTING INIT TIME IS CRITICAL
-    // we need to store startup timestamp for warm startup. we cant directly store
-    // inside AppStartupTelemetry since that class lives inside components and
-    // components requires context to access.
-    protected val homeActivityInitTimeStampNanoSeconds = SystemClock.elapsedRealtimeNanos()
-
     private lateinit var binding: ActivityHomeBinding
     lateinit var themeManager: ThemeManager
     lateinit var browsingModeManager: BrowsingModeManager

From d2e0d9fdd0a399bb4f28abf6daa9f6b09af3cbad Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Thu, 25 Jan 2024 11:00:14 +0000
Subject: [PATCH 033/222] Bug 1876481 - Updated `HomeActivity` variables &
 funcs with the necessary visibility modifiers to enforce constraints.

---
 .../java/org/mozilla/fenix/HomeActivity.kt    | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index d54d9d691..eaa4d725a 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -517,7 +517,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         components.core.store.dispatch(SearchAction.RefreshSearchEnginesAction)
     }
 
-    override fun onStart() {
+    final override fun onStart() {
         // DO NOT MOVE ANYTHING ABOVE THIS getProfilerTime CALL.
         val startProfilerTime = components.core.engine.profiler?.getProfilerTime()
 
@@ -537,7 +537,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         ) // DO NOT MOVE ANYTHING BELOW THIS addMarker CALL.
     }
 
-    override fun onStop() {
+    final override fun onStop() {
         super.onStop()
 
         // Diagnostic breadcrumb for "Display already aquired" crash:
@@ -593,6 +593,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         outContent?.webUri = currentTabUrl?.let { Uri.parse(it) }
     }
 
+    @CallSuper
     override fun onDestroy() {
         super.onDestroy()
 
@@ -616,7 +617,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         }
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
+    final override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
 
         // Diagnostic breadcrumb for "Display already aquired" crash:
@@ -626,7 +627,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         )
     }
 
-    override fun recreate() {
+    final override fun recreate() {
         // Diagnostic breadcrumb for "Display already aquired" crash:
         // https://github.com/mozilla-mobile/android-components/issues/7960
         breadcrumb(
@@ -711,12 +712,12 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         else -> super.onCreateView(parent, name, context, attrs)
     }
 
-    override fun onActionModeStarted(mode: ActionMode?) {
+    final override fun onActionModeStarted(mode: ActionMode?) {
         actionMode = mode
         super.onActionModeStarted(mode)
     }
 
-    override fun onActionModeFinished(mode: ActionMode?) {
+    final override fun onActionModeFinished(mode: ActionMode?) {
         actionMode = null
         super.onActionModeFinished(mode)
     }
@@ -783,7 +784,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         return false
     }
 
-    override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
+    final override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
         ProfilerMarkers.addForDispatchTouchEvent(components.core.engine.profiler, ev)
         return super.dispatchTouchEvent(ev)
     }
@@ -844,6 +845,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
      * private mode directly before the content view is created. Returns the mode set by the intent
      * otherwise falls back to the last known mode.
      */
+    @VisibleForTesting
     internal fun getModeFromIntentOrLastKnown(intent: Intent?): BrowsingMode {
         intent?.toSafeIntent()?.let {
             if (it.hasExtra(PRIVATE_BROWSING_MODE)) {
@@ -896,7 +898,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
      * Returns the [supportActionBar], inflating it if necessary.
      * Everyone should call this instead of supportActionBar.
      */
-    override fun getSupportActionBarAndInflateIfNecessary(): ActionBar {
+    final override fun getSupportActionBarAndInflateIfNecessary(): ActionBar {
         if (!isToolbarInflated) {
             navigationToolbar = binding.navigationToolbarStub.inflate() as Toolbar
 
@@ -911,7 +913,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
     }
 
     @Suppress("SpreadOperator")
-    fun setupNavigationToolbar(vararg topLevelDestinationIds: Int) {
+    private fun setupNavigationToolbar(vararg topLevelDestinationIds: Int) {
         NavigationUI.setupWithNavController(
             navigationToolbar,
             navHost.navController,
@@ -1094,13 +1096,13 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         navController.navigate(NavGraphDirections.actionStartupHome())
     }
 
-    override fun attachBaseContext(base: Context) {
+    final override fun attachBaseContext(base: Context) {
         base.components.strictMode.resetAfter(StrictMode.allowThreadDiskReads()) {
             super.attachBaseContext(base)
         }
     }
 
-    override fun getSystemService(name: String): Any? {
+    final override fun getSystemService(name: String): Any? {
         // Issue #17759 had a crash with the PerformanceInflater.kt on Android 5.0 and 5.1
         // when using the TimePicker. Since the inflater was created for performance monitoring
         // purposes and that we test on new android versions, this means that any difference in
@@ -1114,7 +1116,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         return super.getSystemService(name)
     }
 
-    protected open fun createBrowsingModeManager(initialMode: BrowsingMode): BrowsingModeManager {
+    private fun createBrowsingModeManager(initialMode: BrowsingMode): BrowsingModeManager {
         return DefaultBrowsingModeManager(initialMode, components.settings) { newMode ->
             updateSecureWindowFlags(newMode)
             themeManager.currentTheme = newMode
@@ -1131,7 +1133,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         }
     }
 
-    protected open fun createThemeManager(): ThemeManager {
+    private fun createThemeManager(): ThemeManager {
         return DefaultThemeManager(browsingModeManager.mode, this)
     }
 
@@ -1182,7 +1184,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
      *  Indicates if the user should be redirected to the [BrowserFragment] or to the [HomeFragment],
      *  links from an external apps should always opened in the [BrowserFragment].
      */
-    fun shouldStartOnHome(intent: Intent? = this.intent): Boolean {
+    @VisibleForTesting
+    internal fun shouldStartOnHome(intent: Intent? = this.intent): Boolean {
         return components.strictMode.resetAfter(StrictMode.allowThreadDiskReads()) {
             // We only want to open on home when users tap the app,
             // we want to ignore other cases when the app gets open by users clicking on links.
@@ -1262,6 +1265,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
 
         // PWA must have been used within last 30 days to be considered "recently used" for the
         // telemetry purposes.
-        const val PWA_RECENTLY_USED_THRESHOLD = DateUtils.DAY_IN_MILLIS * 30L
+        private const val PWA_RECENTLY_USED_THRESHOLD = DateUtils.DAY_IN_MILLIS * 30L
     }
 }

From 92fca78ea38f68c48cacbc62de3e41adb9569c4e Mon Sep 17 00:00:00 2001
From: JohanLorenzo <JohanLorenzo@users.noreply.github.com>
Date: Thu, 25 Jan 2024 18:02:55 +0000
Subject: [PATCH 034/222] Update Fenix initial_experiments.json based on the
 current first-run experiments in experimenter

---
 app/src/main/res/raw/initial_experiments.json | 80 ++++++++++++++++++-
 1 file changed, 77 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/raw/initial_experiments.json b/app/src/main/res/raw/initial_experiments.json
index d101bbd3e..8543827c6 100644
--- a/app/src/main/res/raw/initial_experiments.json
+++ b/app/src/main/res/raw/initial_experiments.json
@@ -54,7 +54,79 @@
       "referenceBranch": "treatment-a",
       "featureValidationOptOut": false,
       "localizations": null,
-      "locales": null
+      "locales": null,
+      "publishedDate": null
+    },
+    {
+      "schemaVersion": "1.12.0",
+      "slug": "android-long-term-holdback-validation",
+      "id": "android-long-term-holdback-validation",
+      "arguments": {},
+      "application": "org.mozilla.firefox_beta",
+      "appName": "fenix",
+      "appId": "org.mozilla.firefox_beta",
+      "channel": "beta",
+      "userFacingName": "Android Long-term Holdback Validation",
+      "userFacingDescription": "This is an internal test of new experiment tooling",
+      "isEnrollmentPaused": false,
+      "isRollout": false,
+      "bucketConfig": {
+        "randomizationUnit": "nimbus_id",
+        "namespace": "fenix-no-feature-fenix-beta-2",
+        "start": 0,
+        "count": 10000,
+        "total": 10000
+      },
+      "featureIds": [
+        "no-feature-fenix"
+      ],
+      "probeSets": [],
+      "outcomes": [],
+      "branches": [
+        {
+          "slug": "delivery",
+          "ratio": 9,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "no-feature-fenix",
+              "enabled": true,
+              "value": {}
+            }
+          ]
+        },
+        {
+          "slug": "holdback",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "no-feature-fenix",
+              "enabled": true,
+              "value": {}
+            }
+          ]
+        }
+      ],
+      "targeting": "((is_already_enrolled) || ((app_version|versionCompare('123.!') >= 0)))",
+      "startDate": "2024-01-25",
+      "enrollmentEndDate": null,
+      "endDate": null,
+      "proposedDuration": 60,
+      "proposedEnrollment": 30,
+      "referenceBranch": "holdback",
+      "featureValidationOptOut": false,
+      "localizations": null,
+      "locales": null,
+      "publishedDate": "2024-01-25T17:36:03.153458Z"
     },
     {
       "schemaVersion": "1.12.0",
@@ -222,7 +294,8 @@
       "referenceBranch": "control",
       "featureValidationOptOut": false,
       "localizations": null,
-      "locales": null
+      "locales": null,
+      "publishedDate": null
     },
     {
       "schemaVersion": "1.12.0",
@@ -303,7 +376,8 @@
       "referenceBranch": "control",
       "featureValidationOptOut": false,
       "localizations": null,
-      "locales": null
+      "locales": null,
+      "publishedDate": null
     }
   ]
 }

From a8a6368dca661f5dc15713565583a234efdf1564 Mon Sep 17 00:00:00 2001
From: ohall-m <ohall@mozilla.com>
Date: Wed, 24 Jan 2024 12:21:34 -0500
Subject: [PATCH 035/222] Bug 1874441 - Connecting Dropdowns to Translate
 Button

This patch connects the translations to and from dropdowns to the
translation button and sets default dropdown selection values.
---
 .../translations/TranslationsBottomSheet.kt   | 16 +++-
 .../TranslationsDialogBottomSheet.kt          | 94 ++++++++++++++-----
 .../TranslationsDialogFragment.kt             | 59 +++++++++++-
 app/src/main/res/values/strings.xml           |  2 +
 4 files changed, 145 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/translations/TranslationsBottomSheet.kt b/app/src/main/java/org/mozilla/fenix/translations/TranslationsBottomSheet.kt
index c598677aa..efab01c24 100644
--- a/app/src/main/java/org/mozilla/fenix/translations/TranslationsBottomSheet.kt
+++ b/app/src/main/java/org/mozilla/fenix/translations/TranslationsBottomSheet.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
+import mozilla.components.concept.engine.translate.Language
 import mozilla.components.concept.engine.translate.TranslationError
 import org.mozilla.fenix.theme.FirefoxTheme
 
@@ -127,25 +128,36 @@ internal fun TranslationsOptionsAnimation(
 }
 
 @Composable
+@Suppress("LongParameterList")
 internal fun TranslationsDialog(
     learnMoreUrl: String,
     showFirstTimeTranslation: Boolean,
+    translateFromLanguages: List<Language>?,
+    translateToLanguages: List<Language>?,
+    initialFrom: Language? = null,
+    initialTo: Language? = null,
     translationError: TranslationError? = null,
     onSettingClicked: () -> Unit,
     onLearnMoreClicked: () -> Unit,
     onTranslateButtonClick: () -> Unit,
     onNotNowButtonClick: () -> Unit,
+    onFromSelected: (Language) -> Unit,
+    onToSelected: (Language) -> Unit,
 ) {
     TranslationsDialogBottomSheet(
         learnMoreUrl = learnMoreUrl,
         showFirstTimeTranslation = showFirstTimeTranslation,
         translationError = translationError,
-        translateFromLanguages = getTranslateFromLanguageList(),
-        translateToLanguages = getTranslateToLanguageList(),
+        translateFromLanguages = translateFromLanguages,
+        translateToLanguages = translateToLanguages,
+        initialFrom = initialFrom,
+        initialTo = initialTo,
         onSettingClicked = onSettingClicked,
         onLearnMoreClicked = onLearnMoreClicked,
         onTranslateButtonClicked = onTranslateButtonClick,
         onNotNowButtonClicked = onNotNowButtonClick,
+        onFromSelected = onFromSelected,
+        onToSelected = onToSelected,
     )
 }
 
diff --git a/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogBottomSheet.kt b/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogBottomSheet.kt
index ce75ba701..6934d32d6 100644
--- a/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogBottomSheet.kt
+++ b/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogBottomSheet.kt
@@ -69,26 +69,34 @@ private val ICON_SIZE = 24.dp
  *
  * @param learnMoreUrl The learn more link for translations website.
  * @param showFirstTimeTranslation Whether translations first flow should be shown.
- * @param translationError The type of translation errors that can occur.
  * @param translateFromLanguages Translation menu items to be shown in the translate from dropdown.
  * @param translateToLanguages Translation menu items are to be shown in the translate to dropdown.
+ * @param initialFrom The initial selection for the translate from dropdown.
+ * @param initialTo The initial selection for the translate to dropdown.
+ * @param translationError The type of translation errors that can occur.
  * @param onSettingClicked Invoked when the user clicks on the settings button.
  * @param onLearnMoreClicked Invoked when the user clicks on the "Learn More" button.
  * @param onTranslateButtonClicked Invoked when the user clicks on the "Translate" button.
  * @param onNotNowButtonClicked Invoked when the user clicks on the "Not Now" button.
+ * @param onFromSelected Invoked when the user selects an item on the from dropdown.
+ * @param onToSelected Invoked when the user selects an item on the to dropdown.
  */
 @Composable
 @Suppress("LongParameterList")
 fun TranslationsDialogBottomSheet(
     learnMoreUrl: String,
     showFirstTimeTranslation: Boolean,
+    translateFromLanguages: List<Language>?,
+    translateToLanguages: List<Language>?,
+    initialFrom: Language? = null,
+    initialTo: Language? = null,
     translationError: TranslationError? = null,
-    translateFromLanguages: List<Language>,
-    translateToLanguages: List<Language>,
     onSettingClicked: () -> Unit,
     onLearnMoreClicked: () -> Unit,
     onTranslateButtonClicked: () -> Unit,
     onNotNowButtonClicked: () -> Unit,
+    onFromSelected: (Language) -> Unit,
+    onToSelected: (Language) -> Unit,
 ) {
     var orientation by remember { mutableIntStateOf(Configuration.ORIENTATION_PORTRAIT) }
 
@@ -127,12 +135,18 @@ fun TranslationsDialogBottomSheet(
 
         Spacer(modifier = Modifier.height(14.dp))
 
-        if (translationError !is TranslationError.CouldNotLoadLanguagesError) {
+        if (translationError !is TranslationError.CouldNotLoadLanguagesError &&
+            translateFromLanguages != null && translateToLanguages != null
+        ) {
             when (orientation) {
                 Configuration.ORIENTATION_LANDSCAPE -> {
                     TranslationsDialogContentInLandscapeMode(
                         translateFromLanguages = translateFromLanguages,
                         translateToLanguages = translateToLanguages,
+                        initialFrom = initialFrom,
+                        initialTo = initialTo,
+                        onFromSelected = onFromSelected,
+                        onToSelected = onToSelected,
                     )
                 }
 
@@ -140,6 +154,10 @@ fun TranslationsDialogBottomSheet(
                     TranslationsDialogContentInPortraitMode(
                         translateFromLanguages = translateFromLanguages,
                         translateToLanguages = translateToLanguages,
+                        initialFrom = initialFrom,
+                        initialTo = initialTo,
+                        onFromSelected = onFromSelected,
+                        onToSelected = onToSelected,
                     )
                 }
             }
@@ -159,12 +177,19 @@ fun TranslationsDialogBottomSheet(
 private fun TranslationsDialogContentInPortraitMode(
     translateFromLanguages: List<Language>,
     translateToLanguages: List<Language>,
+    initialFrom: Language? = null,
+    initialTo: Language? = null,
+    onFromSelected: (Language) -> Unit,
+    onToSelected: (Language) -> Unit,
+
 ) {
     Column {
         TranslationsDropdown(
             header = stringResource(id = R.string.translations_bottom_sheet_translate_from),
             modifier = Modifier.fillMaxWidth(),
             translateLanguages = translateFromLanguages,
+            initiallySelected = initialFrom,
+            onLanguageSelection = onFromSelected,
         )
 
         Spacer(modifier = Modifier.height(16.dp))
@@ -173,6 +198,8 @@ private fun TranslationsDialogContentInPortraitMode(
             header = stringResource(id = R.string.translations_bottom_sheet_translate_to),
             modifier = Modifier.fillMaxWidth(),
             translateLanguages = translateToLanguages,
+            initiallySelected = initialTo,
+            onLanguageSelection = onToSelected,
         )
     }
 }
@@ -181,6 +208,10 @@ private fun TranslationsDialogContentInPortraitMode(
 private fun TranslationsDialogContentInLandscapeMode(
     translateFromLanguages: List<Language>,
     translateToLanguages: List<Language>,
+    initialFrom: Language? = null,
+    initialTo: Language? = null,
+    onFromSelected: (Language) -> Unit,
+    onToSelected: (Language) -> Unit,
 ) {
     Column {
         Row {
@@ -189,6 +220,8 @@ private fun TranslationsDialogContentInLandscapeMode(
                 modifier = Modifier.weight(1f),
                 isInLandscapeMode = true,
                 translateLanguages = translateFromLanguages,
+                initiallySelected = initialFrom,
+                onLanguageSelection = onFromSelected,
             )
 
             Spacer(modifier = Modifier.width(16.dp))
@@ -198,6 +231,8 @@ private fun TranslationsDialogContentInLandscapeMode(
                 modifier = Modifier.weight(1f),
                 isInLandscapeMode = true,
                 translateLanguages = translateToLanguages,
+                initiallySelected = initialTo,
+                onLanguageSelection = onToSelected,
             )
         }
     }
@@ -318,23 +353,29 @@ private fun TranslationsDialogInfoMessage(
     }
 }
 
+/**
+ * Creates a dropdown with language selection to use to select languages for translation.
+ *
+ * @param header The title of the dropdown.
+ * @param translateLanguages The language choices the dropdown should provide.
+ * @param modifier Any modifiers for the component.
+ * @param isInLandscapeMode If the item should layout for landscape mode.
+ * @param initiallySelected The language initially selected, if null will show "Choose a language".
+ * @param onLanguageSelection Callback for the selected language.
+ */
 @Composable
 private fun TranslationsDropdown(
     header: String,
     translateLanguages: List<Language>,
     modifier: Modifier = Modifier,
     isInLandscapeMode: Boolean = false,
+    initiallySelected: Language? = null,
+    onLanguageSelection: (Language) -> Unit,
 ) {
     val density = LocalDensity.current
 
     var expanded by remember { mutableStateOf(false) }
 
-    var selectedLanguage by remember {
-        mutableStateOf(
-            translateLanguages.last().localizedDisplayName,
-        )
-    }
-
     var contextMenuWidthDp by remember {
         mutableStateOf(0.dp)
     }
@@ -355,15 +396,18 @@ private fun TranslationsDropdown(
 
         Spacer(modifier = Modifier.height(4.dp))
 
+        var initialValue = stringResource(R.string.translations_bottom_sheet_default_dropdown_selection)
+        initiallySelected?.localizedDisplayName?.let {
+            initialValue = it
+        }
+
         Row {
-            selectedLanguage?.let {
-                Text(
-                    text = it,
-                    modifier = Modifier.weight(1f),
-                    color = FirefoxTheme.colors.textPrimary,
-                    style = FirefoxTheme.typography.subtitle1,
-                )
-            }
+            Text(
+                text = initialValue,
+                modifier = Modifier.weight(1f),
+                color = FirefoxTheme.colors.textPrimary,
+                style = FirefoxTheme.typography.subtitle1,
+            )
 
             Spacer(modifier = Modifier.width(10.dp))
 
@@ -379,10 +423,12 @@ private fun TranslationsDropdown(
                     onDismissRequest = {
                         expanded = false
                     },
-                    menuItems = getContextMenuItems(translateLanguages = translateLanguages) {
-                        expanded = false
-                        selectedLanguage = it.localizedDisplayName
-                    },
+
+                    menuItems = getContextMenuItems(
+                        translateLanguages = translateLanguages,
+                        onClickItem = onLanguageSelection,
+                    ),
+
                     modifier = Modifier
                         .onGloballyPositioned { coordinates ->
                             contextMenuWidthDp = with(density) {
@@ -505,10 +551,14 @@ private fun TranslationsDialogBottomSheetPreview() {
             translationError = TranslationError.LanguageNotSupportedError(null),
             translateFromLanguages = getTranslateFromLanguageList(),
             translateToLanguages = getTranslateToLanguageList(),
+            initialFrom = null,
+            initialTo = null,
             onSettingClicked = {},
             onLearnMoreClicked = {},
             onTranslateButtonClicked = {},
             onNotNowButtonClicked = {},
+            onToSelected = {},
+            onFromSelected = {},
         )
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogFragment.kt
index 442bd8112..24bd845e3 100644
--- a/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogFragment.kt
@@ -23,9 +23,16 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import mozilla.components.browser.state.action.TranslationsAction
+import mozilla.components.browser.state.selector.findTab
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.concept.engine.translate.initialFromLanguage
+import mozilla.components.concept.engine.translate.initialToLanguage
+import mozilla.components.lib.state.ext.observeAsComposableState
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
+import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.settings.SupportUtils
 import org.mozilla.fenix.theme.FirefoxTheme
@@ -44,6 +51,7 @@ class TranslationsDialogFragment : BottomSheetDialogFragment() {
 
     private var behavior: BottomSheetBehavior<View>? = null
     private val args by navArgs<TranslationsDialogFragmentArgs>()
+    private val browserStore: BrowserStore by lazy { requireComponents.core.store }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
         super.onCreateDialog(savedInstanceState).apply {
@@ -61,10 +69,36 @@ class TranslationsDialogFragment : BottomSheetDialogFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?,
     ): View = ComposeView(requireContext()).apply {
+        // Signalling user intention to translate
+        browserStore.dispatch(TranslationsAction.TranslateExpectedAction(args.sessionId))
+
         setContent {
+            val translationsState = browserStore.observeAsComposableState {
+                    state ->
+                state.findTab(args.sessionId)
+                    ?.translationsState
+            }.value
+
+            var fromSelected by remember {
+                mutableStateOf(
+                    translationsState?.translationEngineState
+                        ?.initialFromLanguage(translationsState.supportedLanguages?.fromLanguages),
+                )
+            }
+
+            var toSelected by remember {
+                mutableStateOf(
+                    translationsState?.translationEngineState
+                        ?.initialToLanguage(translationsState.supportedLanguages?.toLanguages),
+                )
+            }
+
             FirefoxTheme {
                 var translationsVisibility by remember {
-                    mutableStateOf(args.translationsDialogAccessPoint == TranslationsDialogAccessPoint.Translations)
+                    mutableStateOf(
+                        args.translationsDialogAccessPoint ==
+                            TranslationsDialogAccessPoint.Translations,
+                    )
                 }
 
                 var translationsHeightDp by remember {
@@ -105,6 +139,10 @@ class TranslationsDialogFragment : BottomSheetDialogFragment() {
                                 TranslationsDialog(
                                     learnMoreUrl = learnMoreUrl,
                                     showFirstTimeTranslation = context.settings().showFirstTimeTranslation,
+                                    translateFromLanguages = translationsState?.supportedLanguages?.fromLanguages,
+                                    translateToLanguages = translationsState?.supportedLanguages?.toLanguages,
+                                    initialFrom = fromSelected,
+                                    initialTo = toSelected,
                                     onSettingClicked = {
                                         translationsVisibility = false
                                     },
@@ -115,8 +153,25 @@ class TranslationsDialogFragment : BottomSheetDialogFragment() {
                                             from = BrowserDirection.FromTranslationsDialogFragment,
                                         )
                                     },
-                                    onTranslateButtonClick = {},
+                                    onTranslateButtonClick = {
+                                        fromSelected?.code?.let { fromLanguage ->
+                                            toSelected?.code?.let { toLanguage ->
+                                                TranslationsAction.TranslateAction(
+                                                    tabId = args.sessionId,
+                                                    fromLanguage = fromLanguage,
+                                                    toLanguage = toLanguage,
+                                                    options = null,
+                                                )
+                                            }
+                                        }?.let {
+                                            browserStore.dispatch(
+                                                it,
+                                            )
+                                        }
+                                    },
                                     onNotNowButtonClick = { dismiss() },
+                                    onFromSelected = { fromSelected = it },
+                                    onToSelected = { toSelected = it },
                                 )
                             }
                         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 06bea5296..b217ab037 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2337,6 +2337,8 @@
     <string name="translations_bottom_sheet_translating_in_progress">Translating</string>
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Translating in Progress</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Choose a language</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">There was a problem translating. Please try again.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->

From 4b0f4624145bb47a09d2f69723d01edf31943cd6 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Fri, 26 Jan 2024 00:03:14 +0000
Subject: [PATCH 036/222] Import translations from android-l10n

---
 app/src/main/res/values-cy/strings.xml     |  92 ++++---------
 app/src/main/res/values-es-rAR/strings.xml |  51 ++-----
 app/src/main/res/values-nn-rNO/strings.xml | 151 +++++++++++++++------
 app/src/main/res/values-tr/strings.xml     |  61 +++------
 app/src/main/res/values-uk/strings.xml     | 103 +++++---------
 5 files changed, 200 insertions(+), 258 deletions(-)

diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index b2bcf32c0..9bac5c4fc 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -260,8 +260,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Sganio</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Peiriant chwilio</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Gosodiadau peiriannau chwilio</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -315,14 +313,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Mae hysbysiadau yn eich helpu i wneud mwy gyda %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Mae hysbysiadau yn eich helpu i wneud mwy gyda %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Cydweddu eich tabiau rhwng dyfeisiau, rheoli llwythi, cael awgrymiadau ar wneud y gorau o ddiogelwch preifatrwydd %s, a mwy.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Cydweddu eich tabiau rhwng dyfeisiau, rheoli llwythi, cael awgrymiadau ar wneud y gorau o ddiogelwch preifatrwydd %s, a mwy.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Parhau</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Parhau</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Nid nawr</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Nid nawr</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -440,21 +438,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modd HTTPS-yn-Unig</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Cyfyngu Baneri Cwcis</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Rhwystrydd Baneri Cwcis</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Rhwystro Baner Cwci wrth bori’n breifat</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Lleihau baneri cwcis</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Diffodd</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Ymlaen</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">Mae %1$s yn ceisio gwrthod ceisiadau cwci ar faneri cwci yn awtomatig.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Diffodd ar gyfer y wefan hon</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -473,36 +461,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Nid yw’r wefan yn cael ei chefnogi ar hyn o bryd</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Troi Llai o Faneri Cwcis ymlaen ar %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Trowch y Rhwystrydd Baner Cwci ymlaen ar gyfer %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Diffodd Llai o Faneri Cwcis ar %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Diffoddwch y Rhwystrydd Baner Cwcis ar gyfer %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">Nid yw %1$s yn gallu gwrthod ceisiadau cwcis ar y wefan hon yn awtomatig. Gallwch anfon cais i gefnogi’r wefan hon yn y dyfodol.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Bydd %1$s yn clirio cwcis y wefan hon ac yn adnewyddu’r dudalen. Gall clirio pob cwci eich allgofnodi neu wagio eich certiau siopa.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Diffoddwch a bydd %1$s yn clirio cwcis ac yn ail-lwytho’r wefan hon. Gall hyn eich allgofnodi neu wagio cartiau siopa.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">Mae %1$s yn ceisio gwrthod yn awtomatig pob cais cwci ar wefannau sy’n cael eu cefnogi.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Trowch ymlaen a bydd %1$s yn ceisio gwrthod pob baner cwci ar y wefan hon yn awtomatig.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Caniatáu i %1$s wrthod baneri cwci?</string>
-
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">Gall %1$s wrthod llawer o geisiadau baner cwci yn awtomatig.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Nid Nawr</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Fe welwch lai o geisiadau cwcis</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Caniatáu</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">Mae %1$s newydd wrthod cwcis i chi</string>
@@ -1288,8 +1256,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Cau</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Methu argraffu</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Methu argraffu’r dudalen hon</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Argraffu</string>
@@ -1695,7 +1661,7 @@
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Cadw mewngofnodion a chyfrineiriau</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Arbed cyfrineiriau</string>
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Cadw cyfrineiriau</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Gofyn i gadw</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1718,11 +1684,11 @@
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Cydweddu mewngofnodion</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Cysoni cyfrineiriau</string>
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Cydweddu cyfrineiriau</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Cydweddu mewngofnodion ar draws dyfeisiau</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Cysoni cyfrineiriau ar draws dyfeisiau</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Cydweddu cyfrineiriau ar draws dyfeisiau</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Mewngofnodion wedi’u cadw</string>
     <!-- Preference to access list of saved passwords -->
@@ -1730,22 +1696,22 @@
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Bydd y mewngofnodi rydych yn eu cadw neu’n cydweddu i %s i’w gweld yma.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Bydd y cyfrineiriau rydych yn eu cadw neu eu cysoni i %s yn cael eu rhestru yma. Mae\'r holl gyfrineiriau rydych chi\'n eu cadw wedi\'u hamgryptio.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Bydd y cyfrineiriau rydych yn eu cadw neu eu cydweddu i %s yn cael eu rhestru yma. Mae\'r holl gyfrineiriau rydych chi\'n eu cadw wedi\'u hamgryptio.
 </string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Dysgu rhagor am Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Dysgwch fwy am gysoni</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Dysgwch fwy am gydweddu</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Eithriadau</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Bydd mewngofnodion a chyfrineiriau sydd heb eu cadw i’w gweld yma.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">Ni fydd %s yn cadw cyfrineiriau ar gyfer gwefannau a restrir yma.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">Fydd %s ddim yn cadw cyfrineiriau ar gyfer gwefannau sy\'n cael eu rhestru yma.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Ni fydd mewngofnodion a chyfrineiriau’n cael eu cadw ar gyfer y gwefannau hyn.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">Ni fydd %s yn cadw cyfrineiriau ar gyfer y gwefannau hyn.</string>
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">Fydd %s ddim yn cadw cyfrineiriau ar gyfer y gwefannau hyn.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Dileu pob eithriad</string>
     <!-- Hint for search box in logins list -->
@@ -1782,15 +1748,15 @@
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Datgloi i weld eich mewngofnodi wedi’u cadw</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Datgloi i weld eich cyfrineiriau arbed</string>
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Datgloi i weld eich cyfrineiriau wedi\'u cadw</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Diogelu mewngofnodion a chyfrineiriau</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Diogelwch eich cyfrineiriau arbed</string>
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Diogelwch eich cyfrineiriau wedi\'u cadw</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Creu patrwm cloi dyfais, PIN, neu gyfrinair i ddiogelu eich mewngofnodion a’ch cyfrineiriau sydd wedi’u cadw rhag i rhywun arall sydd â mynediad i’ch dyfais.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Sefydlwch batrwm clo dyfais, PIN, neu gyfrinair i amddiffyn eich cyfrineiriau sydd wedi\'u cadw rhag cael mynediad iddynt os oes gan rywun arall eich dyfais.</string>
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Gosodwch batrwm clo dyfais, PIN, neu gyfrinair i ddiogelu eich cyfrineiriau sydd wedi\'u cadw rhag i rywun arall sydd â\'ch dyfais gael mynediad iddyn nhw.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Yn hwyrach</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1810,7 +1776,7 @@
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Trefnu dewislen mewngofnodi</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Dewislen cyfrineiriau didoli</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Didoli dewislen cyfrineiriau</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1894,7 +1860,7 @@
     <string name="credit_cards_number_validation_error_message">Rhowch rif cerdyn credyd dilys</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Rhowch rif cerdyn dilys</string>
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Rhoi rif cerdyn dilys</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Llanwch y maes yma.</string>
     <!-- Error message for card name on card validation -->
@@ -1904,11 +1870,11 @@
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Diogelwch eich cerdyn credyd</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Sicrhewch eich dulliau talu sydd wedi\'u cadw</string>
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Diogelu eich dulliau talu sydd wedi\'u cadw</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Gosodwch batrwm cloi dyfais, PIN, neu gyfrinair i ddiogelu eich mewngofnodion a’ch cyfrineiriau sydd wedi’u cadw rhag i rhywun arall sydd â mynediad i’ch dyfais.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Sefydlwch batrwm clo dyfais, PIN, neu gyfrinair i amddiffyn eich cardiau sydd wedi\'u cadw rhag cael mynediad iddynt os oes gan rywun arall eich dyfais.</string>
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Gosodwch batrwm clo dyfais, PIN neu gyfrinair i ddiogelu eich cyfrineiriau sydd wedi\'u cadw rhag i rywun arall sydd â\'ch dyfais gael mynediad iddyn nhw.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Gosod nawr</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2067,19 +2033,19 @@
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Dewisiadau mewngofnodi</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opsiynau cyfrinair</string>
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Dewisiadau cyfrineiriau</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Maes testun golygadwy cyfeiriad gwe’r mewngofnodi.</string>
     <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Y maes testun y gellir ei olygu ar gyfer cyfeiriad gwefan y cyfrinair.</string>
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Maes testun golygadwy ar gyfer cyfeiriad gwefan y cyfrinair.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Maes testun golygadwy enw defnyddiwr y mewngofnodi.</string>
     <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Y maes testun y gellir ei olygu ar gyfer enw defnyddiwr y cyfrinair.</string>
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Maes testun golygadwy ar gyfer enw defnyddiwr y cyfrinair.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Maes testun golygadwy cyfrinair y mewngofnodi.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Y maes testun y gellir ei olygu ar gyfer y cyfrinair.</string>
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Maes testun golygadwy y cyfrinair.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Cadw newidiadau i’r mewngofnodi.</string>
     <!--  The button description to save changes to an edited password. -->
@@ -2095,15 +2061,15 @@
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Mae angen cyfrinair</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Rhowch gyfrinair</string>
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Rhoi cyfrinair</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Mae angen enw defnyddiwr</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Rhowch enw defnyddiwr</string>
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Rhoi enw defnyddiwr</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Mae angen enw gwesteiwr</string>
     <!--  The error message in add login view when hostname field is blank. -->
-    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Rhowch gyfeiriad gwe</string>
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Rhoi cyfeiriad gwe</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Chwilio llais</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2273,8 +2239,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[Daw’r <b>Uchafbwyntiau</b> o adolygiadau %s o fewn yr 80 diwrnod diwethaf y credwn eu bod yn ddibynadwy.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Dysgwch ragor am %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">sut mae %s gan Mozilla yn pennu ansawdd adolygiadau</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">sut mae %s yn pennu ansawdd adolygu</string>
     <!-- Text for title of settings section. -->
@@ -2480,9 +2444,9 @@
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Peidio â chyfieithu\'r wefan hon</string>
     <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
-    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Yn diystyru pob gosodiad arall</string>
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Gwrthwneud pob gosodiad arall</string>
     <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
-    <string name="translation_option_bottom_sheet_switch_description">Yn diystyru cynigion i gyfieithu</string>
+    <string name="translation_option_bottom_sheet_switch_description">Gwrthwneud cynigion i gyfieithu</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Gosodiadau cyfieithu</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index f165c25c7..42eec1144 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -264,8 +264,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Escanear</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Buscador</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Configuración del buscador</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -323,15 +321,15 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Las notificaciones te ayudan a hacer más con %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Las notificaciones te ayudan a hacer más con %s</string>
 
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sincronizá tus pestañas entre dispositivos, administrá descargas, obtené consejos sobre cómo aprovechar al máximo la protección de privacidad de %s y más.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sincronizá tus pestañas entre dispositivos, administrá descargas, obtené consejos sobre cómo aprovechar al máximo la protección de privacidad de %s y más.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Continuar</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Continuar</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">No ahora</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">No ahora</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -448,21 +446,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modo solo HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducción de mensajes de cookies</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Bloqueador de mensajes de cookies</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Bloqueador de mensajes de cookies en navegación privada</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducir mensajes de cookies</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Desactivado</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Activado</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s intenta rechazar automáticamente las solicitudes de cookies en los mensajes de cookies.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Desactivada para este sitio</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -480,35 +468,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Sitio actualmente no soportado</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Habilitar reducción de mensajes de cookies para %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">¿Activar el bloqueo de mensajes de cookies para %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Deshabilitar reducción de mensajes de cookies para %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">¿Desactivar el bloqueo de mensajes de cookies para %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s no puede rechazar automáticamente las solicitudes de cookies en este sitio. Podés enviar una solicitud para soportar a este sitio en el futuro.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s borrará las cookies de este sitio y actualizará la página. Borrar todas las cookies puede cerrar la sesión o vaciar los carritos de compras.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Al desactivar, %1$s borrará las cookies y recargará el sitio. Esto puede cerrar las sesiones o vaciar los carritos de compras.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s puede intentar rechazar automáticamente todos los pedidos de cookies en sitios soportados.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Al activarlo, %1$s intentará rechazar automáticamente los mensajes de cookies en este sitio.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Permitir que %1$s rechace los mensajes de cookies?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s puede rechazar automáticamente muchos pedidos de mensajes de cookies.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">No ahora</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Vas a ver menos pedidos de cookies</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Permitir</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s acaba de rechazar las cookies</string>
@@ -1308,8 +1277,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Descartar</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">No se puede imprimir</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">No se puede imprimir esta página</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Imprimir</string>
@@ -1928,11 +1895,11 @@
     <string name="credit_cards_warning_dialog_title">Asegurá tus tarjetas de crédito</string>
 
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Asegura tus métodos de pago guardados</string>
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Asegurá tus métodos de pago guardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configurá un patrón de bloqueo del dispositivo, PIN o contraseña para proteger el acceso a tus tarjetas de crédito guardadas si alguien más tiene tu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configura un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus tarjetas guardadas de otras personas.</string>
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configurá un patrón de bloqueo del dispositivo, PIN o contraseña para proteger el acceso a tus tarjetas guardadas si alguien más tiene tu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2109,7 +2076,7 @@
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Guardar cambios para el inicio de sesión.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Guardar cambios</string>
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Guardar cambios.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Editar</string>
     <!--  The page title for editing a saved password. -->
@@ -2300,8 +2267,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[Los <b>destacados</b> provienen de revisiones de %s de los últimos 80 días que creemos que son confiables.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Conocer más sobre %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">cómo %s de Mozilla determina la calidad de las reseñas</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">cómo %s determina la calidad de la revisión</string>
     <!-- Text for title of settings section. -->
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index bd93a9b28..c4b58e1d2 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -266,8 +266,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skann</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Søkjemotor</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Innstillingar for søkjemotor</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -322,21 +320,21 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Varsel hjelper deg å gjere meir med %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Varsel hjelper deg å gjere meir med %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synkroniser fanene dine mellom einingar, handsam nedlastingar, få tips om korleis du får mest muleg ut av personvernet til %s, og meir.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synkroniser fanene dine mellom einingar, handsam nedlastingar, få tips om korleis du får mest muleg ut av personvernet til %s, og meir.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Hald fram</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Hald fram</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ikkje no</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ikkje no</string>
 
-    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Vi vernar deg gjerne</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">peronvernerklæring</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">peronvernerklæring</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Bruk som standard nettleser</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -399,6 +397,8 @@
     <string name="preferences_search_engines">Søkjemotorar</string>
     <!-- Preference for settings related to Search engines suggestions-->
     <string name="preferences_search_engines_suggestions">Forslag frå søkjemotorar</string>
+    <!-- Preference Category for settings to Firefox Suggest -->
+    <string name="preference_search_address_bar_fx_suggest">Adresselinje - Firefox forslag</string>
     <!-- Preference link to Learn more about Firefox Suggest -->
     <string name="preference_search_learn_about_fx_suggest">Les meir om Firefox forslag</string>
     <!-- Preference link to rating Fenix on the Play Store -->
@@ -427,20 +427,10 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Berre HTTPS-modus</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Redusering av infokapselbanner</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blokkering av infokapselbanner</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blokkering av infokapselbanner i privat nettlesing</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduser infokapselbanner</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Av</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">På</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s prøver automatisk å avvise infokapselførespurnadar på infokapselbanner.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Av for denne nettstaden</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -459,34 +449,15 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Nettstaden er for augneblinken ikkje støtta</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Vill du aktivere reduksjon av infokapselbanner for %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Vil du slå på blokkering av infokapselbanner for %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Vil du deaktivere reduksjon av infokapselbanner for %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Vil du slå av blokkering av infokapselbanner for %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s kan ikkje automatisk avvise førespurnadar om infokapslar på denne nettstaden. Du kan sende ein førespurnad om å støtte denne nettstaden i framtida.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s vill slette infokapslar og oppdatere sida. Sletting av alle infokapslar kan føre til at du blir logga ut eller at handlekorger vert tømde.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Slå av, og %1$s slettar infokapslar og lastar inn denne nettstaden på nytt. Dette kan logge deg ut eller tøme handlekorger.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s prøver å automatisk avvise alle infokapselførespurnadar på støtta nettstadar.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Slå på, og %1$s vil prøve å automatisk nekte infokapselbanner på denne nettstaden.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Tilate %1$s å avvise infokapselbanner?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s kan automatisk avvise fleire førespurnadar om infokapselbanner.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ikkje no</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Du vil sjå færre førespurnadar om infokapslar</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Tillat</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s nekta nettopp infokapslar for deg</string>
@@ -596,6 +567,8 @@
     <!-- Preference for add_ons -->
     <string name="preferences_addons">Tillegg</string>
 
+    <!-- Preference for installing a local add-on -->
+    <string name="preferences_install_local_addon">Installer utviding frå fil</string>
     <!-- Preference for notifications -->
     <string name="preferences_notifications">Varsel</string>
 
@@ -670,6 +643,15 @@
     <!-- Wallpaper onboarding dialog learn more button text. The button navigates to the wallpaper settings screen. -->
     <string name="wallpapers_onboarding_dialog_explore_more_button_text">Utforsk fleire bakgrunnsbilde</string>
 
+    <!-- Add-ons general availability nimbus message-->
+    <!-- Title of the Nimbus message for add-ons general availability-->
+    <string name="addon_ga_message_title" tools:ignore="UnusedResources">Nye utvidingar tilgjengelege no</string>
+
+    <!-- Body of the Nimbus message for add-ons general availability. 'Firefox' intentionally hardcoded here-->
+    <string name="addon_ga_message_body" tools:ignore="UnusedResources">Sjekk ut 100+ nye utvidingar som lèt deg gjere Firefox til din eigen.</string>
+    <!-- Button text of the Nimbus message for add-ons general availability. -->
+    <string name="addon_ga_message_button" tools:ignore="UnusedResources">Utforsk utvidingar</string>
+
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
     <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Tillegg er mellombels deaktivert</string>
@@ -696,6 +678,8 @@
     <string name="preferences_sync_bookmarks">Bokmerke</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Innloggingar</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Passord</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Opne faner</string>
     <!-- Preference for signing out -->
@@ -722,6 +706,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Betalingskort</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Betalingsmåtar</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresser</string>
 
@@ -1266,8 +1252,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Ignorer</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Klarte ikkje å skrive ut</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Klarte ikkje å skrive ut denne sida</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Skriv ut</string>
@@ -1314,6 +1298,9 @@
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">Lat att private faner</string>
 
+    <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
+    <string name="notification_erase_title_android_14">Late att private faner?</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">Marknadsføring</string>
 
@@ -1551,6 +1538,8 @@
     <string name="preference_enhanced_tracking_protection_custom_cookies_4">Alle infokapslar (vil føre til feil på nettstadar)</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
     <string name="preference_enhanced_tracking_protection_custom_cookies_5">Isoler infokapslar på tvers av nettstadar</string>
+    <!-- Preference for Global Privacy Control for the custom privacy settings for Global Privacy Control. '&amp;' is replaced with the ampersand symbol: &-->
+    <string name="preference_enhanced_tracking_protection_custom_global_privacy_control">Fortel nettstadar at dei ikkje skal dele eller selje data</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content">Sporingsinnhald</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
@@ -1667,8 +1656,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Innloggingar og passord</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Passord</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Lagre innloggingar og passord</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Lagre passord</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Spør om å lagre</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1687,16 +1680,27 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Legg til innlogging</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Legg til passord</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Synkroniser innloggingar</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synkroniser passord</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Synkroniser innloggingar på tvers av einingar</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synkroniser passord på tvers av einingar</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Lagra innloggingar</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Lagra passord</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Innloggingane du lagrar eller synkroniserer til %s vil visast her.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Les meir om Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Les meir om synkronisering</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Unntak</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
@@ -1707,6 +1711,8 @@
     <string name="preferences_passwords_exceptions_remove_all">Slett alle unntak</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Søk innloggingar</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Søk etter passord</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Nettstad</string>
     <!-- The header for the username for a login -->
@@ -1765,6 +1771,8 @@
     <string name="preferences_addresses">Adresser</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Betalingskort</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Betalingsmåtar</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Lagre og fyll ut kort automatisk</string>
     <!-- Preference summary for saving and autofilling credit card data -->
@@ -1776,8 +1784,12 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Legg til betalingskort</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Legg til kort</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Handsam lagra kort</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Handsam kort</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Legg til adresse</string>
     <!-- Preference option for managing saved addresses -->
@@ -1808,6 +1820,8 @@
     <string name="credit_cards_delete_card_button">Slett kort</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Er du sikker på at du vil slette dette bankkortet?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Slette kort?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Slett</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1823,8 +1837,12 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Skriv inn eit gyldig betalingskortnummer</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Skriv inn eit gyldig kortnummer</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Fyll ut dette feltet</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Legg til eit namn</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Lås opp for å sjå lagra betalingskort</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
@@ -1877,6 +1895,8 @@
     <string name="addressess_delete_address_button">Slett adresse</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Er du sikker på at du vil slette denne adressa?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Slette denne adressa?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Slett</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1993,16 +2013,28 @@
     <string name="saved_login_password_description">Det redigerbare tekstfeltet for innloggings-passordet.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Lagre endringar for innlogging.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Lagre endringar.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Rediger</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Rediger passord</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Legg til ny innlogging</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Legg til passord</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Passord påkravd</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Skriv inn passord</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Brukarnamn påkravd</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Skriv inn eit brukarnamn</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Vertsnamn påkravd</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Skriv inn ei nettadresse</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Stemmesøk</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2152,6 +2184,8 @@
     <string name="review_quality_check_adjusted_rating_title">Juster vurdering</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Upålitelege vurderingar er fjerna</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description_2">Basert på pålitelege vurderingar</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Høgdepunkt frå nylege vurderingar</string>
     <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
@@ -2172,8 +2206,8 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Høgdepunkt</b> er frå %s vurderingar dei siste 80 dagane som vi meiner er pålitelege.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Les meir om %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">korleis %s frå Mozilla bestemmer kvaliteten på ei vurdering</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_info_learn_more_link_2">korleis %s avgjer vurderingskvalitet</string>
     <!-- Text for title of settings section. -->
     <string name="review_quality_check_settings_title">Innstillingar</string>
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
@@ -2210,6 +2244,8 @@
     <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Kontrollerer kvaliteten på vurderinga</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
     <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Kontrollerer kvaliteten på vurderinga</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
+    <string name="review_quality_check_analysis_in_progress_warning_title_2">Kontrollerer kvaliteten på vurderinga (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
     <string name="review_quality_check_analysis_in_progress_warning_body">Dette vil ta omlag 60 sekund.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
@@ -2246,12 +2282,16 @@
     <string name="review_quality_check_contextual_onboarding_title">Prøv den pålitelege guiden vår for produktvurderingar</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
     <string name="review_quality_check_contextual_onboarding_description">Sjå kor påliteleg produktvurderingar er på %1$s før du kjøper. Vurderingskontrolløren, ein eksperimentell funksjon frå %2$s, er direkte inbyggd i nettlesaren. Han fungerer på %3$s og på %4$s.</string>
+    <!-- Description for review quality check contextual onboarding card. The first parameters is for retailer name (e.g. Amazon). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description_one_vendor">Sjå kor pålitelege produktvurderinger er på %1$s før du handlar. Vurderingskontrolløren, ein eksperimentell funksjon fra %2$s, er innebygd i nettlesaren.</string>
     <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_contextual_onboarding_learn_more">Med krafta i %1$s frå Mozilla hjelper vi deg med å unngå einsidige og ikkje-truverdige vurderingar. AI-modellen vår vert alltid forbetra for å beskytte deg når du handlar. %2$s</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Les meir</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_contextual_onboarding_caption">Ved å velje «Ja, prøv det» seier du deg samd i %1$s av Mozillas %2$s og %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
+    <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Ved å velje «Ja, prøv det» godtek du følgjande frå %1$s:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy">personvernpraksis</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
@@ -2295,6 +2335,9 @@
     <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
     <string name="review_quality_check_highlights_type_competitiveness">Konkurranseevne</string>
 
+    <!-- Text that is surrounded by quotes. The parameter is the actual text that is in quotes. An example of that text could be: Excellent craftsmanship, and that is displayed as “Excellent craftsmanship”. The text comes from a buyer's review that the feature is highlighting"   -->
+    <string name="surrounded_with_quotes">“%s”</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">slå saman</string>
@@ -2378,11 +2421,29 @@
     <!-- Title of the automatic translation preference screen that will appear on the toolbar.-->
     <string name="automatic_translation_toolbar_title_preference">Automatisk omsetjing</string>
 
+    <!-- Screen header presenting the automatic translation preference feature. It will appear under the toolbar. -->
+    <string name="automatic_translation_header_preference">Vel eit språk for å handsame innstillingar for «omset alltid» og «omset aldri».</string>
+
+    <!-- Automatic translation options preference screen -->
+    <!-- Preference option for offering to translate. Radio button title text.-->
+    <string name="automatic_translation_option_offer_to_translate_title_preference">Tilby å omsetje (standard)</string>
+    <!-- Preference option for offering to translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_offer_to_translate_summary_preference">%1$s vil tilby å omsetje nettstadar på dette språket.</string>
     <!-- Preference option for always translate. Radio button title text. -->
     <string name="automatic_translation_option_always_translate_title_preference">Omset alltid</string>
+    <!-- Preference option for always translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_always_translate_summary_preference">%1$s vil omsetje dette språket automatisk når sida vert lasta inn.</string>
     <!-- Preference option for never translate. Radio button title text.-->
     <string name="automatic_translation_option_never_translate_title_preference">Omset aldri</string>
 
+    <!-- Preference option for never translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_never_translate_summary_preference">%1$s vil aldri tilby å omsetje nettstadar på dette språket.</string>
+
+    <!-- Never translate site preference screen -->
+    <!-- Title of the never translate site preference screen that will appear on the toolbar.-->
+    <string name="never_translate_site_toolbar_title_preference">Omset aldri desse nettstadane</string>
+    <!-- Screen header presenting the never translate site preference feature. It will appear under the toolbar. -->
+    <string name="never_translate_site_header_preference">For å leggje til ein ny nettstad: Besøk han, og vel «Omset aldri denne nettstaden» frå omsetjingsmenyen.</string>
     <!-- Content description (not visible, for screen readers etc.): For a never-translated site list item that is selected.
              The first parameter is web site url (for example:"wikipedia.com") -->
     <string name="never_translate_site_item_list_content_description_preference">Fjern %1$s</string>
@@ -2397,6 +2458,8 @@
     <!-- Download languages preference screen -->
     <!-- Title of the download languages preference screen toolbar.-->
     <string name="download_languages_toolbar_title_preference">Last ned språk</string>
+    <!-- Screen header presenting the download language preference feature. It will appear under the toolbar.The first parameter is "Learn More," a clickable text with a link. Talkback will append this to say "Double tap to open link to learn more". -->
+    <string name="download_languages_header_preference">Last ned komplette språk for raskare omsetjingar, og for å omsetje fråkopla. %1$s</string>
     <!-- Clickable text from the screen header that links to a website. -->
     <string name="download_languages_header_learn_more_preference">Les meir</string>
     <!-- The subhead of the download language preference screen will appear above the pivot language. -->
@@ -2437,6 +2500,8 @@
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
     <string name="download_language_file_dialog_negative_button_text">Avbryt</string>
 
+    <!-- Content description (not visible, for screen readers etc.): Navigate back within the debug drawer. -->
+    <string name="debug_drawer_back_button_content_description">Naviger tilbake</string>
     <!-- The title of the Tab Tools feature in the Debug Drawer. -->
     <string name="debug_drawer_tab_tools_title">Faneverktøy</string>
     <!-- The title of the tab count section in Tab Tools. -->
@@ -2449,4 +2514,6 @@
     <string name="debug_drawer_tab_tools_tab_count_private">Privat</string>
     <!-- The total tab count category in the tab count section in Tab Tools. -->
     <string name="debug_drawer_tab_tools_tab_count_total">Totalt</string>
-    </resources>
+    <!-- The button text to add tabs to the private tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_private">Legg til i private faner</string>
+</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 832b8d2c6..0d816d01a 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -262,8 +262,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Tara</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Arama motoru</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Arama motoru ayarları</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -319,14 +317,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Bildirimler sayesinde %s ile daha fazlasını yapın</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Bildirimler sayesinde %s ile daha fazlasını yapın</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sekmelerinizi cihazlar arasında senkronize edin, indirmeleri yönetin, %s tarayıcınızın gizlilik korumasına dair ipuçları alın ve daha fazlasını yapın.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sekmelerinizi cihazlar arasında senkronize edin, indirmeleri yönetin, %s tarayıcınızın gizlilik korumasına dair ipuçları alın ve daha fazlasını yapın.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Devam et</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Devam et</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Şimdi değil</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Şimdi değil</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -444,21 +442,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Yalnızca HTTPS modu</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Çerez bildirimlerini azalt</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Çerez bildirimi engelleyici</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Gizli gezintide çerez bildirimi engelleyici</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Çerez bildirimlerini azalt</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Kapalı</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Açık</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s, çerez bildirimlerindeki çerez isteklerini otomatik olarak reddetmeye çalışır.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Bu sitede kapalı</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -476,35 +464,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Bu site şu anda desteklenmiyor</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s için çerez bildirimlerini azaltma açılsın mı?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">%1$s için çerez bildirimlerini engelleme açılsın mı?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s için çerez bildirimlerini azaltma kapatılsın mı?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">%1$s için çerez bildirimlerini engelleme kapatılsın mı?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s bu sitedeki çerez isteklerini otomatik olarak reddedemiyor. İleride bu siteyi desteklememiz için istekte bulunabilirsiniz.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s bu sitenin çerezlerini temizleyip sayfayı tazeleyecek. Tüm çerezlerin temizlenmesi oturumunuzu kapatabilir veya alışveriş sepetlerinizi boşaltabilir.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Bunu kapatırsanız %1$s çerezleri temizleyip bu siteyi yeniden yükleyecektir. Bu durumda oturumunuz kapanabilir veya alışveriş sepetleriniz boşalabilir.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s, desteklenen sitelerdeki tüm çerez isteklerini otomatik olarak reddetmeye çalışır.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Açtığınızda %1$s bu sitedeki tüm çerez bildirimlerini otomatik olarak reddetmeye çalışacaktır.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s çerez bildirimlerini reddedebilsin mi?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s birçok çerez bildirimini otomatik olarak reddedebilir.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Şimdi değil</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Daha az çerez isteği göreceksiniz</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">İzin ver</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s sizin için çerezleri reddetti</string>
@@ -1292,8 +1261,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Kapat</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Yazdırılamadı</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Bu sayfa yazdırılamadı</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Yazdır</string>
@@ -1904,6 +1871,8 @@
     <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Geçerli bir kart numarası girin</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Lütfen bu alanı doldurun</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Adınızı yazın</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Kayıtlı kartlarınızı görmek için kilidi açın</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
@@ -2075,10 +2044,16 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Parola seçenekleri</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Hesabın web adresi için düzenlenebilir metin alanı.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Parolanın web sitesi için düzenlenebilir metin alanı.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Hesabın kullanıcı adı için düzenlenebilir metin alanı.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Parolanın kullanıcı adı için düzenlenebilir metin alanı.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Hesabın parolası için düzenlenebilir metin alanı.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Parola için düzenlenebilir metin alanı.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Değişiklikleri hesaba kaydet.</string>
     <!--  The button description to save changes to an edited password. -->
@@ -2093,10 +2068,16 @@
     <string name="add_login_2" tools:ignore="UnusedResources">Parola ekle</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Parola gerekli</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Parolayı girin</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Kullanıcı adı gereklidir</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Kullanıcı adını girin</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Sunucu gereklidir</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Web adresini girin</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Sesle arama</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2265,8 +2246,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Öne çıkanlar</b> son 80 gün içindeki güvenilir olduğunu düşündüğümüz %s değerlendirmelerinden alınmıştır.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">%s hakkında daha fazla bilgi alın.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">Mozilla %s değerlendirme kalitesini nasıl belirliyor?</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">%s değerlendirme kalitesini nasıl belirliyor?</string>
     <!-- Text for title of settings section. -->
@@ -2475,6 +2454,8 @@
     <string name="translation_option_bottom_sheet_never_translate_site">Bu siteyi asla çevirme</string>
     <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
     <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Diğer tüm ayarları geçersiz kılar</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Çeviri tekliflerini geçersiz kılar</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Çeviri ayarları</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 056b76065..40da4c74c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -72,7 +72,7 @@
         private mode in our new Total Private Browsing mode.
         The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
         The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
-    <string name="felt_privacy_info_card_subtitle_2">%1$s видаляє ваші куки, історію та дані сайтів, коли ви закриваєте всі приватні вкладки. %2$s</string>
+    <string name="felt_privacy_info_card_subtitle_2">%1$s видаляє ваші файли cookie, історію і дані сайтів, коли ви закриваєте всі приватні вкладки. %2$s</string>
     <!-- Clickable portion of the explanation for private browsing that links the user to our
         about privacy page.
         This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
@@ -98,11 +98,11 @@
     <!-- Text for the message displayed in the contextual feature recommendation popup promoting the total cookie protection feature. -->
     <string name="tcp_cfr_message">Наша найпотужніша функція приватності ізолює елементи стеження між сайтами.</string>
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
-    <string name="tcp_cfr_learn_more">Докладніше про повний захист кук</string>
+    <string name="tcp_cfr_learn_more">Докладніше про функцію Total Cookie Protection</string>
 
     <!-- Private browsing erase action "contextual feature recommendation" (CFR) -->
     <!-- Text for the message displayed in the contextual feature recommendation popup promoting the erase private browsing feature. -->
-    <string name="erase_action_cfr_message">Торкніться тут, щоб розпочати новий приватний сеанс. Видалить історію, куки — усе.</string>
+    <string name="erase_action_cfr_message">Торкніться тут, щоб розпочати новий приватний сеанс. Видаліть історію, файли cookie – усе.</string>
 
 
     <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
@@ -262,8 +262,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Сканувати</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Засіб пошуку</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Налаштування пошукових засобів</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -319,14 +317,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Сповіщення допомагають вам ефективніше взаємодіяти з %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Сповіщення допомагають вам ефективніше взаємодіяти з %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Синхронізуйте свої вкладки між пристроями, керуйте завантаженнями, отримуйте поради про захист приватності в %s, а також інші можливості.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Синхронізуйте свої вкладки між пристроями, керуйте завантаженнями, отримуйте поради про захист приватності в %s, а також інші можливості.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Продовжити</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Продовжити</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Не зараз</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Не зараз</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -445,21 +443,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">HTTPS-режим</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Зменшення кількості банерів кук</string>
     <!-- Label for cookie banner section in quick settings panel. -->
-    <string name="cookie_banner_blocker">Блокувальник банерів кук</string>
+    <string name="cookie_banner_blocker">Блокувальник банерів файлів cookie</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction_private_mode">Блокувальник банерів кук у приватному перегляді</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Зменшити кількість банерів кук</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Вимкнено</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Увімкнено</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s намагається автоматично відхиляти запити банерів кук.</string>
+    <string name="preferences_cookie_banner_reduction_private_mode">Блокувальник банерів файлів cookie у приватному перегляді</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Вимкнено для цього сайту</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -477,40 +465,21 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Сайт наразі не підтримується</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Увімкнути зменшення кількості банерів кук для %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Увімкнути блокувальник банерів кук для %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Вимкнути зменшення кількості банерів кук для %1$s?</string>
+    <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Увімкнути блокувальник банерів файлів cookie для %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Вимкнути блокувальник банерів кук для %1$s?</string>
+    <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Вимкнути блокувальник банерів файлів cookie для %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
-    <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s не може автоматично відхиляти запити на розміщення кук на цьому сайті. Ви можете надіслати запит для підтримки цього сайту в майбутньому.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s очистить куки цього сайту та оновить сторінку. Очищення всіх кук може призвести до виходу з облікових записів або спорожнення кошика для покупок.</string>
+    <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">На цьому сайті %1$s не може автоматично відхиляти запити на збереження файлів cookie. Ви можете надіслати запит для підтримки цього сайту в майбутньому.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Вимкніть %1$s, щоб очистити куки і перезавантажити цей сайт. Це може призвести до виходу з вебсайту та очищення збережених покупок у кошику.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s намагається автоматично відхиляти всі запити кук на підтримуваних сайтах.</string>
+    <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Вимкніть %1$s, щоб очистити файли cookie та перезавантажити цей сайт. Це може призвести до виходу з вебсайту та очищення збережених покупок у кошику.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Увімкніть, і %1$s спробує намагатиметься автоматично відхиляти всі банери кук на цьому сайті.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Дозволити %1$s відхиляти банери кук?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s може автоматично відхиляти багато запитів банерів кук.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Не зараз</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Ви бачитимете менше запитів на збереження кук</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Дозволити</string>
+    <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Увімкніть, і %1$s намагатиметься автоматично відхиляти всі банери файлів cookie на цьому сайті.</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
-    <string name="cookie_banner_cfr_title">%1$s щойно відхилив куки для вас</string>
+    <string name="cookie_banner_cfr_title">%1$s щойно відхилив файли cookie</string>
     <!--Message for the cookie banner re-engagement CFR -->
-    <string name="cookie_banner_cfr_message">Менше відволікань і менше кук, які відстежують вас на цьому сайті.</string>
+    <string name="cookie_banner_cfr_message">Менше відволікань і менше файлів cookie, які відстежують вас на цьому сайті.</string>
 
     <!-- Description of the preference to enable "HTTPS-Only" mode. -->
     <string name="preferences_https_only_summary">Намагатися автоматично доступатися до сайтів за допомогою протоколу шифрування HTTPS для поліпшення безпеки.</string>
@@ -1186,7 +1155,7 @@
     <!-- Preference for altering the persistent storage access for all websites -->
     <string name="preference_phone_feature_persistent_storage">Постійне сховище</string>
     <!-- Preference for altering the storage access setting for all websites -->
-    <string name="preference_phone_feature_cross_origin_storage_access">Куки сторонніх сайтів</string>
+    <string name="preference_phone_feature_cross_origin_storage_access">Міжсайтові файли cookie</string>
     <!-- Preference for altering the EME access for all websites -->
     <string name="preference_phone_feature_media_key_system_access">Вміст, контрольований DRM</string>
     <!-- Label that indicates that a permission must be asked always -->
@@ -1296,8 +1265,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Відхилити</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Не вдалося надрукувати</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Неможливо надрукувати цю сторінку</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Друк</string>
@@ -1360,7 +1327,7 @@
     <string name="notification_re_engagement_title">Спробуйте приватний перегляд</string>
     <!-- Text shown in the notification that pops up to re-engage the user.
     %1$s is a placeholder that will be replaced by the app name. -->
-    <string name="notification_re_engagement_text">Переглядайте без збереження кук чи історії у %1$s</string>
+    <string name="notification_re_engagement_text">Переглядайте без збереження файлів cookie чи історії у %1$s</string>
 
     <!-- Title A shown in the notification that pops up to re-engage the user -->
     <string name="notification_re_engagement_A_title">Користуйтеся інтернетом, не залишаючи слідів</string>
@@ -1453,7 +1420,7 @@
         number of history items the user has -->
     <string name="preferences_delete_browsing_data_browsing_data_subtitle">Адрес: %d</string>
     <!-- Title for the cookies and site data items in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_cookies_and_site_data">Куки і дані сайтів</string>
+    <string name="preferences_delete_browsing_data_cookies_and_site_data">Файли cookie та дані сайтів</string>
     <!-- Subtitle for the cookies item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cookies_subtitle">Ви вийдете з більшості сайтів</string>
     <!-- Title for the cached images and files item in Delete browsing data -->
@@ -1476,7 +1443,7 @@
     <!-- Title text of a delete browsing data dialog. -->
     <string name="delete_history_prompt_title">Проміжок часу для видалення</string>
     <!-- Body text of a delete browsing data dialog. -->
-    <string name="delete_history_prompt_body" moz:RemovedIn="130" tools:ignore="UnusedResources">Вилучає історію (включно з історією, синхронізованою з інших пристроїв), куки та інші дані вебперегляду.</string>
+    <string name="delete_history_prompt_body" moz:RemovedIn="130" tools:ignore="UnusedResources">Вилучає історію (включно з історією, синхронізованою з інших пристроїв), файли cookie та інші дані вебперегляду.</string>
     <!-- Body text of a delete browsing data dialog. -->
     <string name="delete_history_prompt_body_2">Вилучає історію (зокрема синхронізовану з інших пристроїв)</string>
     <!-- Radio button in the delete browsing data dialog to delete history items for the last hour. -->
@@ -1572,17 +1539,17 @@
     <string name="preference_enhanced_tracking_protection_custom_info_button">Що блокується власними налаштуваннями захисту від стеження</string>
     <!-- Header for categories that are being blocked by current Enhanced Tracking Protection settings -->
     <!-- Preference for enhanced tracking protection for the custom protection settings for cookies-->
-    <string name="preference_enhanced_tracking_protection_custom_cookies">Куки</string>
+    <string name="preference_enhanced_tracking_protection_custom_cookies">Файли cookie</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
-    <string name="preference_enhanced_tracking_protection_custom_cookies_1">Стеження сторонніх сайтів та соціальних мереж</string>
+    <string name="preference_enhanced_tracking_protection_custom_cookies_1">Елементи стеження між сайтами та соціальні мережі</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
-    <string name="preference_enhanced_tracking_protection_custom_cookies_2">Куки з невідвіданих сайтів</string>
+    <string name="preference_enhanced_tracking_protection_custom_cookies_2">Файли cookie з невідвіданих сайтів</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
-    <string name="preference_enhanced_tracking_protection_custom_cookies_3">Усі сторонні куки (може пошкодити роботу вебсайтів)</string>
+    <string name="preference_enhanced_tracking_protection_custom_cookies_3">Усі сторонні файли cookie (може порушити роботу вебсайтів)</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
-    <string name="preference_enhanced_tracking_protection_custom_cookies_4">Усі куки (буде пошкоджувати роботу вебсайтів)</string>
+    <string name="preference_enhanced_tracking_protection_custom_cookies_4">Усі файли cookie (буде порушувати роботу вебсайтів)</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
-    <string name="preference_enhanced_tracking_protection_custom_cookies_5">Ізолювати куки сторонніх сайтів</string>
+    <string name="preference_enhanced_tracking_protection_custom_cookies_5">Ізолювати міжсайтові файли cookie</string>
     <!-- Preference for Global Privacy Control for the custom privacy settings for Global Privacy Control. '&amp;' is replaced with the ampersand symbol: &-->
     <string name="preference_enhanced_tracking_protection_custom_global_privacy_control">Вказувати вебсайтам не ділитися й не продавати мої дані</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
@@ -1606,13 +1573,13 @@
     <!-- Description of social media trackers that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_social_media_trackers_description">Обмежує можливість соціальних мереж стежити за вашою діяльністю в Інтернеті.</string>
     <!-- Category of trackers (cross-site tracking cookies) that can be blocked by Enhanced Tracking Protection -->
-    <string name="etp_cookies_title">Куки стеження між сайтами</string>
+    <string name="etp_cookies_title">Файли cookie для стеження між сайтами</string>
     <!-- Category of trackers (cross-site tracking cookies) that can be blocked by Enhanced Tracking Protection -->
-    <string name="etp_cookies_title_2">Куки сторонніх сайтів</string>
+    <string name="etp_cookies_title_2">Міжсайтові файли cookie</string>
     <!-- Description of cross-site tracking cookies that can be blocked by Enhanced Tracking Protection -->
-    <string name="etp_cookies_description">Блокує куки, які рекламні мережі та аналітичні компанії використовують для збору ваших даних перегляду на багатьох сайтах.</string>
+    <string name="etp_cookies_description">Блокує файли cookie, які рекламні мережі та аналітичні компанії використовують для збору ваших даних перегляду на багатьох сайтах.</string>
     <!-- Description of cross-site tracking cookies that can be blocked by Enhanced Tracking Protection -->
-    <string name="etp_cookies_description_2">Повний захист кук ізолює куки для відвідуваного сайту, тому елементи стеження, такі як рекламні мережі, не можуть використовувати їх для переслідування вас на різних сайтах.</string>
+    <string name="etp_cookies_description_2">Функція Total Cookie Protection ізолює файли cookie для відвідуваного сайту, тому елементи стеження, як-от рекламні мережі, не можуть використовувати їх для переслідування вас на різних сайтах.</string>
     <!-- Category of trackers (cryptominers) that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_cryptominers_title">Криптомайнери</string>
     <!-- Description of cryptominers that can be blocked by Enhanced Tracking Protection -->
@@ -1644,7 +1611,7 @@
     <!-- Category of trackers (redirect trackers) that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_redirect_trackers_title">Елементи стеження переспрямуванням</string>
     <!-- Description of redirect tracker cookies that can be blocked by Enhanced Tracking Protection -->
-    <string name="etp_redirect_trackers_description">Очищує куки, встановлені переспрямовувачами на відомі вебсайти для стеження.</string>
+    <string name="etp_redirect_trackers_description">Очищує файли cookie, встановлені засобами переспрямування на відомі вебсайти стеження.</string>
 
     <!-- Description of the SmartBlock Enhanced Tracking Protection feature. The * symbol is intentionally hardcoded here,
          as we use it on the UI to indicate which trackers have been partially unblocked.  -->
@@ -2045,9 +2012,9 @@
     <!-- Label that indicates a site is using a insecure connection -->
     <string name="quick_settings_sheet_insecure_connection_2">З’єднання не захищене</string>
     <!-- Label to clear site data -->
-    <string name="clear_site_data">Стерти куки та дані сайтів</string>
+    <string name="clear_site_data">Стерти файли cookie та дані сайтів</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete all data for current site -->
-    <string name="confirm_clear_site_data"><![CDATA[Ви впевнені, що хочете очистити всі куки та дані сайту <b>%s</b>?]]></string>
+    <string name="confirm_clear_site_data"><![CDATA[Ви дійсно хочете очистити всі файли cookie та дані сайту <b>%s</b>?]]></string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for all sites-->
     <string name="confirm_clear_permissions_on_all_sites">Ви впевнені, що хочете очистити всі дозволи на всіх сайтах?</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for a site-->
@@ -2285,8 +2252,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Обрані</b> беруться з відгуків %s за останні 80 днів, які ми вважаємо надійними.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Дізнатися більше про %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">як %s від Mozilla визначає якість відгуку</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">як %s визначає якість відгуку</string>
     <!-- Text for title of settings section. -->

From 6a2cf8060362dc7178fefdef6c0714911ba0f2a1 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 25 Jan 2024 07:56:57 +0200
Subject: [PATCH 037/222] Bug 1876510 - Add more test logs to BrowserRobot

---
 .../mozilla/fenix/ui/robots/BrowserRobot.kt   | 164 ++++++++++++------
 1 file changed, 111 insertions(+), 53 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
index 7a0b7c479..d2f2e0254 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
@@ -15,17 +15,14 @@ import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.longClick
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.PickerActions
 import androidx.test.espresso.matcher.RootMatchers.isDialog
-import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
-import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.By.text
@@ -75,6 +72,7 @@ class BrowserRobot {
     fun verifyCurrentPrivateSession(context: Context) {
         val selectedTab = context.components.core.store.state.selectedTab
         assertTrue("Current session is private", selectedTab?.content?.private ?: false)
+        Log.i(TAG, "verifyCurrentPrivateSession: Verified that current browsing session is private")
     }
 
     fun verifyUrl(url: String) {
@@ -234,11 +232,10 @@ class BrowserRobot {
 
     fun verifyNavURLBarHidden() = assertUIObjectIsGone(navURLBar())
 
-    fun verifySecureConnectionLockIcon() =
-        onView(withId(R.id.mozac_browser_toolbar_security_indicator))
-            .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-
-    fun verifyMenuButton() = threeDotButton().check(matches(isDisplayed()))
+    fun verifyMenuButton() {
+        threeDotButton().check(matches(isDisplayed()))
+        Log.i(TAG, "verifyMenuButton: Verified main menu button is displayed")
+    }
 
     fun verifyNoLinkImageContextMenuItems(containsURL: Uri) {
         mDevice.waitNotNull(Until.findObject(By.textContains(containsURL.toString())))
@@ -256,13 +253,9 @@ class BrowserRobot {
     fun verifyNotificationDotOnMainMenu() =
         assertUIObjectExists(itemWithResId("$packageName:id/notification_dot"))
 
-    fun verifyHomeScreenButton() =
-        homeScreenButton().check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-
-    fun verifySearchBar() = assertUIObjectExists(searchBar())
-
     fun dismissContentContextMenu() {
         mDevice.pressBack()
+        Log.i(TAG, "dismissContentContextMenu: Clicked device back button")
         assertUIObjectExists(itemWithResId("$packageName:id/engineView"))
     }
 
@@ -334,10 +327,14 @@ class BrowserRobot {
     fun swipeNavBarRight(tabUrl: String) {
         // failing to swipe on Firebase sometimes, so it tries again
         try {
+            Log.i(TAG, "swipeNavBarRight: Try block")
             navURLBar().swipeRight(2)
+            Log.i(TAG, "swipeNavBarRight: Performed swipe right action on navigation toolbar")
             assertUIObjectIsGone(itemWithText(tabUrl))
         } catch (e: AssertionError) {
+            Log.i(TAG, "swipeNavBarRight: AssertionError caught, executing fallback methods")
             navURLBar().swipeRight(2)
+            Log.i(TAG, "swipeNavBarRight: Performed swipe right action on navigation toolbar")
             assertUIObjectIsGone(itemWithText(tabUrl))
         }
     }
@@ -345,10 +342,14 @@ class BrowserRobot {
     fun swipeNavBarLeft(tabUrl: String) {
         // failing to swipe on Firebase sometimes, so it tries again
         try {
+            Log.i(TAG, "swipeNavBarLeft: Try block")
             navURLBar().swipeLeft(2)
+            Log.i(TAG, "swipeNavBarLeft: Performed swipe left action on navigation toolbar")
             assertUIObjectIsGone(itemWithText(tabUrl))
         } catch (e: AssertionError) {
+            Log.i(TAG, "swipeNavBarLeft: AssertionError caught, executing fallback methods")
             navURLBar().swipeLeft(2)
+            Log.i(TAG, "swipeNavBarLeft: Performed swipe left action on navigation toolbar")
             assertUIObjectIsGone(itemWithText(tabUrl))
         }
     }
@@ -356,11 +357,14 @@ class BrowserRobot {
     fun clickSuggestedLoginsButton() {
         for (i in 1..RETRY_COUNT) {
             try {
+                Log.i(TAG, "clickSuggestedLoginsButton: Started try #$i")
                 mDevice.waitForObjects(suggestedLogins())
                 suggestedLogins().click()
+                Log.i(TAG, "clickSuggestedLoginsButton: Clicked suggested logins button")
                 mDevice.waitForObjects(suggestedLogins())
                 break
             } catch (e: UiObjectNotFoundException) {
+                Log.i(TAG, "clickSuggestedLoginsButton: UiObjectNotFoundException caught, executing fallback methods")
                 if (i == RETRY_COUNT) {
                     throw e
                 } else {
@@ -370,8 +374,10 @@ class BrowserRobot {
         }
     }
 
-    fun setTextForApartmentTextBox(apartment: String) =
+    fun setTextForApartmentTextBox(apartment: String) {
         itemWithResId("apartment").setText(apartment)
+        Log.i(TAG, "setTextForApartmentTextBox: The text for the apartment text box was set to: $apartment")
+    }
 
     fun clearAddressForm() {
         clearTextFieldItem(itemWithResId("streetAddress"))
@@ -385,11 +391,14 @@ class BrowserRobot {
     fun clickSelectAddressButton() {
         for (i in 1..RETRY_COUNT) {
             try {
+                Log.i(TAG, "clickSelectAddressButton: Started try #$i")
                 assertUIObjectExists(selectAddressButton())
                 selectAddressButton().clickAndWaitForNewWindow(waitingTime)
+                Log.i(TAG, "clickSelectAddressButton: Clicked select address button")
 
                 break
             } catch (e: AssertionError) {
+                Log.i(TAG, "clickSelectAddressButton: AssertionError caught, executing fallback methods")
                 // Retrying to trigger the prompt, in case we hit https://bugzilla.mozilla.org/show_bug.cgi?id=1816869
                 // This should be removed when the bug is fixed.
                 if (i == RETRY_COUNT) {
@@ -404,26 +413,36 @@ class BrowserRobot {
 
     fun verifySelectAddressButtonExists(exists: Boolean) = assertUIObjectExists(selectAddressButton(), exists = exists)
 
-    fun changeCreditCardExpiryDate(expiryDate: String) =
+    fun changeCreditCardExpiryDate(expiryDate: String) {
         itemWithResId("expiryMonthAndYear").setText(expiryDate)
+        Log.i(TAG, "changeCreditCardExpiryDate: Credit card expiry date was set to: $expiryDate")
+    }
 
     fun clickCreditCardNumberTextBox() {
+        Log.i(TAG, "clickCreditCardNumberTextBox: Waiting for credit card number text box")
         mDevice.wait(Until.findObject(By.res("cardNumber")), waitingTime)
         mDevice.findObject(By.res("cardNumber")).click()
+        Log.i(TAG, "clickCreditCardNumberTextBox: Clicked credit card number text box")
         mDevice.waitForWindowUpdate(appName, waitingTimeShort)
     }
 
-    fun clickCreditCardFormSubmitButton() =
+    fun clickCreditCardFormSubmitButton() {
         itemWithResId("submit").clickAndWaitForNewWindow(waitingTime)
+        Log.i(TAG, "clickCreditCardFormSubmitButton: Clicked credit card form submit button")
+    }
 
     fun fillAndSaveCreditCard(cardNumber: String, cardName: String, expiryMonthAndYear: String) {
         itemWithResId("cardNumber").setText(cardNumber)
+        Log.i(TAG, "fillAndSaveCreditCard: Set card number to: $cardNumber")
         mDevice.waitForIdle(waitingTime)
         itemWithResId("nameOnCard").setText(cardName)
+        Log.i(TAG, "fillAndSaveCreditCard: Set card name to: $cardName")
         mDevice.waitForIdle(waitingTime)
         itemWithResId("expiryMonthAndYear").setText(expiryMonthAndYear)
+        Log.i(TAG, "fillAndSaveCreditCard: Set expiry month and year to: $expiryMonthAndYear")
         mDevice.waitForIdle(waitingTime)
         itemWithResId("submit").clickAndWaitForNewWindow(waitingTime)
+        Log.i(TAG, "fillAndSaveCreditCard: Clicked credit card form submit button")
         waitForPageToLoad()
         mDevice.waitForWindowUpdate(packageName, waitingTime)
     }
@@ -449,10 +468,7 @@ class BrowserRobot {
     }
 
     fun verifySuggestedUserName(userName: String) {
-        mDevice.findObject(
-            UiSelector()
-                .resourceId("$packageName:id/mozac_feature_login_multiselect_expand"),
-        ).waitForExists(waitingTime)
+        itemWithResId("$packageName:id/mozac_feature_login_multiselect_expand").waitForExists(waitingTime)
         assertUIObjectExists(itemContainingText(userName))
     }
 
@@ -460,6 +476,7 @@ class BrowserRobot {
         // Sometimes the assertion of the pre-filled logins fails so we are re-trying after refreshing the page
         for (i in 1..RETRY_COUNT) {
             try {
+                Log.i(TAG, "verifyPrefilledLoginCredentials: Started try #$i")
                 mDevice.waitForObjects(itemWithResId("username"))
                 assertItemTextEquals(itemWithResId("username"), expectedText = userName, isEqual = credentialsArePrefilled)
                 mDevice.waitForObjects(itemWithResId("password"))
@@ -467,6 +484,7 @@ class BrowserRobot {
 
                 break
             } catch (e: AssertionError) {
+                Log.i(TAG, "verifyPrefilledLoginCredentials: AssertionError caught, executing fallback methods")
                 if (i == RETRY_COUNT) {
                     throw e
                 } else {
@@ -499,23 +517,6 @@ class BrowserRobot {
         assertUIObjectExists(itemWithResIdAndText("cardNumber", creditCardNumber))
     }
 
-    fun verifyPrefilledPWALoginCredentials(userName: String, shortcutTitle: String) {
-        mDevice.waitForIdle(waitingTime)
-
-        var currentTries = 0
-        while (currentTries++ < 3) {
-            try {
-                assertUIObjectExists(itemWithResId("submit"))
-                itemWithResId("submit").click()
-                assertItemTextEquals(itemWithResId("username"), expectedText = userName)
-                break
-            } catch (e: AssertionError) {
-                addToHomeScreen {
-                }.searchAndOpenHomeScreenShortcut(shortcutTitle) {}
-            }
-        }
-    }
-
     fun verifySaveLoginPromptIsDisplayed() =
         assertUIObjectExists(
             itemWithResId("$packageName:id/feature_prompt_login_fragment"),
@@ -530,14 +531,16 @@ class BrowserRobot {
     fun verifyTrackingProtectionWebContent(state: String) {
         for (i in 1..RETRY_COUNT) {
             try {
+                Log.i(TAG, "verifyTrackingProtectionWebContent: Started try #$i")
                 assertUIObjectExists(itemContainingText(state))
 
                 break
             } catch (e: AssertionError) {
+                Log.i(TAG, "verifyTrackingProtectionWebContent: AssertionError caught, executing fallback methods")
                 if (i == RETRY_COUNT) {
                     throw e
                 } else {
-                    Log.e("TestLog", "On try $i, trackers are not: $state")
+                    Log.e(TAG, "On try $i, trackers are not: $state")
 
                     navigationToolbar {
                     }.openThreeDotMenu {
@@ -551,37 +554,49 @@ class BrowserRobot {
     fun verifyCookiesProtectionHintIsDisplayed(composeTestRule: HomeActivityComposeTestRule, isDisplayed: Boolean) {
         if (isDisplayed) {
             composeTestRule.onNodeWithTag("tcp_cfr.message").assertIsDisplayed()
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified total cookie protection message is displayed")
             composeTestRule.onNodeWithTag("tcp_cfr.action").assertIsDisplayed()
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified total cookie protection learn more link is displayed")
             composeTestRule.onNodeWithTag("cfr.dismiss").assertIsDisplayed()
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified total cookie protection dismiss button is displayed")
         } else {
             composeTestRule.onNodeWithTag("tcp_cfr.message").assertDoesNotExist()
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified total cookie protection message does not exist")
             composeTestRule.onNodeWithTag("tcp_cfr.action").assertDoesNotExist()
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified total cookie protection learn more link does not exist")
             composeTestRule.onNodeWithTag("cfr.dismiss").assertDoesNotExist()
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified total cookie protection dismiss button does not exist")
         }
     }
 
     fun clickTCPCFRLearnMore(composeTestRule: HomeActivityComposeTestRule) {
         composeTestRule.onNodeWithTag("tcp_cfr.action").performClick()
+        Log.i(TAG, "clickTCPCFRLearnMore: Clicked total cookie protection learn more link")
     }
 
     fun dismissTCPCFRPopup(composeTestRule: HomeActivityComposeTestRule) {
         composeTestRule.onNodeWithTag("cfr.dismiss").performClick()
+        Log.i(TAG, "dismissTCPCFRPopup: Clicked total cookie protection dismiss button")
     }
 
     fun verifyShouldShowCFRTCP(shouldShow: Boolean, settings: Settings) {
         if (shouldShow) {
             assertTrue(settings.shouldShowTotalCookieProtectionCFR)
+            Log.i(TAG, "verifyShouldShowCFRTCP: Verified that TCP CFR should be shown")
         } else {
             assertFalse(settings.shouldShowTotalCookieProtectionCFR)
+            Log.i(TAG, "verifyShouldShowCFRTCP: Verified that TCP CFR should not be shown")
         }
     }
 
-    fun selectTime(hour: Int, minute: Int): ViewInteraction =
+    fun selectTime(hour: Int, minute: Int) {
         onView(
             isAssignableFrom(TimePicker::class.java),
         ).inRoot(
             isDialog(),
         ).perform(PickerActions.setTime(hour, minute))
+        Log.i(TAG, "selectTime: Selected time picker hour: $hour and minute: $minute")
+    }
 
     fun verifySelectedDate() {
         val currentDate = LocalDate.now()
@@ -591,11 +606,13 @@ class BrowserRobot {
 
         for (i in 1..RETRY_COUNT) {
             try {
+                Log.i(TAG, "verifySelectedDate: Started try #$i")
                 assertUIObjectExists(itemContainingText("Selected date is: $currentDate"))
 
                 break
             } catch (e: AssertionError) {
-                Log.e("TestLog", "Selected time isn't displayed ${e.localizedMessage}")
+                Log.i(TAG, "verifySelectedDate: AssertionError caught, executing fallback methods")
+                Log.e(TAG, "Selected time isn't displayed ${e.localizedMessage}")
 
                 clickPageObject(itemWithResId("calendar"))
                 clickPageObject(itemWithDescription("$currentDay $currentMonth $currentYear"))
@@ -618,11 +635,13 @@ class BrowserRobot {
     fun verifySelectedTime(hour: Int, minute: Int) {
         for (i in 1..RETRY_COUNT) {
             try {
+                Log.i(TAG, "verifySelectedTime: Started try #$i")
                 assertUIObjectExists(itemContainingText("Selected time is: $hour:$minute"))
 
                 break
             } catch (e: AssertionError) {
-                Log.e("TestLog", "Selected time isn't displayed ${e.localizedMessage}")
+                Log.i(TAG, "verifySelectedTime: AssertionError caught, executing fallback methods")
+                Log.e(TAG, "Selected time isn't displayed ${e.localizedMessage}")
 
                 clickPageObject(itemWithResId("clock"))
                 clickPageObject(itemContainingText("CLEAR"))
@@ -638,11 +657,13 @@ class BrowserRobot {
     fun verifySelectedColor(hexValue: String) {
         for (i in 1..RETRY_COUNT) {
             try {
+                Log.i(TAG, "verifySelectedColor: Started try #$i")
                 assertUIObjectExists(itemContainingText("Selected color is: $hexValue"))
 
                 break
             } catch (e: AssertionError) {
-                Log.e("TestLog", "Selected color isn't displayed ${e.localizedMessage}")
+                Log.i(TAG, "verifySelectedColor: AssertionError caught, executing fallback methods")
+                Log.e(TAG, "Selected color isn't displayed ${e.localizedMessage}")
 
                 clickPageObject(itemWithResId("colorPicker"))
                 clickPageObject(itemWithDescription(hexValue))
@@ -657,6 +678,8 @@ class BrowserRobot {
     fun verifySelectedDropDownOption(optionName: String) {
         for (i in 1..RETRY_COUNT) {
             try {
+                Log.i(TAG, "verifySelectedDropDownOption: Started try #$i")
+                Log.i(TAG, "verifySelectedDropDownOption: Looking for \"Submit drop down option\" form button")
                 mDevice.findObject(
                     UiSelector()
                         .textContains("Submit drop down option")
@@ -667,7 +690,7 @@ class BrowserRobot {
 
                 break
             } catch (e: AssertionError) {
-                Log.e("TestLog", "Selected option isn't displayed ${e.localizedMessage}")
+                Log.e(TAG, "Selected option isn't displayed ${e.localizedMessage}")
 
                 clickPageObject(itemWithResId("dropDown"))
                 clickPageObject(itemContainingText(optionName))
@@ -724,6 +747,7 @@ class BrowserRobot {
     fun verifyPrivateBrowsingOpenLinkInAnotherAppPrompt(url: String, pageObject: UiObject) {
         for (i in 1..RETRY_COUNT) {
             try {
+                Log.i(TAG, "verifyPrivateBrowsingOpenLinkInAnotherAppPrompt: Started try #$i")
                 assertUIObjectExists(
                     itemContainingText(
                         getStringResource(R.string.mozac_feature_applinks_confirm_dialog_title),
@@ -733,6 +757,7 @@ class BrowserRobot {
 
                 break
             } catch (e: AssertionError) {
+                Log.i(TAG, "verifyPrivateBrowsingOpenLinkInAnotherAppPrompt: AssertionError caught, executing fallback methods")
                 if (i == RETRY_COUNT) {
                     throw e
                 } else {
@@ -774,6 +799,7 @@ class BrowserRobot {
     fun verifyOpenLinksInAppsCFRExists(exists: Boolean) {
         for (i in 1..RETRY_COUNT) {
             try {
+                Log.i(TAG, "verifyOpenLinksInAppsCFRExists: Started try #$i")
                 assertUIObjectExists(
                     itemWithResId("$packageName:id/banner_container"),
                     itemWithResIdContainingText(
@@ -791,6 +817,7 @@ class BrowserRobot {
                     exists = exists,
                 )
             } catch (e: AssertionError) {
+                Log.i(TAG, "verifyOpenLinksInAppsCFRExists: AssertionError caught, executing fallback methods")
                 if (i == RETRY_COUNT) {
                     throw e
                 } else {
@@ -817,11 +844,13 @@ class BrowserRobot {
     fun verifyHomeScreenSurveyCloseButton() =
         assertUIObjectExists(itemWithDescription("Close"))
 
-    fun clickOpenLinksInAppsDismissCFRButton() =
+    fun clickOpenLinksInAppsDismissCFRButton() {
         itemWithResIdContainingText(
             "$packageName:id/dismiss",
             getStringResource(R.string.open_in_app_cfr_negative_button_text),
         ).click()
+        Log.i(TAG, "clickOpenLinksInAppsDismissCFRButton: Clicked open links in apps banner \"Dismiss\" button")
+    }
 
     fun clickTakeSurveyButton() {
         val button = mDevice.findObject(
@@ -846,7 +875,10 @@ class BrowserRobot {
         button.click()
     }
 
-    fun longClickToolbar() = onView(withId(R.id.mozac_browser_toolbar_url_view)).perform(longClick())
+    fun longClickToolbar() {
+        onView(withId(R.id.mozac_browser_toolbar_url_view)).perform(longClick())
+        Log.i(TAG, "longClickToolbar: Long clicked the toolbar")
+    }
 
     fun verifyDownloadPromptIsDismissed() =
         assertUIObjectExists(
@@ -926,6 +958,7 @@ class BrowserRobot {
 
         fun openNavigationToolbar(interact: NavigationToolbarRobot.() -> Unit): NavigationToolbarRobot.Transition {
             clickPageObject(navURLBar())
+            Log.i(TAG, "openNavigationToolbar: Looking for search bar")
             searchBar().waitForExists(waitingTime)
 
             NavigationToolbarRobot().interact()
@@ -935,6 +968,7 @@ class BrowserRobot {
         fun openTabDrawer(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
             for (i in 1..RETRY_COUNT) {
                 try {
+                    Log.i(TAG, "openTabDrawer: Started try #$i")
                     mDevice.waitForObjects(
                         mDevice.findObject(
                             UiSelector()
@@ -944,14 +978,17 @@ class BrowserRobot {
                     )
 
                     tabsCounter().click()
+                    Log.i(TAG, "openTabDrawer: Clicked the tab counter button")
                     assertUIObjectExists(itemWithResId("$packageName:id/new_tab_button"))
 
                     break
                 } catch (e: AssertionError) {
+                    Log.i(TAG, "openTabDrawer: AssertionError caught, executing fallback methods")
                     if (i == RETRY_COUNT) {
                         throw e
                     } else {
                         mDevice.waitForIdle()
+                        Log.i(TAG, "openTabDrawer: Device waited to be idle")
                     }
                 }
             }
@@ -965,6 +1002,7 @@ class BrowserRobot {
         fun openComposeTabDrawer(composeTestRule: HomeActivityComposeTestRule, interact: ComposeTabDrawerRobot.() -> Unit): ComposeTabDrawerRobot.Transition {
             for (i in 1..RETRY_COUNT) {
                 try {
+                    Log.i(TAG, "openComposeTabDrawer: Started try #$i")
                     mDevice.waitForObjects(
                         mDevice.findObject(
                             UiSelector()
@@ -974,20 +1012,25 @@ class BrowserRobot {
                     )
 
                     tabsCounter().click()
+                    Log.i(TAG, "openComposeTabDrawer: Clicked the tab counter button")
 
                     composeTestRule.onNodeWithTag(TabsTrayTestTag.tabsTray).assertExists()
+                    Log.i(TAG, "openComposeTabDrawer: Verified the tabs tray exists")
 
                     break
                 } catch (e: AssertionError) {
+                    Log.i(TAG, "openComposeTabDrawer: AssertionError caught, executing fallback methods")
                     if (i == RETRY_COUNT) {
                         throw e
                     } else {
                         mDevice.waitForIdle()
+                        Log.i(TAG, "openComposeTabDrawer: Device waited to be idle")
                     }
                 }
             }
 
             composeTestRule.onNodeWithTag(TabsTrayTestTag.fab).assertExists()
+            Log.i(TAG, "openComposeTabDrawer: Verified the tabs tray new tab button exists")
 
             ComposeTabDrawerRobot(composeTestRule).interact()
             return ComposeTabDrawerRobot.Transition(composeTestRule)
@@ -1004,6 +1047,7 @@ class BrowserRobot {
         fun goToHomescreen(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
             clickPageObject(itemWithDescription("Home screen"))
 
+            Log.i(TAG, "goToHomescreen: Looking for home screen layout or jump back in contextual hint")
             mDevice.findObject(UiSelector().resourceId("$packageName:id/homeLayout"))
                 .waitForExists(waitingTime) ||
                 mDevice.findObject(
@@ -1019,6 +1063,7 @@ class BrowserRobot {
         fun goToHomescreenWithComposeTopSites(composeTestRule: HomeActivityComposeTestRule, interact: ComposeTopSitesRobot.() -> Unit): ComposeTopSitesRobot.Transition {
             clickPageObject(itemWithDescription("Home screen"))
 
+            Log.i(TAG, "goToHomescreenWithComposeTopSites: Looking for home screen layout or jump back in contextual hint")
             mDevice.findObject(UiSelector().resourceId("$packageName:id/homeLayout"))
                 .waitForExists(waitingTime) ||
                 mDevice.findObject(
@@ -1033,6 +1078,7 @@ class BrowserRobot {
 
         fun goBack(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
             mDevice.pressBack()
+            Log.i(TAG, "goBack: Clicked device back button")
 
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
@@ -1126,8 +1172,10 @@ class BrowserRobot {
         }
 
         fun openSiteSecuritySheet(interact: SiteSecurityRobot.() -> Unit): SiteSecurityRobot.Transition {
+            Log.i(TAG, "openSiteSecuritySheet: Looking for site security toolbar button")
             siteSecurityToolbarButton().waitForExists(waitingTime)
             siteSecurityToolbarButton().clickAndWaitForNewWindow(waitingTime)
+            Log.i(TAG, "openSiteSecuritySheet: Clicked site security toolbar button")
 
             SiteSecurityRobot().interact()
             return SiteSecurityRobot.Transition()
@@ -1136,6 +1184,7 @@ class BrowserRobot {
         fun clickManageAddressButton(interact: SettingsSubMenuAutofillRobot.() -> Unit): SettingsSubMenuAutofillRobot.Transition {
             itemWithResId("$packageName:id/manage_addresses")
                 .clickAndWaitForNewWindow(waitingTime)
+            Log.i(TAG, "clickManageAddressButton: Clicked manage address button")
 
             SettingsSubMenuAutofillRobot().interact()
             return SettingsSubMenuAutofillRobot.Transition()
@@ -1144,6 +1193,7 @@ class BrowserRobot {
         fun clickManageCreditCardsButton(interact: SettingsSubMenuAutofillRobot.() -> Unit): SettingsSubMenuAutofillRobot.Transition {
             itemWithResId("$packageName:id/manage_credit_cards")
                 .clickAndWaitForNewWindow(waitingTime)
+            Log.i(TAG, "clickManageCreditCardsButton: Clicked manage credit cards button")
 
             SettingsSubMenuAutofillRobot().interact()
             return SettingsSubMenuAutofillRobot.Transition()
@@ -1165,6 +1215,7 @@ class BrowserRobot {
                 "download",
                 "Download",
             ).click()
+            Log.i(TAG, "clickDownloadPDFButton: Clicked download PDF button")
 
             DownloadRobot().interact()
             return DownloadRobot.Transition()
@@ -1205,8 +1256,6 @@ private fun navURLBar() = itemWithResId("$packageName:id/toolbar")
 
 private fun searchBar() = itemWithResId("$packageName:id/mozac_browser_toolbar_url_view")
 
-fun homeScreenButton() = onView(withContentDescription(R.string.browser_toolbar_home))
-
 private fun threeDotButton() = onView(withContentDescription("Menu"))
 
 private fun tabsCounter() =
@@ -1224,26 +1273,23 @@ private fun siteSecurityToolbarButton() =
 
 fun clickPageObject(item: UiObject) {
     for (i in 1..RETRY_COUNT) {
-        Log.i(TAG, "clickPageObject: For loop i = $i")
         try {
-            Log.i(TAG, "clickPageObject: Try block")
+            Log.i(TAG, "clickPageObject: Started try #$i")
+            Log.i(TAG, "clickPageObject: Looking for ${item.selector}")
             item.waitForExists(waitingTime)
             item.click()
             Log.i(TAG, "clickPageObject: Clicked ${item.selector}")
 
             break
         } catch (e: UiObjectNotFoundException) {
-            Log.i(TAG, "clickPageObject: Catch block")
+            Log.i(TAG, "clickPageObject: UiObjectNotFoundException caught, executing fallback methods")
             if (i == RETRY_COUNT) {
                 throw e
             } else {
                 browserScreen {
-                    Log.i(TAG, "clickPageObject: Browser screen")
                 }.openThreeDotMenu {
-                    Log.i(TAG, "clickPageObject: Opened main menu")
                 }.refreshPage {
                     waitForPageToLoad()
-                    Log.i(TAG, "clickPageObject: Page refreshed, progress bar is gone")
                 }
             }
         }
@@ -1253,11 +1299,15 @@ fun clickPageObject(item: UiObject) {
 fun longClickPageObject(item: UiObject) {
     for (i in 1..RETRY_COUNT) {
         try {
+            Log.i(TAG, "longClickPageObject: Started try #$i")
+            Log.i(TAG, "longClickPageObject: Looking for ${item.selector}")
             item.waitForExists(waitingTime)
             item.longClick()
+            Log.i(TAG, "longClickPageObject: Long clicked ${item.selector}")
 
             break
         } catch (e: UiObjectNotFoundException) {
+            Log.i(TAG, "longClickPageObject: UiObjectNotFoundException caught, executing fallback methods")
             if (i == RETRY_COUNT) {
                 throw e
             } else {
@@ -1277,19 +1327,25 @@ fun clickContextMenuItem(item: String) {
         waitingTime,
     )
     mDevice.findObject(text(item)).click()
+    Log.i(TAG, "longClickPageObject: Clicked context menu item: $item")
 }
 
 fun setPageObjectText(webPageItem: UiObject, text: String) {
     for (i in 1..RETRY_COUNT) {
+        Log.i(TAG, "setPageObjectText: For loop i = $i")
         try {
             webPageItem.also {
+                Log.i(TAG, "setPageObjectText: Looking for ${webPageItem.selector}")
                 it.waitForExists(waitingTime)
                 it.clearTextField()
+                Log.i(TAG, "setPageObjectText: Cleared ${webPageItem.selector} text field")
                 it.text = text
+                Log.i(TAG, "setPageObjectText: ${webPageItem.selector} text set to $text")
             }
 
             break
         } catch (e: UiObjectNotFoundException) {
+            Log.i(TAG, "setPageObjectText: UiObjectNotFoundException caught, executing fallback methods")
             if (i == RETRY_COUNT) {
                 throw e
             } else {
@@ -1304,8 +1360,10 @@ fun setPageObjectText(webPageItem: UiObject, text: String) {
 }
 
 fun clearTextFieldItem(item: UiObject) {
+    Log.i(TAG, "clearTextFieldItem: Looking for ${item.selector}")
     item.waitForExists(waitingTime)
     item.clearTextField()
+    Log.i(TAG, "clearTextFieldItem: Cleared ${item.selector} text field")
 }
 
 // Context menu items

From e5a5860049f00d117dc23e5380d7c4fdc9f1bdb7 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 25 Jan 2024 11:19:33 +0200
Subject: [PATCH 038/222] Bug 1854333 - Fix dismissOpenLinksInAppCFRTest UI
 test

---
 .../java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt
index f11f87783..61244f8a6 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt
@@ -38,7 +38,6 @@ class SettingsAdvancedTest {
     private val youTubeFullLink = itemContainingText("Youtube full link")
     private val playStoreLink = itemContainingText("Playstore link")
     private val playStoreUrl = "play.google.com"
-    private val youTubePage = "vnd.youtube://".toUri()
 
     @get:Rule
     val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
@@ -311,7 +310,7 @@ class SettingsAdvancedTest {
         }
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(youTubePage) {
+        }.enterURLAndEnterToBrowser("https://m.youtube.com/".toUri()) {
             waitForPageToLoad()
             verifyOpenLinksInAppsCFRExists(true)
             clickOpenLinksInAppsDismissCFRButton()

From d79beb06a7390614a201f2826ef5a2ae0f9b262e Mon Sep 17 00:00:00 2001
From: James Hugman <james@hugman.tv>
Date: Fri, 26 Jan 2024 14:50:42 +0000
Subject: [PATCH 039/222] Fixup GleanPlumbMessageHelper rename bustage

---
 .../java/org/mozilla/fenix/helpers/Experimentation.kt         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/Experimentation.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/Experimentation.kt
index 3b4ba4ee1..34f4d15e6 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/Experimentation.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/Experimentation.kt
@@ -4,7 +4,7 @@
 
 package org.mozilla.fenix.helpers
 
-import org.mozilla.experiments.nimbus.GleanPlumbMessageHelper
+import org.mozilla.experiments.nimbus.NimbusMessagingHelperInterface
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.helpers.TestHelper.appContext
 
@@ -12,7 +12,7 @@ object Experimentation {
     val experiments =
         appContext.components.analytics.experiments
 
-    fun withHelper(block: GleanPlumbMessageHelper.() -> Unit) {
+    fun withHelper(block: NimbusMessagingHelperInterface.() -> Unit) {
         val helper = experiments.createMessageHelper()
         block(helper)
     }

From f591e9bdb0dc2da43c236a038430c357e525e684 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Fri, 26 Jan 2024 12:01:46 -0700
Subject: [PATCH 040/222] Bug 1876419 - Move comment from editorconfig files

---
 .editorconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 35408b931..fe4b8e6b7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,7 +1,9 @@
 [*.{kt,kts}]
 ij_kotlin_allow_trailing_comma_on_call_site=true
 ij_kotlin_allow_trailing_comma=true
-max_line_length = 120 # Matches maxLineLength in detekt.yml
+
+# Matches maxLineLength in detekt.yml
+max_line_length = 120
 
 [*]
 insert_final_newline = true

From d6ce096b18bd85d7ed4d855848a534fa2c8fd502 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Fri, 26 Jan 2024 12:02:41 -0700
Subject: [PATCH 041/222] Bug 1876419 - Update ktlint-baseline for all projects

---
 ktlint-baseline.xml | 2623 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 2620 insertions(+), 3 deletions(-)

diff --git a/ktlint-baseline.xml b/ktlint-baseline.xml
index b033ff3cc..2905d3cc8 100644
--- a/ktlint-baseline.xml
+++ b/ktlint-baseline.xml
@@ -2,9 +2,2626 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <baseline version="1.0">
-    <file name="app/src/test/java/org/mozilla/fenix/home/recentvisits/view/RecentBookmarksViewHolderTest.kt">
-        <error line="36" column="6" source="standard:block-comment-initial-star-alignment" />
+    <file name="app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt">
+        <error line="65" column="1" source="standard:max-line-length" />
+        <error line="84" column="1" source="standard:max-line-length" />
+        <error line="190" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/helpers/DataGenerationHelper.kt">
+        <error line="61" column="1" source="standard:max-line-length" />
+        <error line="61" column="119" source="standard:argument-list-wrapping" />
+        <error line="61" column="123" source="standard:argument-list-wrapping" />
+        <error line="61" column="131" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/helpers/RecyclerViewIdlingResource.kt">
+        <error line="10" column="1" source="standard:max-line-length" />
+        <error line="10" column="46" source="standard:parameter-list-wrapping" />
+        <error line="10" column="111" source="standard:parameter-list-wrapping" />
+        <error line="10" column="136" source="standard:parameter-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt">
+        <error line="47" column="1" source="standard:max-line-length" />
+        <error line="63" column="1" source="standard:max-line-length" />
+        <error line="126" column="1" source="standard:max-line-length" />
+        <error line="142" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt">
+        <error line="118" column="1" source="standard:max-line-length" />
+        <error line="118" column="20" source="standard:argument-list-wrapping" />
+        <error line="118" column="74" source="standard:argument-list-wrapping" />
+        <error line="118" column="121" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt">
+        <error line="686" column="1" source="standard:max-line-length" />
+        <error line="686" column="49" source="standard:argument-list-wrapping" />
+        <error line="686" column="67" source="standard:argument-list-wrapping" />
+        <error line="686" column="96" source="standard:argument-list-wrapping" />
+        <error line="686" column="127" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/ComposeBookmarksTest.kt">
+        <error line="669" column="1" source="standard:max-line-length" />
+        <error line="669" column="49" source="standard:argument-list-wrapping" />
+        <error line="669" column="67" source="standard:argument-list-wrapping" />
+        <error line="669" column="96" source="standard:argument-list-wrapping" />
+        <error line="669" column="127" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHistoryTest.kt">
+        <error line="381" column="1" source="standard:max-line-length" />
+        <error line="381" column="49" source="standard:argument-list-wrapping" />
+        <error line="381" column="67" source="standard:argument-list-wrapping" />
+        <error line="381" column="96" source="standard:argument-list-wrapping" />
+        <error line="381" column="127" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSearchTest.kt">
+        <error line="396" column="1" source="standard:max-line-length" />
+        <error line="396" column="55" source="standard:argument-list-wrapping" />
+        <error line="396" column="82" source="standard:argument-list-wrapping" />
+        <error line="396" column="108" source="standard:argument-list-wrapping" />
+        <error line="396" column="121" source="standard:argument-list-wrapping" />
+        <error line="442" column="1" source="standard:max-line-length" />
+        <error line="442" column="55" source="standard:argument-list-wrapping" />
+        <error line="442" column="82" source="standard:argument-list-wrapping" />
+        <error line="442" column="108" source="standard:argument-list-wrapping" />
+        <error line="442" column="121" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/FirefoxSuggestTest.kt">
+        <error line="44" column="1" source="standard:max-line-length" />
+        <error line="53" column="1" source="standard:max-line-length" />
+        <error line="57" column="1" source="standard:max-line-length" />
+        <error line="61" column="1" source="standard:max-line-length" />
+        <error line="65" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt">
+        <error line="411" column="1" source="standard:max-line-length" />
+        <error line="411" column="55" source="standard:argument-list-wrapping" />
+        <error line="411" column="82" source="standard:argument-list-wrapping" />
+        <error line="411" column="108" source="standard:argument-list-wrapping" />
+        <error line="411" column="121" source="standard:argument-list-wrapping" />
+        <error line="457" column="1" source="standard:max-line-length" />
+        <error line="457" column="55" source="standard:argument-list-wrapping" />
+        <error line="457" column="82" source="standard:argument-list-wrapping" />
+        <error line="457" column="108" source="standard:argument-list-wrapping" />
+        <error line="457" column="121" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHTTPSOnlyModeTest.kt">
+        <error line="26" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt">
+        <error line="281" column="1" source="standard:max-line-length" />
+        <error line="290" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/AccountSettingsRobot.kt">
+        <error line="66" column="1" source="standard:max-line-length" />
+        <error line="66" column="59" source="standard:argument-list-wrapping" />
+        <error line="66" column="82" source="standard:argument-list-wrapping" />
+        <error line="66" column="119" source="standard:argument-list-wrapping" />
+        <error line="66" column="150" source="standard:argument-list-wrapping" />
+        <error line="66" column="151" source="standard:argument-list-wrapping" />
+        <error line="66" column="152" source="standard:argument-list-wrapping" />
+        <error line="67" column="1" source="standard:max-line-length" />
+        <error line="67" column="53" source="standard:argument-list-wrapping" />
+        <error line="67" column="76" source="standard:argument-list-wrapping" />
+        <error line="67" column="113" source="standard:argument-list-wrapping" />
+        <error line="67" column="144" source="standard:argument-list-wrapping" />
+        <error line="67" column="145" source="standard:argument-list-wrapping" />
+        <error line="67" column="146" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt">
+        <error line="34" column="1" source="standard:max-line-length" />
+        <error line="34" column="15" source="standard:argument-list-wrapping" />
+        <error line="34" column="20" source="standard:argument-list-wrapping" />
+        <error line="34" column="146" source="standard:argument-list-wrapping" />
+        <error line="39" column="1" source="standard:max-line-length" />
+        <error line="39" column="15" source="standard:argument-list-wrapping" />
+        <error line="39" column="20" source="standard:argument-list-wrapping" />
+        <error line="39" column="142" source="standard:argument-list-wrapping" />
+        <error line="44" column="1" source="standard:max-line-length" />
+        <error line="44" column="15" source="standard:argument-list-wrapping" />
+        <error line="44" column="20" source="standard:argument-list-wrapping" />
+        <error line="44" column="131" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt">
+        <error line="213" column="1" source="standard:max-line-length" />
+        <error line="213" column="15" source="standard:argument-list-wrapping" />
+        <error line="213" column="20" source="standard:argument-list-wrapping" />
+        <error line="213" column="147" source="standard:argument-list-wrapping" />
+        <error line="266" column="1" source="standard:max-line-length" />
+        <error line="266" column="15" source="standard:argument-list-wrapping" />
+        <error line="266" column="20" source="standard:argument-list-wrapping" />
+        <error line="266" column="129" source="standard:argument-list-wrapping" />
+        <error line="309" column="1" source="standard:max-line-length" />
+        <error line="309" column="111" source="standard:argument-list-wrapping" />
+        <error line="309" column="122" source="standard:argument-list-wrapping" />
+        <error line="357" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt">
+        <error line="481" column="1" source="standard:max-line-length" />
+        <error line="481" column="38" source="standard:argument-list-wrapping" />
+        <error line="481" column="65" source="standard:argument-list-wrapping" />
+        <error line="481" column="90" source="standard:argument-list-wrapping" />
+        <error line="481" column="123" source="standard:argument-list-wrapping" />
+        <error line="483" column="1" source="standard:max-line-length" />
+        <error line="483" column="38" source="standard:argument-list-wrapping" />
+        <error line="483" column="65" source="standard:argument-list-wrapping" />
+        <error line="483" column="90" source="standard:argument-list-wrapping" />
+        <error line="483" column="123" source="standard:argument-list-wrapping" />
+        <error line="559" column="1" source="standard:max-line-length" />
+        <error line="559" column="19" source="standard:argument-list-wrapping" />
+        <error line="559" column="24" source="standard:argument-list-wrapping" />
+        <error line="559" column="127" source="standard:argument-list-wrapping" />
+        <error line="561" column="1" source="standard:max-line-length" />
+        <error line="561" column="19" source="standard:argument-list-wrapping" />
+        <error line="561" column="24" source="standard:argument-list-wrapping" />
+        <error line="561" column="126" source="standard:argument-list-wrapping" />
+        <error line="564" column="1" source="standard:max-line-length" />
+        <error line="564" column="19" source="standard:argument-list-wrapping" />
+        <error line="564" column="24" source="standard:argument-list-wrapping" />
+        <error line="564" column="121" source="standard:argument-list-wrapping" />
+        <error line="566" column="1" source="standard:max-line-length" />
+        <error line="566" column="19" source="standard:argument-list-wrapping" />
+        <error line="566" column="24" source="standard:argument-list-wrapping" />
+        <error line="566" column="129" source="standard:argument-list-wrapping" />
+        <error line="568" column="1" source="standard:max-line-length" />
+        <error line="568" column="19" source="standard:argument-list-wrapping" />
+        <error line="568" column="24" source="standard:argument-list-wrapping" />
+        <error line="568" column="128" source="standard:argument-list-wrapping" />
+        <error line="760" column="1" source="standard:max-line-length" />
+        <error line="760" column="23" source="standard:argument-list-wrapping" />
+        <error line="760" column="28" source="standard:argument-list-wrapping" />
+        <error line="760" column="128" source="standard:argument-list-wrapping" />
+        <error line="834" column="1" source="standard:max-line-length" />
+        <error line="834" column="53" source="standard:argument-list-wrapping" />
+        <error line="834" column="72" source="standard:argument-list-wrapping" />
+        <error line="834" column="90" source="standard:argument-list-wrapping" />
+        <error line="834" column="122" source="standard:argument-list-wrapping" />
+        <error line="834" column="123" source="standard:argument-list-wrapping" />
+        <error line="834" column="124" source="standard:argument-list-wrapping" />
+        <error line="897" column="1" source="standard:max-line-length" />
+        <error line="1002" column="1" source="standard:max-line-length" />
+        <error line="1002" column="34" source="standard:parameter-list-wrapping" />
+        <error line="1002" column="80" source="standard:parameter-list-wrapping" />
+        <error line="1002" column="122" source="standard:parameter-list-wrapping" />
+        <error line="1063" column="1" source="standard:max-line-length" />
+        <error line="1063" column="47" source="standard:parameter-list-wrapping" />
+        <error line="1063" column="93" source="standard:parameter-list-wrapping" />
+        <error line="1063" column="134" source="standard:parameter-list-wrapping" />
+        <error line="1066" column="1" source="standard:max-line-length" />
+        <error line="1066" column="19" source="standard:argument-list-wrapping" />
+        <error line="1066" column="24" source="standard:argument-list-wrapping" />
+        <error line="1066" column="123" source="standard:argument-list-wrapping" />
+        <error line="1150" column="1" source="standard:max-line-length" />
+        <error line="1158" column="1" source="standard:max-line-length" />
+        <error line="1166" column="1" source="standard:max-line-length" />
+        <error line="1184" column="1" source="standard:max-line-length" />
+        <error line="1193" column="1" source="standard:max-line-length" />
+        <error line="1207" column="1" source="standard:max-line-length" />
+        <error line="1207" column="19" source="standard:argument-list-wrapping" />
+        <error line="1207" column="24" source="standard:argument-list-wrapping" />
+        <error line="1207" column="125" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt">
+        <error line="168" column="1" source="standard:max-line-length" />
+        <error line="168" column="34" source="standard:argument-list-wrapping" />
+        <error line="168" column="111" source="standard:argument-list-wrapping" />
+        <error line="168" column="125" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt">
+        <error line="462" column="1" source="standard:max-line-length" />
+        <error line="470" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt">
+        <error line="233" column="1" source="standard:max-line-length" />
+        <error line="233" column="19" source="standard:argument-list-wrapping" />
+        <error line="233" column="24" source="standard:argument-list-wrapping" />
+        <error line="233" column="134" source="standard:argument-list-wrapping" />
+        <error line="241" column="1" source="standard:max-line-length" />
+        <error line="241" column="19" source="standard:argument-list-wrapping" />
+        <error line="241" column="24" source="standard:argument-list-wrapping" />
+        <error line="241" column="138" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt">
+        <error line="181" column="1" source="standard:max-line-length" />
+        <error line="188" column="1" source="standard:max-line-length" />
+        <error line="207" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt">
+        <error line="47" column="1" source="standard:max-line-length" />
+        <error line="47" column="29" source="standard:argument-list-wrapping" />
+        <error line="47" column="110" source="standard:argument-list-wrapping" />
+        <error line="47" column="121" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt">
+        <error line="305" column="1" source="standard:max-line-length" />
+        <error line="305" column="34" source="standard:argument-list-wrapping" />
+        <error line="305" column="107" source="standard:argument-list-wrapping" />
+        <error line="305" column="121" source="standard:argument-list-wrapping" />
+        <error line="350" column="1" source="standard:max-line-length" />
+        <error line="350" column="34" source="standard:argument-list-wrapping" />
+        <error line="350" column="116" source="standard:argument-list-wrapping" />
+        <error line="350" column="130" source="standard:argument-list-wrapping" />
+        <error line="453" column="1" source="standard:max-line-length" />
+        <error line="453" column="34" source="standard:parameter-list-wrapping" />
+        <error line="453" column="80" source="standard:parameter-list-wrapping" />
+        <error line="453" column="122" source="standard:parameter-list-wrapping" />
+        <error line="518" column="1" source="standard:max-line-length" />
+        <error line="561" column="1" source="standard:max-line-length" />
+        <error line="563" column="1" source="standard:max-line-length" />
+        <error line="563" column="19" source="standard:argument-list-wrapping" />
+        <error line="563" column="24" source="standard:argument-list-wrapping" />
+        <error line="563" column="142" source="standard:argument-list-wrapping" />
+        <error line="581" column="1" source="standard:max-line-length" />
+        <error line="636" column="1" source="standard:max-line-length" />
+        <error line="637" column="1" source="standard:max-line-length" />
+        <error line="637" column="19" source="standard:argument-list-wrapping" />
+        <error line="637" column="24" source="standard:argument-list-wrapping" />
+        <error line="637" column="122" source="standard:argument-list-wrapping" />
+        <error line="640" column="1" source="standard:max-line-length" />
+        <error line="640" column="19" source="standard:argument-list-wrapping" />
+        <error line="640" column="24" source="standard:argument-list-wrapping" />
+        <error line="640" column="163" source="standard:argument-list-wrapping" />
+        <error line="666" column="1" source="standard:max-line-length" />
+        <error line="666" column="45" source="standard:parameter-list-wrapping" />
+        <error line="666" column="91" source="standard:parameter-list-wrapping" />
+        <error line="666" column="133" source="standard:parameter-list-wrapping" />
+        <error line="683" column="1" source="standard:max-line-length" />
+        <error line="693" column="1" source="standard:max-line-length" />
+        <error line="717" column="1" source="standard:max-line-length" />
+        <error line="717" column="42" source="standard:parameter-list-wrapping" />
+        <error line="717" column="88" source="standard:parameter-list-wrapping" />
+        <error line="717" column="130" source="standard:parameter-list-wrapping" />
+        <error line="728" column="1" source="standard:max-line-length" />
+        <error line="740" column="1" source="standard:max-line-length" />
+        <error line="769" column="1" source="standard:max-line-length" />
+        <error line="807" column="1" source="standard:max-line-length" />
+        <error line="807" column="35" source="standard:parameter-list-wrapping" />
+        <error line="807" column="81" source="standard:parameter-list-wrapping" />
+        <error line="807" column="122" source="standard:parameter-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt">
+        <error line="116" column="1" source="standard:max-line-length" />
+        <error line="135" column="1" source="standard:max-line-length" />
+        <error line="135" column="33" source="standard:parameter-list-wrapping" />
+        <error line="135" column="79" source="standard:parameter-list-wrapping" />
+        <error line="135" column="121" source="standard:parameter-list-wrapping" />
+        <error line="144" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt">
+        <error line="211" column="1" source="standard:max-line-length" />
+        <error line="211" column="34" source="standard:parameter-list-wrapping" />
+        <error line="211" column="80" source="standard:parameter-list-wrapping" />
+        <error line="211" column="122" source="standard:parameter-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt">
+        <error line="69" column="1" source="standard:max-line-length" />
+        <error line="69" column="15" source="standard:argument-list-wrapping" />
+        <error line="69" column="20" source="standard:argument-list-wrapping" />
+        <error line="69" column="122" source="standard:argument-list-wrapping" />
+        <error line="88" column="1" source="standard:max-line-length" />
+        <error line="88" column="23" source="standard:argument-list-wrapping" />
+        <error line="88" column="28" source="standard:argument-list-wrapping" />
+        <error line="88" column="161" source="standard:argument-list-wrapping" />
+        <error line="200" column="1" source="standard:max-line-length" />
+        <error line="200" column="15" source="standard:argument-list-wrapping" />
+        <error line="200" column="20" source="standard:argument-list-wrapping" />
+        <error line="200" column="136" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt">
+        <error line="89" column="1" source="standard:max-line-length" />
+        <error line="96" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt">
+        <error line="348" column="1" source="standard:max-line-length" />
+        <error line="355" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt">
+        <error line="247" column="1" source="standard:max-line-length" />
+        <error line="264" column="1" source="standard:max-line-length" />
+        <error line="283" column="1" source="standard:max-line-length" />
+        <error line="291" column="1" source="standard:max-line-length" />
+        <error line="304" column="1" source="standard:max-line-length" />
+        <error line="334" column="1" source="standard:max-line-length" />
+        <error line="343" column="1" source="standard:max-line-length" />
+        <error line="353" column="1" source="standard:max-line-length" />
+        <error line="370" column="1" source="standard:max-line-length" />
+        <error line="379" column="1" source="standard:max-line-length" />
+        <error line="388" column="1" source="standard:max-line-length" />
+        <error line="397" column="1" source="standard:max-line-length" />
+        <error line="397" column="57" source="standard:parameter-list-wrapping" />
+        <error line="397" column="122" source="standard:parameter-list-wrapping" />
+        <error line="415" column="1" source="standard:max-line-length" />
+        <error line="424" column="1" source="standard:max-line-length" />
+        <error line="431" column="1" source="standard:max-line-length" />
+        <error line="438" column="1" source="standard:max-line-length" />
+        <error line="450" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt">
+        <error line="215" column="1" source="standard:max-line-length" />
+        <error line="215" column="50" source="standard:argument-list-wrapping" />
+        <error line="215" column="58" source="standard:argument-list-wrapping" />
+        <error line="215" column="72" source="standard:argument-list-wrapping" />
+        <error line="215" column="81" source="standard:argument-list-wrapping" />
+        <error line="215" column="96" source="standard:argument-list-wrapping" />
+        <error line="215" column="122" source="standard:argument-list-wrapping" />
+        <error line="215" column="123" source="standard:argument-list-wrapping" />
+        <error line="215" column="124" source="standard:argument-list-wrapping" />
+        <error line="215" column="125" source="standard:argument-list-wrapping" />
+        <error line="215" column="126" source="standard:argument-list-wrapping" />
+        <error line="261" column="1" source="standard:max-line-length" />
+        <error line="261" column="42" source="standard:argument-list-wrapping" />
+        <error line="261" column="189" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAccessibilityRobot.kt">
+        <error line="108" column="1" source="standard:max-line-length" />
+        <error line="108" column="16" source="standard:argument-list-wrapping" />
+        <error line="108" column="24" source="standard:argument-list-wrapping" />
+        <error line="108" column="33" source="standard:argument-list-wrapping" />
+        <error line="108" column="153" source="standard:argument-list-wrapping" />
+        <error line="108" column="154" source="standard:argument-list-wrapping" />
+        <error line="108" column="155" source="standard:argument-list-wrapping" />
+        <error line="179" column="1" source="standard:max-line-length" />
+        <error line="179" column="83" source="standard:argument-list-wrapping" />
+        <error line="179" column="194" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerAddonDetailedMenuRobot.kt">
+        <error line="30" column="1" source="standard:max-line-length" />
+        <error line="38" column="1" source="standard:max-line-length" />
+        <error line="38" column="25" source="standard:parameter-list-wrapping" />
+        <error line="38" column="75" source="standard:parameter-list-wrapping" />
+        <error line="38" column="129" source="standard:parameter-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt">
+        <error line="261" column="1" source="standard:max-line-length" />
+        <error line="261" column="39" source="standard:argument-list-wrapping" />
+        <error line="261" column="48" source="standard:argument-list-wrapping" />
+        <error line="261" column="126" source="standard:argument-list-wrapping" />
+        <error line="261" column="127" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt">
+        <error line="444" column="1" source="standard:max-line-length" />
+        <error line="444" column="30" source="standard:argument-list-wrapping" />
+        <error line="444" column="49" source="standard:argument-list-wrapping" />
+        <error line="444" column="121" source="standard:argument-list-wrapping" />
+        <error line="444" column="122" source="standard:argument-list-wrapping" />
+        <error line="447" column="1" source="standard:max-line-length" />
+        <error line="447" column="30" source="standard:argument-list-wrapping" />
+        <error line="447" column="49" source="standard:argument-list-wrapping" />
+        <error line="447" column="67" source="standard:argument-list-wrapping" />
+        <error line="447" column="126" source="standard:argument-list-wrapping" />
+        <error line="447" column="127" source="standard:argument-list-wrapping" />
+        <error line="447" column="128" source="standard:argument-list-wrapping" />
+        <error line="457" column="1" source="standard:max-line-length" />
+        <error line="465" column="1" source="standard:max-line-length" />
+        <error line="496" column="1" source="standard:max-line-length" />
+        <error line="496" column="45" source="standard:property-wrapping" />
+        <error line="496" column="65" source="standard:argument-list-wrapping" />
+        <error line="496" column="83" source="standard:argument-list-wrapping" />
+        <error line="496" column="141" source="standard:argument-list-wrapping" />
+        <error line="496" column="142" source="standard:argument-list-wrapping" />
+        <error line="497" column="1" source="standard:max-line-length" />
+        <error line="497" column="46" source="standard:property-wrapping" />
+        <error line="497" column="66" source="standard:argument-list-wrapping" />
+        <error line="497" column="84" source="standard:argument-list-wrapping" />
+        <error line="497" column="150" source="standard:argument-list-wrapping" />
+        <error line="497" column="151" source="standard:argument-list-wrapping" />
+        <error line="527" column="1" source="standard:max-line-length" />
+        <error line="527" column="47" source="standard:property-wrapping" />
+        <error line="527" column="67" source="standard:argument-list-wrapping" />
+        <error line="527" column="85" source="standard:argument-list-wrapping" />
+        <error line="527" column="142" source="standard:argument-list-wrapping" />
+        <error line="527" column="143" source="standard:argument-list-wrapping" />
+        <error line="528" column="1" source="standard:max-line-length" />
+        <error line="528" column="48" source="standard:property-wrapping" />
+        <error line="528" column="68" source="standard:argument-list-wrapping" />
+        <error line="528" column="86" source="standard:argument-list-wrapping" />
+        <error line="528" column="151" source="standard:argument-list-wrapping" />
+        <error line="528" column="152" source="standard:argument-list-wrapping" />
+        <error line="529" column="1" source="standard:max-line-length" />
+        <error line="529" column="49" source="standard:property-wrapping" />
+        <error line="529" column="69" source="standard:argument-list-wrapping" />
+        <error line="529" column="87" source="standard:argument-list-wrapping" />
+        <error line="529" column="146" source="standard:argument-list-wrapping" />
+        <error line="529" column="147" source="standard:argument-list-wrapping" />
+        <error line="530" column="1" source="standard:max-line-length" />
+        <error line="530" column="54" source="standard:argument-list-wrapping" />
+        <error line="530" column="80" source="standard:argument-list-wrapping" />
+        <error line="530" column="98" source="standard:argument-list-wrapping" />
+        <error line="530" column="147" source="standard:argument-list-wrapping" />
+        <error line="530" column="148" source="standard:argument-list-wrapping" />
+        <error line="530" column="149" source="standard:argument-list-wrapping" />
+        <error line="533" column="1" source="standard:max-line-length" />
+        <error line="533" column="63" source="standard:argument-list-wrapping" />
+        <error line="533" column="89" source="standard:argument-list-wrapping" />
+        <error line="533" column="107" source="standard:argument-list-wrapping" />
+        <error line="533" column="159" source="standard:argument-list-wrapping" />
+        <error line="533" column="160" source="standard:argument-list-wrapping" />
+        <error line="533" column="161" source="standard:argument-list-wrapping" />
+        <error line="535" column="1" source="standard:max-line-length" />
+        <error line="535" column="60" source="standard:argument-list-wrapping" />
+        <error line="535" column="121" source="standard:argument-list-wrapping" />
+        <error line="539" column="1" source="standard:max-line-length" />
+        <error line="539" column="64" source="standard:argument-list-wrapping" />
+        <error line="539" column="88" source="standard:argument-list-wrapping" />
+        <error line="539" column="131" source="standard:argument-list-wrapping" />
+        <error line="539" column="132" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt">
+        <error line="113" column="1" source="standard:max-line-length" />
+        <error line="113" column="41" source="standard:property-wrapping" />
+        <error line="113" column="49" source="standard:argument-list-wrapping" />
+        <error line="113" column="58" source="standard:argument-list-wrapping" />
+        <error line="113" column="121" source="standard:argument-list-wrapping" />
+        <error line="113" column="122" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt">
+        <error line="161" column="1" source="standard:max-line-length" />
+        <error line="161" column="80" source="standard:argument-list-wrapping" />
+        <error line="161" column="106" source="standard:argument-list-wrapping" />
+        <error line="161" column="128" source="standard:argument-list-wrapping" />
+        <error line="161" column="129" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionExceptionsRobot.kt">
+        <error line="55" column="1" source="standard:max-line-length" />
+        <error line="62" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt">
+        <error line="138" column="1" source="standard:max-line-length" />
+        <error line="138" column="16" source="standard:argument-list-wrapping" />
+        <error line="138" column="25" source="standard:argument-list-wrapping" />
+        <error line="138" column="152" source="standard:argument-list-wrapping" />
+        <error line="138" column="153" source="standard:argument-list-wrapping" />
+        <error line="138" column="161" source="standard:argument-list-wrapping" />
+        <error line="138" column="169" source="standard:argument-list-wrapping" />
+        <error line="138" column="182" source="standard:argument-list-wrapping" />
+        <error line="138" column="183" source="standard:argument-list-wrapping" />
+        <error line="146" column="1" source="standard:max-line-length" />
+        <error line="146" column="16" source="standard:argument-list-wrapping" />
+        <error line="146" column="25" source="standard:argument-list-wrapping" />
+        <error line="146" column="152" source="standard:argument-list-wrapping" />
+        <error line="146" column="153" source="standard:argument-list-wrapping" />
+        <error line="146" column="161" source="standard:argument-list-wrapping" />
+        <error line="146" column="169" source="standard:argument-list-wrapping" />
+        <error line="146" column="182" source="standard:argument-list-wrapping" />
+        <error line="146" column="183" source="standard:argument-list-wrapping" />
+        <error line="244" column="1" source="standard:max-line-length" />
+        <error line="271" column="1" source="standard:max-line-length" />
+        <error line="271" column="117" source="standard:argument-list-wrapping" />
+        <error line="271" column="125" source="standard:argument-list-wrapping" />
+        <error line="271" column="138" source="standard:argument-list-wrapping" />
+        <error line="271" column="139" source="standard:argument-list-wrapping" />
+        <error line="273" column="1" source="standard:max-line-length" />
+        <error line="273" column="12" source="standard:argument-list-wrapping" />
+        <error line="273" column="21" source="standard:argument-list-wrapping" />
+        <error line="273" column="157" source="standard:argument-list-wrapping" />
+        <error line="273" column="158" source="standard:argument-list-wrapping" />
+        <error line="273" column="166" source="standard:argument-list-wrapping" />
+        <error line="273" column="174" source="standard:argument-list-wrapping" />
+        <error line="273" column="187" source="standard:argument-list-wrapping" />
+        <error line="273" column="188" source="standard:argument-list-wrapping" />
+        <error line="275" column="1" source="standard:max-line-length" />
+        <error line="275" column="114" source="standard:argument-list-wrapping" />
+        <error line="275" column="122" source="standard:argument-list-wrapping" />
+        <error line="275" column="135" source="standard:argument-list-wrapping" />
+        <error line="275" column="136" source="standard:argument-list-wrapping" />
+        <error line="277" column="1" source="standard:max-line-length" />
+        <error line="277" column="12" source="standard:argument-list-wrapping" />
+        <error line="277" column="21" source="standard:argument-list-wrapping" />
+        <error line="277" column="134" source="standard:argument-list-wrapping" />
+        <error line="277" column="135" source="standard:argument-list-wrapping" />
+        <error line="277" column="143" source="standard:argument-list-wrapping" />
+        <error line="277" column="151" source="standard:argument-list-wrapping" />
+        <error line="277" column="164" source="standard:argument-list-wrapping" />
+        <error line="277" column="165" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuHttpsOnlyModeRobot.kt">
+        <error line="38" column="1" source="standard:max-line-length" />
+        <error line="38" column="20" source="standard:argument-list-wrapping" />
+        <error line="38" column="28" source="standard:argument-list-wrapping" />
+        <error line="38" column="37" source="standard:argument-list-wrapping" />
+        <error line="38" column="148" source="standard:argument-list-wrapping" />
+        <error line="38" column="149" source="standard:argument-list-wrapping" />
+        <error line="38" column="150" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordOptionsToSaveRobot.kt">
+        <error line="76" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordRobot.kt">
+        <error line="104" column="1" source="standard:max-line-length" />
+        <error line="111" column="1" source="standard:max-line-length" />
+        <error line="125" column="1" source="standard:max-line-length" />
+        <error line="134" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordsSavedLoginsRobot.kt">
+        <error line="194" column="1" source="standard:max-line-length" />
+        <error line="201" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSitePermissionsCommonRobot.kt">
+        <error line="37" column="1" source="standard:max-line-length" />
+        <error line="184" column="1" source="standard:max-line-length" />
+        <error line="241" column="1" source="standard:max-line-length" />
+        <error line="241" column="26" source="standard:argument-list-wrapping" />
+        <error line="241" column="108" source="standard:argument-list-wrapping" />
+        <error line="241" column="122" source="standard:argument-list-wrapping" />
+        <error line="244" column="1" source="standard:max-line-length" />
+        <error line="244" column="62" source="standard:argument-list-wrapping" />
+        <error line="244" column="86" source="standard:argument-list-wrapping" />
+        <error line="244" column="133" source="standard:argument-list-wrapping" />
+        <error line="244" column="134" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSitePermissionsExceptionsRobot.kt">
+        <error line="111" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SitePermissionsRobot.kt">
+        <error line="140" column="1" source="standard:max-line-length" />
+        <error line="140" column="102" source="standard:argument-list-wrapping" />
+        <error line="140" column="110" source="standard:argument-list-wrapping" />
+        <error line="140" column="123" source="standard:argument-list-wrapping" />
+        <error line="140" column="124" source="standard:argument-list-wrapping" />
+        <error line="141" column="1" source="standard:max-line-length" />
+        <error line="141" column="128" source="standard:argument-list-wrapping" />
+        <error line="141" column="136" source="standard:argument-list-wrapping" />
+        <error line="141" column="149" source="standard:argument-list-wrapping" />
+        <error line="141" column="150" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SiteSecurityRobot.kt">
+        <error line="29" column="1" source="standard:max-line-length" />
+        <error line="29" column="104" source="standard:argument-list-wrapping" />
+        <error line="29" column="109" source="standard:argument-list-wrapping" />
+        <error line="29" column="127" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuBookmarksRobot.kt">
+        <error line="49" column="1" source="standard:max-line-length" />
+        <error line="63" column="1" source="standard:max-line-length" />
+        <error line="63" column="35" source="standard:parameter-list-wrapping" />
+        <error line="63" column="81" source="standard:parameter-list-wrapping" />
+        <error line="63" column="123" source="standard:parameter-list-wrapping" />
+        <error line="77" column="1" source="standard:max-line-length" />
+        <error line="91" column="1" source="standard:max-line-length" />
+        <error line="91" column="39" source="standard:parameter-list-wrapping" />
+        <error line="91" column="85" source="standard:parameter-list-wrapping" />
+        <error line="91" column="127" source="standard:parameter-list-wrapping" />
+    </file>
+    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt">
+        <error line="273" column="1" source="standard:max-line-length" />
+        <error line="446" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/main/java/org/mozilla/fenix/components/TrackingProtectionPolicyFactory.kt">
+        <error line="112" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/main/java/org/mozilla/fenix/debugsettings/store/DebugDrawerStore.kt">
+        <error line="26" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt">
+        <error line="771" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt">
+        <error line="62" column="1" source="standard:max-line-length" />
+        <error line="76" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/ServiceWorkerSupportTest.kt">
+        <error line="41" column="1" source="standard:max-line-length" />
+        <error line="48" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/addons/ExtensionsProcessDisabledBackgroundControllerTest.kt">
+        <error line="26" column="1" source="standard:max-line-length" />
+        <error line="49" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/addons/ExtensionsProcessDisabledForegroundControllerTest.kt">
+        <error line="38" column="1" source="standard:max-line-length" />
+        <error line="79" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragmentTest.kt">
+        <error line="56" column="1" source="standard:max-line-length" />
+        <error line="191" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt">
+        <error line="111" column="1" source="standard:max-line-length" />
+        <error line="121" column="1" source="standard:max-line-length" />
+        <error line="131" column="1" source="standard:max-line-length" />
+        <error line="141" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt">
+        <error line="220" column="1" source="standard:max-line-length" />
+        <error line="232" column="1" source="standard:max-line-length" />
+        <error line="256" column="1" source="standard:max-line-length" />
+        <error line="352" column="1" source="standard:max-line-length" />
+        <error line="401" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/browser/StandardSnackbarErrorBindingTest.kt">
+        <error line="112" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerTest.kt">
+        <error line="36" column="1" source="standard:max-line-length" />
+        <error line="36" column="20" source="standard:argument-list-wrapping" />
+        <error line="36" column="126" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt">
+        <error line="221" column="1" source="standard:max-line-length" />
+        <error line="227" column="1" source="standard:max-line-length" />
+        <error line="234" column="1" source="standard:max-line-length" />
+        <error line="243" column="1" source="standard:max-line-length" />
+        <error line="250" column="1" source="standard:max-line-length" />
+        <error line="259" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/AppStoreTest.kt">
+        <error line="258" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/FenixSnackbarBehaviorTest.kt">
+        <error line="52" column="1" source="standard:max-line-length" />
+        <error line="72" column="1" source="standard:max-line-length" />
+        <error line="84" column="1" source="standard:max-line-length" />
+        <error line="96" column="1" source="standard:max-line-length" />
+        <error line="122" column="1" source="standard:max-line-length" />
+        <error line="148" column="1" source="standard:max-line-length" />
+        <error line="174" column="1" source="standard:max-line-length" />
+        <error line="197" column="1" source="standard:max-line-length" />
+        <error line="223" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/FindInPageIntegrationTest.kt">
+        <error line="26" column="1" source="standard:max-line-length" />
+        <error line="52" column="1" source="standard:max-line-length" />
+        <error line="78" column="1" source="standard:max-line-length" />
+        <error line="104" column="1" source="standard:max-line-length" />
+        <error line="130" column="1" source="standard:max-line-length" />
+        <error line="156" column="1" source="standard:max-line-length" />
+        <error line="182" column="1" source="standard:max-line-length" />
+        <error line="208" column="1" source="standard:max-line-length" />
+        <error line="245" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/PrivateShortcutCreateManagerTest.kt">
+        <error line="45" column="1" source="standard:max-line-length" />
+        <error line="63" column="1" source="standard:max-line-length" />
+        <error line="63" column="17" source="standard:wrapping" />
+        <error line="63" column="44" source="standard:argument-list-wrapping" />
+        <error line="63" column="57" source="standard:argument-list-wrapping" />
+        <error line="63" column="60" source="standard:argument-list-wrapping" />
+        <error line="63" column="77" source="standard:argument-list-wrapping" />
+        <error line="63" column="151" source="standard:argument-list-wrapping" />
+        <error line="70" column="1" source="standard:max-line-length" />
+        <error line="70" column="22" source="standard:argument-list-wrapping" />
+        <error line="70" column="116" source="standard:argument-list-wrapping" />
+        <error line="70" column="145" source="standard:argument-list-wrapping" />
+        <error line="71" column="1" source="standard:max-line-length" />
+        <error line="71" column="22" source="standard:argument-list-wrapping" />
+        <error line="71" column="116" source="standard:argument-list-wrapping" />
+        <error line="71" column="144" source="standard:argument-list-wrapping" />
+        <error line="81" column="1" source="standard:max-line-length" />
+        <error line="81" column="22" source="standard:argument-list-wrapping" />
+        <error line="81" column="83" source="standard:argument-list-wrapping" />
+        <error line="81" column="108" source="standard:argument-list-wrapping" />
+        <error line="81" column="135" source="standard:argument-list-wrapping" />
+        <error line="81" column="136" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/TrackingProtectionPolicyFactoryTest.kt">
+        <error line="183" column="1" source="standard:max-line-length" />
+        <error line="210" column="1" source="standard:max-line-length" />
+        <error line="237" column="1" source="standard:max-line-length" />
+        <error line="253" column="1" source="standard:max-line-length" />
+        <error line="269" column="1" source="standard:max-line-length" />
+        <error line="296" column="1" source="standard:max-line-length" />
+        <error line="323" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt">
+        <error line="33" column="1" source="standard:max-line-length" />
+        <error line="46" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/accounts/FenixAccountManagerTest.kt">
+        <error line="48" column="1" source="standard:max-line-length" />
+        <error line="62" column="1" source="standard:max-line-length" />
+        <error line="94" column="1" source="standard:max-line-length" />
+        <error line="106" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/appstate/AppStoreReducerTest.kt">
+        <error line="19" column="1" source="standard:max-line-length" />
+        <error line="63" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/history/PagedHistoryProviderTest.kt">
+        <error line="342" column="1" source="standard:max-line-length" />
+        <error line="342" column="34" source="standard:property-wrapping" />
+        <error line="342" column="54" source="standard:argument-list-wrapping" />
+        <error line="342" column="111" source="standard:argument-list-wrapping" />
+        <error line="342" column="122" source="standard:argument-list-wrapping" />
+        <error line="342" column="126" source="standard:argument-list-wrapping" />
+        <error line="393" column="1" source="standard:max-line-length" />
+        <error line="393" column="18" source="standard:wrapping" />
+        <error line="393" column="75" source="standard:argument-list-wrapping" />
+        <error line="393" column="90" source="standard:argument-list-wrapping" />
+        <error line="393" column="105" source="standard:argument-list-wrapping" />
+        <error line="393" column="120" source="standard:argument-list-wrapping" />
+        <error line="393" column="133" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/metrics/DefaultMetricsStorageTest.kt">
+        <error line="57" column="1" source="standard:max-line-length" />
+        <error line="57" column="41" source="standard:argument-list-wrapping" />
+        <error line="57" column="50" source="standard:argument-list-wrapping" />
+        <error line="57" column="60" source="standard:argument-list-wrapping" />
+        <error line="57" column="83" source="standard:argument-list-wrapping" />
+        <error line="57" column="106" source="standard:argument-list-wrapping" />
+        <error line="57" column="124" source="standard:argument-list-wrapping" />
+        <error line="57" column="134" source="standard:argument-list-wrapping" />
+        <error line="61" column="1" source="standard:max-line-length" />
+        <error line="61" column="113" source="standard:argument-list-wrapping" />
+        <error line="61" column="123" source="standard:argument-list-wrapping" />
+        <error line="72" column="1" source="standard:max-line-length" />
+        <error line="72" column="132" source="standard:argument-list-wrapping" />
+        <error line="72" column="142" source="standard:argument-list-wrapping" />
+        <error line="82" column="1" source="standard:max-line-length" />
+        <error line="82" column="124" source="standard:argument-list-wrapping" />
+        <error line="82" column="134" source="standard:argument-list-wrapping" />
+        <error line="92" column="1" source="standard:max-line-length" />
+        <error line="92" column="124" source="standard:argument-list-wrapping" />
+        <error line="92" column="134" source="standard:argument-list-wrapping" />
+        <error line="112" column="1" source="standard:max-line-length" />
+        <error line="112" column="147" source="standard:argument-list-wrapping" />
+        <error line="112" column="157" source="standard:argument-list-wrapping" />
+        <error line="124" column="1" source="standard:max-line-length" />
+        <error line="124" column="138" source="standard:argument-list-wrapping" />
+        <error line="124" column="148" source="standard:argument-list-wrapping" />
+        <error line="136" column="1" source="standard:max-line-length" />
+        <error line="136" column="150" source="standard:argument-list-wrapping" />
+        <error line="136" column="160" source="standard:argument-list-wrapping" />
+        <error line="140" column="1" source="standard:max-line-length" />
+        <error line="149" column="1" source="standard:max-line-length" />
+        <error line="149" column="168" source="standard:argument-list-wrapping" />
+        <error line="149" column="178" source="standard:argument-list-wrapping" />
+        <error line="163" column="1" source="standard:max-line-length" />
+        <error line="163" column="141" source="standard:argument-list-wrapping" />
+        <error line="163" column="151" source="standard:argument-list-wrapping" />
+        <error line="175" column="1" source="standard:max-line-length" />
+        <error line="175" column="129" source="standard:argument-list-wrapping" />
+        <error line="175" column="139" source="standard:argument-list-wrapping" />
+        <error line="199" column="1" source="standard:max-line-length" />
+        <error line="199" column="111" source="standard:argument-list-wrapping" />
+        <error line="199" column="121" source="standard:argument-list-wrapping" />
+        <error line="211" column="1" source="standard:max-line-length" />
+        <error line="211" column="117" source="standard:argument-list-wrapping" />
+        <error line="211" column="127" source="standard:argument-list-wrapping" />
+        <error line="223" column="1" source="standard:max-line-length" />
+        <error line="223" column="131" source="standard:argument-list-wrapping" />
+        <error line="223" column="141" source="standard:argument-list-wrapping" />
+        <error line="232" column="1" source="standard:max-line-length" />
+        <error line="232" column="123" source="standard:argument-list-wrapping" />
+        <error line="232" column="133" source="standard:argument-list-wrapping" />
+        <error line="241" column="1" source="standard:max-line-length" />
+        <error line="241" column="138" source="standard:argument-list-wrapping" />
+        <error line="241" column="148" source="standard:argument-list-wrapping" />
+        <error line="251" column="1" source="standard:max-line-length" />
+        <error line="251" column="130" source="standard:argument-list-wrapping" />
+        <error line="251" column="140" source="standard:argument-list-wrapping" />
+        <error line="261" column="1" source="standard:max-line-length" />
+        <error line="272" column="1" source="standard:max-line-length" />
+        <error line="324" column="1" source="standard:max-line-length" />
+        <error line="324" column="136" source="standard:argument-list-wrapping" />
+        <error line="324" column="146" source="standard:argument-list-wrapping" />
+        <error line="334" column="1" source="standard:max-line-length" />
+        <error line="334" column="132" source="standard:argument-list-wrapping" />
+        <error line="334" column="142" source="standard:argument-list-wrapping" />
+        <error line="356" column="1" source="standard:max-line-length" />
+        <error line="356" column="132" source="standard:argument-list-wrapping" />
+        <error line="356" column="142" source="standard:argument-list-wrapping" />
+        <error line="366" column="1" source="standard:max-line-length" />
+        <error line="366" column="128" source="standard:argument-list-wrapping" />
+        <error line="366" column="138" source="standard:argument-list-wrapping" />
+        <error line="388" column="1" source="standard:max-line-length" />
+        <error line="388" column="114" source="standard:argument-list-wrapping" />
+        <error line="388" column="124" source="standard:argument-list-wrapping" />
+        <error line="427" column="1" source="standard:max-line-length" />
+        <error line="427" column="137" source="standard:argument-list-wrapping" />
+        <error line="427" column="147" source="standard:argument-list-wrapping" />
+        <error line="440" column="1" source="standard:max-line-length" />
+        <error line="440" column="129" source="standard:argument-list-wrapping" />
+        <error line="440" column="139" source="standard:argument-list-wrapping" />
+        <error line="455" column="1" source="standard:max-line-length" />
+        <error line="455" column="131" source="standard:argument-list-wrapping" />
+        <error line="455" column="141" source="standard:argument-list-wrapping" />
+        <error line="470" column="1" source="standard:max-line-length" />
+        <error line="470" column="122" source="standard:argument-list-wrapping" />
+        <error line="470" column="132" source="standard:argument-list-wrapping" />
+        <error line="483" column="1" source="standard:max-line-length" />
+        <error line="483" column="125" source="standard:argument-list-wrapping" />
+        <error line="483" column="135" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsServiceTest.kt">
+        <error line="42" column="1" source="standard:max-line-length" />
+        <error line="42" column="23" source="standard:property-wrapping" />
+        <error line="42" column="34" source="standard:argument-list-wrapping" />
+        <error line="42" column="53" source="standard:argument-list-wrapping" />
+        <error line="42" column="72" source="standard:argument-list-wrapping" />
+        <error line="42" column="95" source="standard:argument-list-wrapping" />
+        <error line="42" column="116" source="standard:argument-list-wrapping" />
+        <error line="42" column="129" source="standard:argument-list-wrapping" />
+        <error line="54" column="1" source="standard:max-line-length" />
+        <error line="73" column="1" source="standard:max-line-length" />
+        <error line="92" column="1" source="standard:max-line-length" />
+        <error line="94" column="1" source="standard:max-line-length" />
+        <error line="94" column="51" source="standard:argument-list-wrapping" />
+        <error line="94" column="144" source="standard:argument-list-wrapping" />
+        <error line="97" column="1" source="standard:max-line-length" />
+        <error line="97" column="23" source="standard:property-wrapping" />
+        <error line="97" column="34" source="standard:argument-list-wrapping" />
+        <error line="97" column="53" source="standard:argument-list-wrapping" />
+        <error line="97" column="72" source="standard:argument-list-wrapping" />
+        <error line="97" column="95" source="standard:argument-list-wrapping" />
+        <error line="97" column="116" source="standard:argument-list-wrapping" />
+        <error line="97" column="129" source="standard:argument-list-wrapping" />
+        <error line="124" column="1" source="standard:max-line-length" />
+        <error line="124" column="60" source="standard:argument-list-wrapping" />
+        <error line="124" column="136" source="standard:argument-list-wrapping" />
+        <error line="132" column="1" source="standard:max-line-length" />
+        <error line="132" column="60" source="standard:argument-list-wrapping" />
+        <error line="132" column="183" source="standard:argument-list-wrapping" />
+        <error line="140" column="1" source="standard:max-line-length" />
+        <error line="140" column="60" source="standard:argument-list-wrapping" />
+        <error line="140" column="183" source="standard:argument-list-wrapping" />
+        <error line="147" column="1" source="standard:max-line-length" />
+        <error line="147" column="54" source="standard:argument-list-wrapping" />
+        <error line="147" column="142" source="standard:argument-list-wrapping" />
+        <error line="148" column="1" source="standard:max-line-length" />
+        <error line="148" column="32" source="standard:property-wrapping" />
+        <error line="148" column="43" source="standard:argument-list-wrapping" />
+        <error line="148" column="56" source="standard:argument-list-wrapping" />
+        <error line="148" column="69" source="standard:argument-list-wrapping" />
+        <error line="148" column="84" source="standard:argument-list-wrapping" />
+        <error line="148" column="172" source="standard:argument-list-wrapping" />
+        <error line="148" column="181" source="standard:argument-list-wrapping" />
+        <error line="164" column="1" source="standard:max-line-length" />
+        <error line="176" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/metrics/MetricControllerTest.kt">
+        <error line="590" column="1" source="standard:max-line-length" />
+        <error line="591" column="1" source="standard:max-line-length" />
+        <error line="648" column="1" source="standard:max-line-length" />
+        <error line="648" column="19" source="standard:property-wrapping" />
+        <error line="648" column="25" source="standard:argument-list-wrapping" />
+        <error line="648" column="55" source="standard:argument-list-wrapping" />
+        <error line="648" column="70" source="standard:argument-list-wrapping" />
+        <error line="648" column="122" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTest.kt">
+        <error line="96" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTestRobolectric.kt">
+        <error line="214" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenterTest.kt">
+        <error line="52" column="1" source="standard:max-line-length" />
+        <error line="75" column="1" source="standard:max-line-length" />
+        <error line="175" column="1" source="standard:max-line-length" />
+        <error line="231" column="1" source="standard:max-line-length" />
+        <error line="294" column="1" source="standard:max-line-length" />
+        <error line="325" column="1" source="standard:max-line-length" />
+        <error line="338" column="1" source="standard:max-line-length" />
+        <error line="362" column="1" source="standard:max-line-length" />
+        <error line="378" column="1" source="standard:max-line-length" />
+        <error line="397" column="1" source="standard:max-line-length" />
+        <error line="412" column="1" source="standard:max-line-length" />
+        <error line="424" column="1" source="standard:max-line-length" />
+        <error line="440" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt">
+        <error line="58" column="1" source="standard:max-line-length" />
+        <error line="84" column="1" source="standard:max-line-length" />
+        <error line="97" column="1" source="standard:max-line-length" />
+        <error line="110" column="1" source="standard:max-line-length" />
+        <error line="138" column="1" source="standard:max-line-length" />
+        <error line="151" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt">
+        <error line="151" column="1" source="standard:max-line-length" />
+        <error line="151" column="16" source="standard:wrapping" />
+        <error line="151" column="107" source="standard:wrapping" />
+        <error line="151" column="135" source="standard:argument-list-wrapping" />
+        <error line="151" column="139" source="standard:argument-list-wrapping" />
+        <error line="304" column="1" source="standard:max-line-length" />
+        <error line="339" column="1" source="standard:max-line-length" />
+        <error line="687" column="1" source="standard:max-line-length" />
+        <error line="722" column="1" source="standard:max-line-length" />
+        <error line="790" column="1" source="standard:max-line-length" />
+        <error line="801" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/compose/LinkTextTest.kt">
+        <error line="60" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/crashes/CrashContentViewTest.kt">
+        <error line="92" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/crashes/CrashReporterControllerTest.kt">
+        <error line="58" column="1" source="standard:max-line-length" />
+        <error line="69" column="1" source="standard:max-line-length" />
+        <error line="80" column="1" source="standard:max-line-length" />
+        <error line="85" column="1" source="standard:max-line-length" />
+        <error line="85" column="46" source="standard:argument-list-wrapping" />
+        <error line="85" column="57" source="standard:argument-list-wrapping" />
+        <error line="85" column="60" source="standard:argument-list-wrapping" />
+        <error line="85" column="72" source="standard:argument-list-wrapping" />
+        <error line="85" column="102" source="standard:argument-list-wrapping" />
+        <error line="85" column="117" source="standard:argument-list-wrapping" />
+        <error line="85" column="125" source="standard:argument-list-wrapping" />
+        <error line="94" column="1" source="standard:max-line-length" />
+        <error line="99" column="1" source="standard:max-line-length" />
+        <error line="99" column="46" source="standard:argument-list-wrapping" />
+        <error line="99" column="57" source="standard:argument-list-wrapping" />
+        <error line="99" column="60" source="standard:argument-list-wrapping" />
+        <error line="99" column="72" source="standard:argument-list-wrapping" />
+        <error line="99" column="103" source="standard:argument-list-wrapping" />
+        <error line="99" column="118" source="standard:argument-list-wrapping" />
+        <error line="99" column="126" source="standard:argument-list-wrapping" />
+        <error line="108" column="1" source="standard:max-line-length" />
+        <error line="113" column="1" source="standard:max-line-length" />
+        <error line="113" column="46" source="standard:argument-list-wrapping" />
+        <error line="113" column="57" source="standard:argument-list-wrapping" />
+        <error line="113" column="60" source="standard:argument-list-wrapping" />
+        <error line="113" column="72" source="standard:argument-list-wrapping" />
+        <error line="113" column="103" source="standard:argument-list-wrapping" />
+        <error line="113" column="118" source="standard:argument-list-wrapping" />
+        <error line="113" column="126" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivityTest.kt">
+        <error line="117" column="1" source="standard:max-line-length" />
+        <error line="145" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessorTest.kt">
+        <error line="32" column="1" source="standard:max-line-length" />
+        <error line="32" column="19" source="standard:property-wrapping" />
+        <error line="32" column="25" source="standard:argument-list-wrapping" />
+        <error line="32" column="140" source="standard:argument-list-wrapping" />
+        <error line="40" column="1" source="standard:max-line-length" />
+        <error line="40" column="19" source="standard:property-wrapping" />
+        <error line="40" column="25" source="standard:argument-list-wrapping" />
+        <error line="40" column="134" source="standard:argument-list-wrapping" />
+        <error line="56" column="1" source="standard:max-line-length" />
+        <error line="56" column="19" source="standard:property-wrapping" />
+        <error line="56" column="25" source="standard:argument-list-wrapping" />
+        <error line="56" column="125" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/debugsettings/DefaultDebugSettingsRepositoryTest.kt">
+        <error line="18" column="1" source="standard:max-line-length" />
+        <error line="18" column="83" source="standard:argument-list-wrapping" />
+        <error line="18" column="126" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/downloads/DynamicDownloadDialogBehaviorTest.kt">
+        <error line="232" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/downloads/FirstPartyDownloadDialogTest.kt">
+        <error line="38" column="1" source="standard:max-line-length" />
+        <error line="79" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/downloads/StartDownloadDialogTest.kt">
+        <error line="84" column="1" source="standard:max-line-length" />
+        <error line="176" column="1" source="standard:max-line-length" />
+        <error line="176" column="26" source="standard:argument-list-wrapping" />
+        <error line="176" column="51" source="standard:argument-list-wrapping" />
+        <error line="176" column="123" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/ext/ActivityTest.kt">
+        <error line="29" column="1" source="standard:max-line-length" />
+        <error line="29" column="105" source="standard:argument-list-wrapping" />
+        <error line="29" column="151" source="standard:argument-list-wrapping" />
+        <error line="32" column="1" source="standard:max-line-length" />
+        <error line="32" column="20" source="standard:property-wrapping" />
+        <error line="32" column="29" source="standard:argument-list-wrapping" />
+        <error line="32" column="73" source="standard:argument-list-wrapping" />
+        <error line="32" column="112" source="standard:argument-list-wrapping" />
+        <error line="32" column="149" source="standard:argument-list-wrapping" />
+        <error line="32" column="181" source="standard:argument-list-wrapping" />
+        <error line="32" column="217" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/ext/AppStateTest.kt">
+        <error line="39" column="1" source="standard:max-line-length" />
+        <error line="58" column="1" source="standard:max-line-length" />
+        <error line="77" column="1" source="standard:max-line-length" />
+        <error line="105" column="1" source="standard:max-line-length" />
+        <error line="149" column="1" source="standard:max-line-length" />
+        <error line="170" column="1" source="standard:max-line-length" />
+        <error line="222" column="1" source="standard:max-line-length" />
+        <error line="226" column="1" source="standard:max-line-length" />
+        <error line="226" column="56" source="standard:argument-list-wrapping" />
+        <error line="226" column="97" source="standard:argument-list-wrapping" />
+        <error line="226" column="122" source="standard:argument-list-wrapping" />
+        <error line="226" column="123" source="standard:argument-list-wrapping" />
+        <error line="244" column="1" source="standard:max-line-length" />
+        <error line="278" column="1" source="standard:max-line-length" />
+        <error line="314" column="1" source="standard:max-line-length" />
+        <error line="333" column="1" source="standard:max-line-length" />
+        <error line="361" column="1" source="standard:max-line-length" />
+        <error line="374" column="1" source="standard:max-line-length" />
+        <error line="382" column="1" source="standard:max-line-length" />
+        <error line="411" column="1" source="standard:max-line-length" />
+        <error line="427" column="1" source="standard:max-line-length" />
+        <error line="443" column="1" source="standard:max-line-length" />
+        <error line="497" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/ext/BrowserStateTest.kt">
+        <error line="46" column="1" source="standard:max-line-length" />
+        <error line="60" column="1" source="standard:max-line-length" />
+        <error line="79" column="1" source="standard:max-line-length" />
+        <error line="98" column="1" source="standard:max-line-length" />
+        <error line="124" column="1" source="standard:max-line-length" />
+        <error line="167" column="1" source="standard:max-line-length" />
+        <error line="211" column="1" source="standard:max-line-length" />
+        <error line="253" column="1" source="standard:max-line-length" />
+        <error line="263" column="1" source="standard:max-line-length" />
+        <error line="275" column="1" source="standard:max-line-length" />
+        <error line="347" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/ext/ContextTest.kt">
+        <error line="95" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/ext/DownloadItemKtTest.kt">
+        <error line="31" column="1" source="standard:max-line-length" />
+        <error line="31" column="22" source="standard:argument-list-wrapping" />
+        <error line="31" column="51" source="standard:argument-list-wrapping" />
+        <error line="31" column="122" source="standard:argument-list-wrapping" />
+        <error line="32" column="1" source="standard:max-line-length" />
+        <error line="32" column="22" source="standard:argument-list-wrapping" />
+        <error line="32" column="51" source="standard:argument-list-wrapping" />
+        <error line="32" column="122" source="standard:argument-list-wrapping" />
+        <error line="33" column="1" source="standard:max-line-length" />
+        <error line="33" column="22" source="standard:argument-list-wrapping" />
+        <error line="33" column="56" source="standard:argument-list-wrapping" />
+        <error line="33" column="127" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/ext/TopSiteTest.kt">
+        <error line="58" column="1" source="standard:max-line-length" />
+        <error line="72" column="1" source="standard:max-line-length" />
+        <error line="94" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/ext/UriTest.kt">
+        <error line="18" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/extension/WebExtensionPromptFeatureTest.kt">
+        <error line="91" column="1" source="standard:max-line-length" />
+        <error line="146" column="1" source="standard:max-line-length" />
+        <error line="163" column="1" source="standard:max-line-length" />
+        <error line="197" column="1" source="standard:max-line-length" />
+        <error line="242" column="1" source="standard:max-line-length" />
+        <error line="273" column="1" source="standard:max-line-length" />
+        <error line="312" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt">
+        <error line="1064" column="1" source="standard:max-line-length" />
+        <error line="1075" column="1" source="standard:max-line-length" />
+        <error line="1086" column="1" source="standard:max-line-length" />
+        <error line="1097" column="1" source="standard:max-line-length" />
+        <error line="1108" column="1" source="standard:max-line-length" />
+        <error line="1168" column="1" source="standard:max-line-length" />
+        <error line="1178" column="1" source="standard:max-line-length" />
+        <error line="1190" column="1" source="standard:max-line-length" />
+        <error line="1202" column="1" source="standard:max-line-length" />
+        <error line="1215" column="1" source="standard:max-line-length" />
+        <error line="1267" column="1" source="standard:max-line-length" />
+        <error line="1285" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/HomeFragmentTest.kt">
+        <error line="77" column="1" source="standard:max-line-length" />
+        <error line="87" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/HomeMenuViewTest.kt">
+        <error line="115" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/PocketUpdatesMiddlewareTest.kt">
+        <error line="88" column="1" source="standard:max-line-length" />
+        <error line="188" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/RecentTabsListFeatureTest.kt">
+        <error line="59" column="1" source="standard:max-line-length" />
+        <error line="75" column="1" source="standard:max-line-length" />
+        <error line="123" column="1" source="standard:max-line-length" />
+        <error line="153" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/blocklist/BlocklistHandlerTest.kt">
+        <error line="159" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/blocklist/BlocklistMiddlewareTest.kt">
+        <error line="88" column="1" source="standard:max-line-length" />
+        <error line="91" column="1" source="standard:max-line-length" />
+        <error line="91" column="66" source="standard:argument-list-wrapping" />
+        <error line="91" column="122" source="standard:argument-list-wrapping" />
+        <error line="142" column="1" source="standard:max-line-length" />
+        <error line="361" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/intent/HomeDeepLinkIntentProcessorTest.kt">
+        <error line="239" column="1" source="standard:max-line-length" />
+        <error line="239" column="20" source="standard:argument-list-wrapping" />
+        <error line="239" column="45" source="standard:argument-list-wrapping" />
+        <error line="239" column="111" source="standard:argument-list-wrapping" />
+        <error line="239" column="126" source="standard:argument-list-wrapping" />
+        <error line="239" column="129" source="standard:argument-list-wrapping" />
+        <error line="239" column="130" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/intent/OpenSpecificTabIntentProcessorTest.kt">
+        <error line="72" column="1" source="standard:max-line-length" />
+        <error line="72" column="20" source="standard:property-wrapping" />
+        <error line="72" column="34" source="standard:argument-list-wrapping" />
+        <error line="72" column="121" source="standard:argument-list-wrapping" />
+        <error line="85" column="1" source="standard:max-line-length" />
+        <error line="90" column="1" source="standard:max-line-length" />
+        <error line="90" column="20" source="standard:property-wrapping" />
+        <error line="90" column="34" source="standard:argument-list-wrapping" />
+        <error line="90" column="121" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/pocket/DefaultPocketStoriesControllerTest.kt">
+        <error line="73" column="1" source="standard:max-line-length" />
+        <error line="77" column="1" source="standard:max-line-length" />
+        <error line="77" column="37" source="standard:property-wrapping" />
+        <error line="77" column="79" source="standard:argument-list-wrapping" />
+        <error line="77" column="112" source="standard:argument-list-wrapping" />
+        <error line="77" column="134" source="standard:argument-list-wrapping" />
+        <error line="82" column="1" source="standard:max-line-length" />
+        <error line="82" column="34" source="standard:property-wrapping" />
+        <error line="82" column="76" source="standard:argument-list-wrapping" />
+        <error line="82" column="106" source="standard:argument-list-wrapping" />
+        <error line="82" column="133" source="standard:argument-list-wrapping" />
+        <error line="119" column="1" source="standard:max-line-length" />
+        <error line="123" column="1" source="standard:max-line-length" />
+        <error line="123" column="37" source="standard:property-wrapping" />
+        <error line="123" column="79" source="standard:argument-list-wrapping" />
+        <error line="123" column="112" source="standard:argument-list-wrapping" />
+        <error line="123" column="134" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/privatebrowsing/DefaultPrivateBrowsingControllerTest.kt">
+        <error line="62" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt">
+        <error line="89" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/recentsyncedtabs/RecentSyncedTabFeatureTest.kt">
+        <error line="131" column="1" source="standard:max-line-length" />
+        <error line="144" column="1" source="standard:max-line-length" />
+        <error line="144" column="19" source="standard:wrapping" />
+        <error line="144" column="43" source="standard:argument-list-wrapping" />
+        <error line="144" column="69" source="standard:argument-list-wrapping" />
+        <error line="144" column="86" source="standard:argument-list-wrapping" />
+        <error line="144" column="114" source="standard:argument-list-wrapping" />
+        <error line="144" column="129" source="standard:argument-list-wrapping" />
+        <error line="144" column="130" source="standard:argument-list-wrapping" />
+        <error line="148" column="1" source="standard:max-line-length" />
+        <error line="187" column="1" source="standard:max-line-length" />
+        <error line="221" column="1" source="standard:max-line-length" />
+        <error line="249" column="1" source="standard:max-line-length" />
+        <error line="276" column="1" source="standard:max-line-length" />
+        <error line="412" column="1" source="standard:max-line-length" />
+        <error line="462" column="1" source="standard:max-line-length" />
+        <error line="487" column="1" source="standard:max-line-length" />
+        <error line="515" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddlewareTest.kt">
+        <error line="92" column="1" source="standard:max-line-length" />
+        <error line="105" column="1" source="standard:max-line-length" />
+        <error line="120" column="1" source="standard:max-line-length" />
+        <error line="135" column="1" source="standard:max-line-length" />
+        <error line="135" column="24" source="standard:argument-list-wrapping" />
+        <error line="135" column="63" source="standard:argument-list-wrapping" />
+        <error line="135" column="71" source="standard:argument-list-wrapping" />
+        <error line="135" column="118" source="standard:argument-list-wrapping" />
+        <error line="135" column="134" source="standard:argument-list-wrapping" />
+        <error line="135" column="135" source="standard:argument-list-wrapping" />
+        <error line="145" column="1" source="standard:max-line-length" />
+        <error line="159" column="1" source="standard:max-line-length" />
+        <error line="159" column="24" source="standard:argument-list-wrapping" />
+        <error line="159" column="63" source="standard:argument-list-wrapping" />
+        <error line="159" column="71" source="standard:argument-list-wrapping" />
+        <error line="159" column="78" source="standard:argument-list-wrapping" />
+        <error line="159" column="90" source="standard:argument-list-wrapping" />
+        <error line="159" column="107" source="standard:argument-list-wrapping" />
+        <error line="159" column="127" source="standard:argument-list-wrapping" />
+        <error line="159" column="130" source="standard:argument-list-wrapping" />
+        <error line="159" column="142" source="standard:argument-list-wrapping" />
+        <error line="159" column="159" source="standard:argument-list-wrapping" />
+        <error line="159" column="166" source="standard:argument-list-wrapping" />
+        <error line="159" column="167" source="standard:argument-list-wrapping" />
+        <error line="159" column="170" source="standard:argument-list-wrapping" />
+        <error line="159" column="186" source="standard:argument-list-wrapping" />
+        <error line="159" column="187" source="standard:argument-list-wrapping" />
+        <error line="169" column="1" source="standard:max-line-length" />
+        <error line="195" column="1" source="standard:max-line-length" />
+        <error line="195" column="24" source="standard:argument-list-wrapping" />
+        <error line="195" column="63" source="standard:argument-list-wrapping" />
+        <error line="195" column="77" source="standard:argument-list-wrapping" />
+        <error line="195" column="84" source="standard:argument-list-wrapping" />
+        <error line="195" column="96" source="standard:argument-list-wrapping" />
+        <error line="195" column="124" source="standard:argument-list-wrapping" />
+        <error line="195" column="162" source="standard:argument-list-wrapping" />
+        <error line="195" column="163" source="standard:argument-list-wrapping" />
+        <error line="195" column="166" source="standard:argument-list-wrapping" />
+        <error line="195" column="167" source="standard:argument-list-wrapping" />
+        <error line="195" column="168" source="standard:argument-list-wrapping" />
+        <error line="196" column="1" source="standard:max-line-length" />
+        <error line="196" column="24" source="standard:argument-list-wrapping" />
+        <error line="196" column="63" source="standard:argument-list-wrapping" />
+        <error line="196" column="71" source="standard:argument-list-wrapping" />
+        <error line="196" column="78" source="standard:argument-list-wrapping" />
+        <error line="196" column="90" source="standard:argument-list-wrapping" />
+        <error line="196" column="94" source="standard:argument-list-wrapping" />
+        <error line="196" column="134" source="standard:argument-list-wrapping" />
+        <error line="196" column="135" source="standard:argument-list-wrapping" />
+        <error line="196" column="138" source="standard:argument-list-wrapping" />
+        <error line="196" column="154" source="standard:argument-list-wrapping" />
+        <error line="196" column="155" source="standard:argument-list-wrapping" />
+        <error line="204" column="1" source="standard:max-line-length" />
+        <error line="204" column="24" source="standard:argument-list-wrapping" />
+        <error line="204" column="63" source="standard:argument-list-wrapping" />
+        <error line="204" column="77" source="standard:argument-list-wrapping" />
+        <error line="204" column="84" source="standard:argument-list-wrapping" />
+        <error line="204" column="96" source="standard:argument-list-wrapping" />
+        <error line="204" column="124" source="standard:argument-list-wrapping" />
+        <error line="204" column="162" source="standard:argument-list-wrapping" />
+        <error line="204" column="165" source="standard:argument-list-wrapping" />
+        <error line="204" column="177" source="standard:argument-list-wrapping" />
+        <error line="204" column="188" source="standard:argument-list-wrapping" />
+        <error line="204" column="209" source="standard:argument-list-wrapping" />
+        <error line="204" column="210" source="standard:argument-list-wrapping" />
+        <error line="204" column="213" source="standard:argument-list-wrapping" />
+        <error line="204" column="214" source="standard:argument-list-wrapping" />
+        <error line="204" column="215" source="standard:argument-list-wrapping" />
+        <error line="214" column="1" source="standard:max-line-length" />
+        <error line="214" column="24" source="standard:argument-list-wrapping" />
+        <error line="214" column="63" source="standard:argument-list-wrapping" />
+        <error line="214" column="71" source="standard:argument-list-wrapping" />
+        <error line="214" column="78" source="standard:argument-list-wrapping" />
+        <error line="214" column="90" source="standard:argument-list-wrapping" />
+        <error line="214" column="101" source="standard:argument-list-wrapping" />
+        <error line="214" column="122" source="standard:argument-list-wrapping" />
+        <error line="214" column="123" source="standard:argument-list-wrapping" />
+        <error line="214" column="126" source="standard:argument-list-wrapping" />
+        <error line="214" column="142" source="standard:argument-list-wrapping" />
+        <error line="214" column="143" source="standard:argument-list-wrapping" />
+        <error line="226" column="1" source="standard:max-line-length" />
+        <error line="226" column="24" source="standard:argument-list-wrapping" />
+        <error line="226" column="63" source="standard:argument-list-wrapping" />
+        <error line="226" column="71" source="standard:argument-list-wrapping" />
+        <error line="226" column="78" source="standard:argument-list-wrapping" />
+        <error line="226" column="90" source="standard:argument-list-wrapping" />
+        <error line="226" column="101" source="standard:argument-list-wrapping" />
+        <error line="226" column="122" source="standard:argument-list-wrapping" />
+        <error line="226" column="125" source="standard:argument-list-wrapping" />
+        <error line="226" column="137" source="standard:argument-list-wrapping" />
+        <error line="226" column="158" source="standard:argument-list-wrapping" />
+        <error line="226" column="189" source="standard:argument-list-wrapping" />
+        <error line="226" column="190" source="standard:argument-list-wrapping" />
+        <error line="226" column="193" source="standard:argument-list-wrapping" />
+        <error line="226" column="209" source="standard:argument-list-wrapping" />
+        <error line="226" column="210" source="standard:argument-list-wrapping" />
+        <error line="239" column="1" source="standard:max-line-length" />
+        <error line="265" column="1" source="standard:max-line-length" />
+        <error line="265" column="24" source="standard:argument-list-wrapping" />
+        <error line="265" column="63" source="standard:argument-list-wrapping" />
+        <error line="265" column="77" source="standard:argument-list-wrapping" />
+        <error line="265" column="84" source="standard:argument-list-wrapping" />
+        <error line="265" column="96" source="standard:argument-list-wrapping" />
+        <error line="265" column="124" source="standard:argument-list-wrapping" />
+        <error line="265" column="162" source="standard:argument-list-wrapping" />
+        <error line="265" column="163" source="standard:argument-list-wrapping" />
+        <error line="265" column="166" source="standard:argument-list-wrapping" />
+        <error line="265" column="167" source="standard:argument-list-wrapping" />
+        <error line="265" column="168" source="standard:argument-list-wrapping" />
+        <error line="271" column="1" source="standard:max-line-length" />
+        <error line="271" column="24" source="standard:argument-list-wrapping" />
+        <error line="271" column="74" source="standard:argument-list-wrapping" />
+        <error line="271" column="82" source="standard:argument-list-wrapping" />
+        <error line="271" column="101" source="standard:argument-list-wrapping" />
+        <error line="271" column="147" source="standard:argument-list-wrapping" />
+        <error line="271" column="153" source="standard:argument-list-wrapping" />
+        <error line="271" column="157" source="standard:argument-list-wrapping" />
+        <error line="271" column="158" source="standard:argument-list-wrapping" />
+        <error line="271" column="159" source="standard:argument-list-wrapping" />
+        <error line="277" column="1" source="standard:max-line-length" />
+        <error line="277" column="24" source="standard:argument-list-wrapping" />
+        <error line="277" column="63" source="standard:argument-list-wrapping" />
+        <error line="277" column="71" source="standard:argument-list-wrapping" />
+        <error line="277" column="78" source="standard:argument-list-wrapping" />
+        <error line="277" column="90" source="standard:argument-list-wrapping" />
+        <error line="277" column="94" source="standard:argument-list-wrapping" />
+        <error line="277" column="138" source="standard:argument-list-wrapping" />
+        <error line="277" column="139" source="standard:argument-list-wrapping" />
+        <error line="277" column="142" source="standard:argument-list-wrapping" />
+        <error line="277" column="158" source="standard:argument-list-wrapping" />
+        <error line="277" column="159" source="standard:argument-list-wrapping" />
+        <error line="279" column="1" source="standard:max-line-length" />
+        <error line="279" column="24" source="standard:argument-list-wrapping" />
+        <error line="279" column="63" source="standard:argument-list-wrapping" />
+        <error line="279" column="71" source="standard:argument-list-wrapping" />
+        <error line="279" column="78" source="standard:argument-list-wrapping" />
+        <error line="279" column="90" source="standard:argument-list-wrapping" />
+        <error line="279" column="101" source="standard:argument-list-wrapping" />
+        <error line="279" column="122" source="standard:argument-list-wrapping" />
+        <error line="279" column="123" source="standard:argument-list-wrapping" />
+        <error line="279" column="126" source="standard:argument-list-wrapping" />
+        <error line="279" column="142" source="standard:argument-list-wrapping" />
+        <error line="279" column="143" source="standard:argument-list-wrapping" />
+        <error line="280" column="1" source="standard:max-line-length" />
+        <error line="280" column="24" source="standard:argument-list-wrapping" />
+        <error line="280" column="63" source="standard:argument-list-wrapping" />
+        <error line="280" column="77" source="standard:argument-list-wrapping" />
+        <error line="280" column="84" source="standard:argument-list-wrapping" />
+        <error line="280" column="96" source="standard:argument-list-wrapping" />
+        <error line="280" column="124" source="standard:argument-list-wrapping" />
+        <error line="280" column="162" source="standard:argument-list-wrapping" />
+        <error line="280" column="165" source="standard:argument-list-wrapping" />
+        <error line="280" column="177" source="standard:argument-list-wrapping" />
+        <error line="280" column="188" source="standard:argument-list-wrapping" />
+        <error line="280" column="209" source="standard:argument-list-wrapping" />
+        <error line="280" column="210" source="standard:argument-list-wrapping" />
+        <error line="280" column="213" source="standard:argument-list-wrapping" />
+        <error line="280" column="214" source="standard:argument-list-wrapping" />
+        <error line="280" column="215" source="standard:argument-list-wrapping" />
+        <error line="327" column="1" source="standard:max-line-length" />
+        <error line="327" column="24" source="standard:argument-list-wrapping" />
+        <error line="327" column="63" source="standard:argument-list-wrapping" />
+        <error line="327" column="77" source="standard:argument-list-wrapping" />
+        <error line="327" column="84" source="standard:argument-list-wrapping" />
+        <error line="327" column="96" source="standard:argument-list-wrapping" />
+        <error line="327" column="124" source="standard:argument-list-wrapping" />
+        <error line="327" column="162" source="standard:argument-list-wrapping" />
+        <error line="327" column="163" source="standard:argument-list-wrapping" />
+        <error line="327" column="166" source="standard:argument-list-wrapping" />
+        <error line="327" column="167" source="standard:argument-list-wrapping" />
+        <error line="327" column="168" source="standard:argument-list-wrapping" />
+        <error line="328" column="1" source="standard:max-line-length" />
+        <error line="328" column="24" source="standard:argument-list-wrapping" />
+        <error line="328" column="63" source="standard:argument-list-wrapping" />
+        <error line="328" column="71" source="standard:argument-list-wrapping" />
+        <error line="328" column="78" source="standard:argument-list-wrapping" />
+        <error line="328" column="90" source="standard:argument-list-wrapping" />
+        <error line="328" column="94" source="standard:argument-list-wrapping" />
+        <error line="328" column="134" source="standard:argument-list-wrapping" />
+        <error line="328" column="135" source="standard:argument-list-wrapping" />
+        <error line="328" column="138" source="standard:argument-list-wrapping" />
+        <error line="328" column="154" source="standard:argument-list-wrapping" />
+        <error line="328" column="155" source="standard:argument-list-wrapping" />
+        <error line="336" column="1" source="standard:max-line-length" />
+        <error line="336" column="24" source="standard:argument-list-wrapping" />
+        <error line="336" column="63" source="standard:argument-list-wrapping" />
+        <error line="336" column="71" source="standard:argument-list-wrapping" />
+        <error line="336" column="78" source="standard:argument-list-wrapping" />
+        <error line="336" column="90" source="standard:argument-list-wrapping" />
+        <error line="336" column="94" source="standard:argument-list-wrapping" />
+        <error line="336" column="134" source="standard:argument-list-wrapping" />
+        <error line="336" column="137" source="standard:argument-list-wrapping" />
+        <error line="336" column="149" source="standard:argument-list-wrapping" />
+        <error line="336" column="160" source="standard:argument-list-wrapping" />
+        <error line="336" column="181" source="standard:argument-list-wrapping" />
+        <error line="336" column="182" source="standard:argument-list-wrapping" />
+        <error line="336" column="185" source="standard:argument-list-wrapping" />
+        <error line="336" column="186" source="standard:argument-list-wrapping" />
+        <error line="336" column="187" source="standard:argument-list-wrapping" />
+        <error line="348" column="1" source="standard:max-line-length" />
+        <error line="348" column="24" source="standard:argument-list-wrapping" />
+        <error line="348" column="63" source="standard:argument-list-wrapping" />
+        <error line="348" column="77" source="standard:argument-list-wrapping" />
+        <error line="348" column="84" source="standard:argument-list-wrapping" />
+        <error line="348" column="96" source="standard:argument-list-wrapping" />
+        <error line="348" column="124" source="standard:argument-list-wrapping" />
+        <error line="348" column="162" source="standard:argument-list-wrapping" />
+        <error line="348" column="165" source="standard:argument-list-wrapping" />
+        <error line="348" column="177" source="standard:argument-list-wrapping" />
+        <error line="348" column="188" source="standard:argument-list-wrapping" />
+        <error line="348" column="209" source="standard:argument-list-wrapping" />
+        <error line="348" column="210" source="standard:argument-list-wrapping" />
+        <error line="348" column="213" source="standard:argument-list-wrapping" />
+        <error line="348" column="214" source="standard:argument-list-wrapping" />
+        <error line="348" column="215" source="standard:argument-list-wrapping" />
+        <error line="358" column="1" source="standard:max-line-length" />
+        <error line="384" column="1" source="standard:max-line-length" />
+        <error line="384" column="24" source="standard:argument-list-wrapping" />
+        <error line="384" column="63" source="standard:argument-list-wrapping" />
+        <error line="384" column="77" source="standard:argument-list-wrapping" />
+        <error line="384" column="84" source="standard:argument-list-wrapping" />
+        <error line="384" column="96" source="standard:argument-list-wrapping" />
+        <error line="384" column="124" source="standard:argument-list-wrapping" />
+        <error line="384" column="162" source="standard:argument-list-wrapping" />
+        <error line="384" column="163" source="standard:argument-list-wrapping" />
+        <error line="384" column="166" source="standard:argument-list-wrapping" />
+        <error line="384" column="167" source="standard:argument-list-wrapping" />
+        <error line="384" column="168" source="standard:argument-list-wrapping" />
+        <error line="385" column="1" source="standard:max-line-length" />
+        <error line="385" column="24" source="standard:argument-list-wrapping" />
+        <error line="385" column="63" source="standard:argument-list-wrapping" />
+        <error line="385" column="71" source="standard:argument-list-wrapping" />
+        <error line="385" column="78" source="standard:argument-list-wrapping" />
+        <error line="385" column="90" source="standard:argument-list-wrapping" />
+        <error line="385" column="94" source="standard:argument-list-wrapping" />
+        <error line="385" column="134" source="standard:argument-list-wrapping" />
+        <error line="385" column="135" source="standard:argument-list-wrapping" />
+        <error line="385" column="138" source="standard:argument-list-wrapping" />
+        <error line="385" column="154" source="standard:argument-list-wrapping" />
+        <error line="385" column="155" source="standard:argument-list-wrapping" />
+        <error line="393" column="1" source="standard:max-line-length" />
+        <error line="393" column="24" source="standard:argument-list-wrapping" />
+        <error line="393" column="63" source="standard:argument-list-wrapping" />
+        <error line="393" column="71" source="standard:argument-list-wrapping" />
+        <error line="393" column="78" source="standard:argument-list-wrapping" />
+        <error line="393" column="90" source="standard:argument-list-wrapping" />
+        <error line="393" column="94" source="standard:argument-list-wrapping" />
+        <error line="393" column="134" source="standard:argument-list-wrapping" />
+        <error line="393" column="137" source="standard:argument-list-wrapping" />
+        <error line="393" column="149" source="standard:argument-list-wrapping" />
+        <error line="393" column="160" source="standard:argument-list-wrapping" />
+        <error line="393" column="181" source="standard:argument-list-wrapping" />
+        <error line="393" column="182" source="standard:argument-list-wrapping" />
+        <error line="393" column="185" source="standard:argument-list-wrapping" />
+        <error line="393" column="186" source="standard:argument-list-wrapping" />
+        <error line="393" column="187" source="standard:argument-list-wrapping" />
+        <error line="405" column="1" source="standard:max-line-length" />
+        <error line="405" column="24" source="standard:argument-list-wrapping" />
+        <error line="405" column="63" source="standard:argument-list-wrapping" />
+        <error line="405" column="77" source="standard:argument-list-wrapping" />
+        <error line="405" column="84" source="standard:argument-list-wrapping" />
+        <error line="405" column="96" source="standard:argument-list-wrapping" />
+        <error line="405" column="124" source="standard:argument-list-wrapping" />
+        <error line="405" column="162" source="standard:argument-list-wrapping" />
+        <error line="405" column="165" source="standard:argument-list-wrapping" />
+        <error line="405" column="177" source="standard:argument-list-wrapping" />
+        <error line="405" column="188" source="standard:argument-list-wrapping" />
+        <error line="405" column="209" source="standard:argument-list-wrapping" />
+        <error line="405" column="210" source="standard:argument-list-wrapping" />
+        <error line="405" column="213" source="standard:argument-list-wrapping" />
+        <error line="405" column="214" source="standard:argument-list-wrapping" />
+        <error line="405" column="215" source="standard:argument-list-wrapping" />
+        <error line="429" column="1" source="standard:max-line-length" />
+        <error line="446" column="1" source="standard:max-line-length" />
+        <error line="597" column="1" source="standard:max-line-length" />
+        <error line="616" column="1" source="standard:max-line-length" />
+        <error line="632" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataServiceTest.kt">
+        <error line="41" column="1" source="standard:max-line-length" />
+        <error line="47" column="1" source="standard:max-line-length" />
+        <error line="47" column="26" source="standard:property-wrapping" />
+        <error line="47" column="46" source="standard:argument-list-wrapping" />
+        <error line="47" column="69" source="standard:argument-list-wrapping" />
+        <error line="47" column="91" source="standard:argument-list-wrapping" />
+        <error line="47" column="123" source="standard:argument-list-wrapping" />
+        <error line="48" column="1" source="standard:max-line-length" />
+        <error line="48" column="86" source="standard:argument-list-wrapping" />
+        <error line="48" column="121" source="standard:argument-list-wrapping" />
+        <error line="53" column="1" source="standard:max-line-length" />
+        <error line="64" column="1" source="standard:max-line-length" />
+        <error line="71" column="1" source="standard:max-line-length" />
+        <error line="71" column="86" source="standard:argument-list-wrapping" />
+        <error line="71" column="121" source="standard:argument-list-wrapping" />
+        <error line="97" column="1" source="standard:max-line-length" />
+        <error line="107" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/recentvisits/RecentVisitsFeatureTest.kt">
+        <error line="118" column="1" source="standard:max-line-length" />
+        <error line="178" column="1" source="standard:max-line-length" />
+        <error line="237" column="1" source="standard:max-line-length" />
+        <error line="296" column="1" source="standard:max-line-length" />
+        <error line="317" column="1" source="standard:max-line-length" />
+        <error line="337" column="1" source="standard:max-line-length" />
+        <error line="349" column="1" source="standard:max-line-length" />
+        <error line="362" column="1" source="standard:max-line-length" />
+        <error line="409" column="1" source="standard:max-line-length" />
+        <error line="433" column="1" source="standard:max-line-length" />
+        <error line="452" column="1" source="standard:max-line-length" />
+        <error line="468" column="1" source="standard:max-line-length" />
+        <error line="484" column="1" source="standard:max-line-length" />
+        <error line="501" column="1" source="standard:max-line-length" />
+        <error line="522" column="1" source="standard:max-line-length" />
+        <error line="544" column="1" source="standard:max-line-length" />
+        <error line="554" column="1" source="standard:max-line-length" />
+        <error line="567" column="1" source="standard:max-line-length" />
+        <error line="586" column="1" source="standard:max-line-length" />
+        <error line="633" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapterTest.kt">
+        <error line="65" column="1" source="standard:max-line-length" />
+        <error line="78" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/sessioncontrol/SessionControlViewTest.kt">
+        <error line="223" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolderTest.kt">
+        <error line="114" column="1" source="standard:max-line-length" />
+        <error line="141" column="1" source="standard:max-line-length" />
+        <error line="141" column="112" source="standard:argument-list-wrapping" />
+        <error line="141" column="121" source="standard:argument-list-wrapping" />
+        <error line="141" column="129" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/home/topsites/TopSitesPagerAdapterTest.kt">
+        <error line="67" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt">
+        <error line="420" column="1" source="standard:max-line-length" />
+        <error line="529" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/library/bookmarks/DesktopFoldersTest.kt">
+        <error line="49" column="1" source="standard:max-line-length" />
+        <error line="49" column="22" source="standard:argument-list-wrapping" />
+        <error line="49" column="73" source="standard:argument-list-wrapping" />
+        <error line="49" column="91" source="standard:argument-list-wrapping" />
+        <error line="49" column="100" source="standard:argument-list-wrapping" />
+        <error line="49" column="118" source="standard:argument-list-wrapping" />
+        <error line="49" column="124" source="standard:argument-list-wrapping" />
+        <error line="49" column="125" source="standard:argument-list-wrapping" />
+        <error line="49" column="126" source="standard:argument-list-wrapping" />
+        <error line="50" column="1" source="standard:max-line-length" />
+        <error line="50" column="22" source="standard:argument-list-wrapping" />
+        <error line="50" column="73" source="standard:argument-list-wrapping" />
+        <error line="50" column="91" source="standard:argument-list-wrapping" />
+        <error line="50" column="100" source="standard:argument-list-wrapping" />
+        <error line="50" column="118" source="standard:argument-list-wrapping" />
+        <error line="50" column="126" source="standard:argument-list-wrapping" />
+        <error line="50" column="127" source="standard:argument-list-wrapping" />
+        <error line="50" column="128" source="standard:argument-list-wrapping" />
+        <error line="51" column="1" source="standard:max-line-length" />
+        <error line="51" column="22" source="standard:argument-list-wrapping" />
+        <error line="51" column="86" source="standard:argument-list-wrapping" />
+        <error line="51" column="104" source="standard:argument-list-wrapping" />
+        <error line="51" column="113" source="standard:argument-list-wrapping" />
+        <error line="51" column="131" source="standard:argument-list-wrapping" />
+        <error line="51" column="137" source="standard:argument-list-wrapping" />
+        <error line="51" column="138" source="standard:argument-list-wrapping" />
+        <error line="51" column="139" source="standard:argument-list-wrapping" />
+        <error line="52" column="1" source="standard:max-line-length" />
+        <error line="52" column="22" source="standard:argument-list-wrapping" />
+        <error line="52" column="89" source="standard:argument-list-wrapping" />
+        <error line="52" column="107" source="standard:argument-list-wrapping" />
+        <error line="52" column="116" source="standard:argument-list-wrapping" />
+        <error line="52" column="134" source="standard:argument-list-wrapping" />
+        <error line="52" column="143" source="standard:argument-list-wrapping" />
+        <error line="52" column="144" source="standard:argument-list-wrapping" />
+        <error line="52" column="145" source="standard:argument-list-wrapping" />
+        <error line="53" column="1" source="standard:max-line-length" />
+        <error line="53" column="22" source="standard:argument-list-wrapping" />
+        <error line="53" column="89" source="standard:argument-list-wrapping" />
+        <error line="53" column="107" source="standard:argument-list-wrapping" />
+        <error line="53" column="116" source="standard:argument-list-wrapping" />
+        <error line="53" column="134" source="standard:argument-list-wrapping" />
+        <error line="53" column="143" source="standard:argument-list-wrapping" />
+        <error line="53" column="144" source="standard:argument-list-wrapping" />
+        <error line="53" column="145" source="standard:argument-list-wrapping" />
+        <error line="58" column="1" source="standard:max-line-length" />
+        <error line="58" column="22" source="standard:argument-list-wrapping" />
+        <error line="58" column="86" source="standard:argument-list-wrapping" />
+        <error line="58" column="104" source="standard:argument-list-wrapping" />
+        <error line="58" column="113" source="standard:argument-list-wrapping" />
+        <error line="58" column="131" source="standard:argument-list-wrapping" />
+        <error line="58" column="137" source="standard:argument-list-wrapping" />
+        <error line="58" column="140" source="standard:argument-list-wrapping" />
+        <error line="58" column="145" source="standard:argument-list-wrapping" />
+        <error line="58" column="146" source="standard:argument-list-wrapping" />
+        <error line="60" column="1" source="standard:max-line-length" />
+        <error line="60" column="22" source="standard:argument-list-wrapping" />
+        <error line="60" column="86" source="standard:argument-list-wrapping" />
+        <error line="60" column="104" source="standard:argument-list-wrapping" />
+        <error line="60" column="113" source="standard:argument-list-wrapping" />
+        <error line="60" column="131" source="standard:argument-list-wrapping" />
+        <error line="60" column="137" source="standard:argument-list-wrapping" />
+        <error line="60" column="140" source="standard:argument-list-wrapping" />
+        <error line="60" column="145" source="standard:argument-list-wrapping" />
+        <error line="60" column="146" source="standard:argument-list-wrapping" />
+        <error line="61" column="1" source="standard:max-line-length" />
+        <error line="61" column="22" source="standard:argument-list-wrapping" />
+        <error line="61" column="89" source="standard:argument-list-wrapping" />
+        <error line="61" column="107" source="standard:argument-list-wrapping" />
+        <error line="61" column="116" source="standard:argument-list-wrapping" />
+        <error line="61" column="134" source="standard:argument-list-wrapping" />
+        <error line="61" column="143" source="standard:argument-list-wrapping" />
+        <error line="61" column="146" source="standard:argument-list-wrapping" />
+        <error line="61" column="151" source="standard:argument-list-wrapping" />
+        <error line="61" column="152" source="standard:argument-list-wrapping" />
+        <error line="62" column="1" source="standard:max-line-length" />
+        <error line="62" column="22" source="standard:argument-list-wrapping" />
+        <error line="62" column="89" source="standard:argument-list-wrapping" />
+        <error line="62" column="107" source="standard:argument-list-wrapping" />
+        <error line="62" column="116" source="standard:argument-list-wrapping" />
+        <error line="62" column="134" source="standard:argument-list-wrapping" />
+        <error line="62" column="143" source="standard:argument-list-wrapping" />
+        <error line="62" column="146" source="standard:argument-list-wrapping" />
+        <error line="62" column="151" source="standard:argument-list-wrapping" />
+        <error line="62" column="152" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt">
+        <error line="96" column="1" source="standard:max-line-length" />
+        <error line="96" column="25" source="standard:parameter-list-wrapping" />
+        <error line="96" column="39" source="standard:parameter-list-wrapping" />
+        <error line="96" column="60" source="standard:parameter-list-wrapping" />
+        <error line="96" column="91" source="standard:parameter-list-wrapping" />
+        <error line="96" column="122" source="standard:parameter-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/library/history/HistoryFragmentStoreTest.kt">
+        <error line="16" column="1" source="standard:max-line-length" />
+        <error line="16" column="47" source="standard:argument-list-wrapping" />
+        <error line="16" column="50" source="standard:argument-list-wrapping" />
+        <error line="16" column="59" source="standard:argument-list-wrapping" />
+        <error line="16" column="66" source="standard:argument-list-wrapping" />
+        <error line="16" column="78" source="standard:argument-list-wrapping" />
+        <error line="16" column="121" source="standard:argument-list-wrapping" />
+        <error line="16" column="122" source="standard:argument-list-wrapping" />
+        <error line="16" column="123" source="standard:argument-list-wrapping" />
+        <error line="17" column="1" source="standard:max-line-length" />
+        <error line="17" column="50" source="standard:argument-list-wrapping" />
+        <error line="17" column="53" source="standard:argument-list-wrapping" />
+        <error line="17" column="62" source="standard:argument-list-wrapping" />
+        <error line="17" column="69" source="standard:argument-list-wrapping" />
+        <error line="17" column="81" source="standard:argument-list-wrapping" />
+        <error line="17" column="124" source="standard:argument-list-wrapping" />
+        <error line="17" column="125" source="standard:argument-list-wrapping" />
+        <error line="17" column="126" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/library/history/state/HistoryNavigationMiddlewareTest.kt">
+        <error line="189" column="1" source="standard:max-line-length" />
+        <error line="189" column="44" source="standard:argument-list-wrapping" />
+        <error line="189" column="66" source="standard:argument-list-wrapping" />
+        <error line="189" column="117" source="standard:argument-list-wrapping" />
+        <error line="189" column="121" source="standard:argument-list-wrapping" />
+        <error line="189" column="122" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/library/history/state/HistoryStorageMiddlewareTest.kt">
+        <error line="60" column="1" source="standard:max-line-length" />
+        <error line="85" column="1" source="standard:max-line-length" />
+        <error line="142" column="1" source="standard:max-line-length" />
+        <error line="172" column="1" source="standard:max-line-length" />
+        <error line="201" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/library/history/state/HistorySyncMiddlewareTest.kt">
+        <error line="29" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolderTest.kt">
+        <error line="53" column="1" source="standard:max-line-length" />
+        <error line="53" column="92" source="standard:argument-list-wrapping" />
+        <error line="53" column="98" source="standard:argument-list-wrapping" />
+        <error line="53" column="123" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/messaging/state/MessagingMiddlewareTest.kt">
+        <error line="262" column="1" source="standard:max-line-length" />
+        <error line="293" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/messaging/state/MessagingReducerTest.kt">
+        <error line="49" column="1" source="standard:max-line-length" />
+        <error line="49" column="31" source="standard:parameter-list-wrapping" />
+        <error line="49" column="43" source="standard:parameter-list-wrapping" />
+        <error line="49" column="72" source="standard:parameter-list-wrapping" />
+        <error line="49" column="132" source="standard:parameter-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/nimbus/NimbusBranchesStoreTest.kt">
+        <error line="28" column="1" source="standard:max-line-length" />
+        <error line="43" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/nimbus/NimbusSystemTest.kt">
+        <error line="84" column="1" source="standard:max-line-length" />
+        <error line="95" column="1" source="standard:max-line-length" />
+        <error line="105" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt">
+        <error line="14" column="1" source="standard:max-line-length" />
+        <error line="82" column="1" source="standard:max-line-length" />
+        <error line="116" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/perf/ProfilerMarkerFactProcessorTest.kt">
+        <error line="40" column="1" source="standard:max-line-length" />
+        <error line="50" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/perf/StartupPathProviderTest.kt">
+        <error line="56" column="1" source="standard:max-line-length" />
+        <error line="61" column="1" source="standard:max-line-length" />
+        <error line="101" column="1" source="standard:max-line-length" />
+        <error line="120" column="1" source="standard:max-line-length" />
+        <error line="132" column="1" source="standard:max-line-length" />
+        <error line="142" column="1" source="standard:max-line-length" />
+        <error line="152" column="1" source="standard:max-line-length" />
+        <error line="162" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/perf/StartupStateProviderTest.kt">
+        <error line="110" column="1" source="standard:max-line-length" />
+        <error line="126" column="1" source="standard:max-line-length" />
+        <error line="144" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/perf/StartupTypeTelemetryTest.kt">
+        <error line="73" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/perf/StrictModeManagerTest.kt">
+        <error line="74" column="1" source="standard:max-line-length" />
+        <error line="113" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/perf/ThreadPenaltyDeathWithIgnoresListenerTest.kt">
+        <error line="83" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt">
+        <error line="448" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt">
+        <error line="59" column="1" source="standard:max-line-length" />
+        <error line="71" column="1" source="standard:max-line-length" />
+        <error line="85" column="1" source="standard:max-line-length" />
+        <error line="98" column="1" source="standard:max-line-length" />
+        <error line="123" column="1" source="standard:max-line-length" />
+        <error line="149" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt">
+        <error line="232" column="1" source="standard:max-line-length" />
+        <error line="262" column="1" source="standard:max-line-length" />
+        <error line="281" column="1" source="standard:max-line-length" />
+        <error line="300" column="1" source="standard:max-line-length" />
+        <error line="319" column="1" source="standard:max-line-length" />
+        <error line="340" column="1" source="standard:max-line-length" />
+        <error line="364" column="1" source="standard:max-line-length" />
+        <error line="388" column="1" source="standard:max-line-length" />
+        <error line="412" column="1" source="standard:max-line-length" />
+        <error line="436" column="1" source="standard:max-line-length" />
+        <error line="457" column="1" source="standard:max-line-length" />
+        <error line="478" column="1" source="standard:max-line-length" />
+        <error line="499" column="1" source="standard:max-line-length" />
+        <error line="520" column="1" source="standard:max-line-length" />
+        <error line="541" column="1" source="standard:max-line-length" />
+        <error line="563" column="1" source="standard:max-line-length" />
+        <error line="579" column="1" source="standard:max-line-length" />
+        <error line="595" column="1" source="standard:max-line-length" />
+        <error line="611" column="1" source="standard:max-line-length" />
+        <error line="654" column="1" source="standard:max-line-length" />
+        <error line="694" column="1" source="standard:max-line-length" />
+        <error line="766" column="1" source="standard:max-line-length" />
+        <error line="808" column="1" source="standard:max-line-length" />
+        <error line="847" column="1" source="standard:max-line-length" />
+        <error line="897" column="1" source="standard:max-line-length" />
+        <error line="1182" column="1" source="standard:max-line-length" />
+        <error line="1219" column="1" source="standard:max-line-length" />
+        <error line="1234" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt">
+        <error line="90" column="1" source="standard:max-line-length" />
+        <error line="111" column="1" source="standard:max-line-length" />
+        <error line="132" column="1" source="standard:max-line-length" />
+        <error line="153" column="1" source="standard:max-line-length" />
+        <error line="174" column="1" source="standard:max-line-length" />
+        <error line="195" column="1" source="standard:max-line-length" />
+        <error line="216" column="1" source="standard:max-line-length" />
+        <error line="237" column="1" source="standard:max-line-length" />
+        <error line="257" column="1" source="standard:max-line-length" />
+        <error line="282" column="1" source="standard:max-line-length" />
+        <error line="310" column="1" source="standard:max-line-length" />
+        <error line="326" column="1" source="standard:max-line-length" />
+        <error line="326" column="59" source="standard:wrapping" />
+        <error line="330" column="1" source="standard:max-line-length" />
+        <error line="330" column="52" source="standard:wrapping" />
+        <error line="336" column="1" source="standard:max-line-length" />
+        <error line="352" column="1" source="standard:max-line-length" />
+        <error line="352" column="58" source="standard:wrapping" />
+        <error line="356" column="1" source="standard:max-line-length" />
+        <error line="356" column="52" source="standard:wrapping" />
+        <error line="362" column="1" source="standard:max-line-length" />
+        <error line="394" column="1" source="standard:max-line-length" />
+        <error line="426" column="1" source="standard:max-line-length" />
+        <error line="446" column="1" source="standard:max-line-length" />
+        <error line="446" column="59" source="standard:wrapping" />
+        <error line="450" column="1" source="standard:max-line-length" />
+        <error line="450" column="52" source="standard:wrapping" />
+        <error line="456" column="1" source="standard:max-line-length" />
+        <error line="476" column="1" source="standard:max-line-length" />
+        <error line="476" column="58" source="standard:wrapping" />
+        <error line="480" column="1" source="standard:max-line-length" />
+        <error line="480" column="52" source="standard:wrapping" />
+        <error line="486" column="1" source="standard:max-line-length" />
+        <error line="507" column="1" source="standard:max-line-length" />
+        <error line="507" column="59" source="standard:wrapping" />
+        <error line="516" column="1" source="standard:max-line-length" />
+        <error line="537" column="1" source="standard:max-line-length" />
+        <error line="537" column="58" source="standard:wrapping" />
+        <error line="546" column="1" source="standard:max-line-length" />
+        <error line="574" column="1" source="standard:max-line-length" />
+        <error line="602" column="1" source="standard:max-line-length" />
+        <error line="626" column="1" source="standard:max-line-length" />
+        <error line="626" column="52" source="standard:wrapping" />
+        <error line="632" column="1" source="standard:max-line-length" />
+        <error line="656" column="1" source="standard:max-line-length" />
+        <error line="656" column="52" source="standard:wrapping" />
+        <error line="662" column="1" source="standard:max-line-length" />
+        <error line="687" column="1" source="standard:max-line-length" />
+        <error line="712" column="1" source="standard:max-line-length" />
+        <error line="727" column="1" source="standard:max-line-length" />
+        <error line="742" column="1" source="standard:max-line-length" />
+        <error line="768" column="1" source="standard:max-line-length" />
+        <error line="791" column="1" source="standard:max-line-length" />
+        <error line="814" column="1" source="standard:max-line-length" />
+        <error line="836" column="1" source="standard:max-line-length" />
+        <error line="850" column="1" source="standard:max-line-length" />
+        <error line="873" column="1" source="standard:max-line-length" />
+        <error line="896" column="1" source="standard:max-line-length" />
+        <error line="919" column="1" source="standard:max-line-length" />
+        <error line="942" column="1" source="standard:max-line-length" />
+        <error line="965" column="1" source="standard:max-line-length" />
+        <error line="987" column="1" source="standard:max-line-length" />
+        <error line="1000" column="1" source="standard:max-line-length" />
+        <error line="1016" column="1" source="standard:max-line-length" />
+        <error line="1020" column="1" source="standard:max-line-length" />
+        <error line="1026" column="1" source="standard:max-line-length" />
+        <error line="1038" column="1" source="standard:max-line-length" />
+        <error line="1054" column="1" source="standard:max-line-length" />
+        <error line="1058" column="1" source="standard:max-line-length" />
+        <error line="1064" column="1" source="standard:max-line-length" />
+        <error line="1076" column="1" source="standard:max-line-length" />
+        <error line="1106" column="1" source="standard:max-line-length" />
+        <error line="1127" column="1" source="standard:max-line-length" />
+        <error line="1148" column="1" source="standard:max-line-length" />
+        <error line="1169" column="1" source="standard:max-line-length" />
+        <error line="1190" column="1" source="standard:max-line-length" />
+        <error line="1209" column="1" source="standard:max-line-length" />
+        <error line="1248" column="1" source="standard:max-line-length" />
+        <error line="1268" column="1" source="standard:max-line-length" />
+        <error line="1291" column="1" source="standard:max-line-length" />
+        <error line="1312" column="1" source="standard:max-line-length" />
+        <error line="1324" column="1" source="standard:max-line-length" />
+        <error line="1336" column="1" source="standard:max-line-length" />
+        <error line="1350" column="1" source="standard:max-line-length" />
+        <error line="1364" column="1" source="standard:max-line-length" />
+        <error line="1386" column="1" source="standard:max-line-length" />
+        <error line="1410" column="1" source="standard:max-line-length" />
+        <error line="1432" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/search/toolbar/SearchSelectorToolbarActionTest.kt">
+        <error line="165" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt">
+        <error line="160" column="1" source="standard:max-line-length" />
+        <error line="237" column="1" source="standard:max-line-length" />
+        <error line="237" column="88" source="standard:argument-list-wrapping" />
+        <error line="237" column="123" source="standard:argument-list-wrapping" />
+        <error line="259" column="1" source="standard:max-line-length" />
+        <error line="259" column="94" source="standard:argument-list-wrapping" />
+        <error line="259" column="126" source="standard:argument-list-wrapping" />
+        <error line="303" column="1" source="standard:max-line-length" />
+        <error line="303" column="88" source="standard:argument-list-wrapping" />
+        <error line="303" column="123" source="standard:argument-list-wrapping" />
+        <error line="347" column="1" source="standard:max-line-length" />
+        <error line="347" column="87" source="standard:argument-list-wrapping" />
+        <error line="347" column="122" source="standard:argument-list-wrapping" />
+        <error line="428" column="1" source="standard:max-line-length" />
+        <error line="437" column="1" source="standard:max-line-length" />
+        <error line="446" column="1" source="standard:max-line-length" />
+        <error line="458" column="1" source="standard:max-line-length" />
+        <error line="470" column="1" source="standard:max-line-length" />
+        <error line="501" column="1" source="standard:max-line-length" />
+        <error line="532" column="1" source="standard:max-line-length" />
+        <error line="594" column="1" source="standard:max-line-length" />
+        <error line="625" column="1" source="standard:max-line-length" />
+        <error line="655" column="1" source="standard:max-line-length" />
+        <error line="684" column="1" source="standard:max-line-length" />
+        <error line="711" column="1" source="standard:max-line-length" />
+        <error line="738" column="1" source="standard:max-line-length" />
+        <error line="760" column="1" source="standard:max-line-length" />
+        <error line="782" column="1" source="standard:max-line-length" />
+        <error line="816" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/session/PrivateNotificationServiceTest.kt">
+        <error line="58" column="1" source="standard:max-line-length" />
+        <error line="58" column="52" source="standard:argument-list-wrapping" />
+        <error line="58" column="87" source="standard:argument-list-wrapping" />
+        <error line="58" column="124" source="standard:argument-list-wrapping" />
+        <error line="73" column="1" source="standard:max-line-length" />
+        <error line="73" column="52" source="standard:argument-list-wrapping" />
+        <error line="73" column="87" source="standard:argument-list-wrapping" />
+        <error line="73" column="124" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/CustomEtpCookiesOptionsDropDownListPreferenceTest.kt">
+        <error line="24" column="1" source="standard:max-line-length" />
+        <error line="44" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/DropDownListPreferenceTest.kt">
+        <error line="32" column="1" source="standard:max-line-length" />
+        <error line="41" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/HomeSettingsFragmentTest.kt">
+        <error line="74" column="1" source="standard:max-line-length" />
+        <error line="85" column="1" source="standard:max-line-length" />
+        <error line="96" column="1" source="standard:max-line-length" />
+        <error line="105" column="1" source="standard:max-line-length" />
+        <error line="114" column="1" source="standard:max-line-length" />
+        <error line="125" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/PhoneFeatureTest.kt">
+        <error line="78" column="1" source="standard:max-line-length" />
+        <error line="78" column="22" source="standard:argument-list-wrapping" />
+        <error line="78" column="77" source="standard:argument-list-wrapping" />
+        <error line="78" column="124" source="standard:argument-list-wrapping" />
+        <error line="79" column="1" source="standard:max-line-length" />
+        <error line="79" column="22" source="standard:argument-list-wrapping" />
+        <error line="79" column="79" source="standard:argument-list-wrapping" />
+        <error line="79" column="128" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/PreferenceBackedRadioButtonTest.kt">
+        <error line="67" column="1" source="standard:max-line-length" />
+        <error line="95" column="1" source="standard:max-line-length" />
+        <error line="118" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/SettingsFragmentTest.kt">
+        <error line="246" column="1" source="standard:max-line-length" />
+        <error line="263" column="1" source="standard:max-line-length" />
+        <error line="279" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt">
+        <error line="22" column="1" source="standard:max-line-length" />
+        <error line="22" column="45" source="standard:argument-list-wrapping" />
+        <error line="22" column="65" source="standard:argument-list-wrapping" />
+        <error line="22" column="112" source="standard:argument-list-wrapping" />
+        <error line="22" column="119" source="standard:argument-list-wrapping" />
+        <error line="22" column="125" source="standard:argument-list-wrapping" />
+        <error line="22" column="129" source="standard:argument-list-wrapping" />
+        <error line="22" column="130" source="standard:argument-list-wrapping" />
+        <error line="26" column="1" source="standard:max-line-length" />
+        <error line="26" column="45" source="standard:argument-list-wrapping" />
+        <error line="26" column="65" source="standard:argument-list-wrapping" />
+        <error line="26" column="109" source="standard:argument-list-wrapping" />
+        <error line="26" column="121" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsInteractorTest.kt">
+        <error line="78" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/address/AddressEditorViewTest.kt">
+        <error line="124" column="1" source="standard:max-line-length" />
+        <error line="162" column="1" source="standard:max-line-length" />
+        <error line="178" column="1" source="standard:max-line-length" />
+        <error line="192" column="1" source="standard:max-line-length" />
+        <error line="206" column="1" source="standard:max-line-length" />
+        <error line="230" column="1" source="standard:max-line-length" />
+        <error line="258" column="1" source="standard:max-line-length" />
+        <error line="269" column="1" source="standard:max-line-length" />
+        <error line="269" column="22" source="standard:argument-list-wrapping" />
+        <error line="269" column="77" source="standard:argument-list-wrapping" />
+        <error line="269" column="124" source="standard:argument-list-wrapping" />
+        <error line="273" column="1" source="standard:max-line-length" />
+        <error line="286" column="1" source="standard:max-line-length" />
+        <error line="295" column="1" source="standard:max-line-length" />
+        <error line="295" column="22" source="standard:argument-list-wrapping" />
+        <error line="295" column="77" source="standard:argument-list-wrapping" />
+        <error line="295" column="124" source="standard:argument-list-wrapping" />
+        <error line="308" column="1" source="standard:max-line-length" />
+        <error line="308" column="22" source="standard:argument-list-wrapping" />
+        <error line="308" column="77" source="standard:argument-list-wrapping" />
+        <error line="308" column="124" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/address/controller/DefaultAddressEditorControllerTest.kt">
+        <error line="54" column="1" source="standard:max-line-length" />
+        <error line="79" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/advanced/LocaleViewHoldersTest.kt">
+        <error line="74" column="1" source="standard:max-line-length" />
+        <error line="84" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/autofill/AutofillFragmentStoreTest.kt">
+        <error line="40" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragmentTest.kt">
+        <error line="63" column="1" source="standard:max-line-length" />
+        <error line="85" column="1" source="standard:max-line-length" />
+        <error line="113" column="1" source="standard:max-line-length" />
+        <error line="144" column="1" source="standard:max-line-length" />
+        <error line="173" column="1" source="standard:max-line-length" />
+        <error line="187" column="1" source="standard:max-line-length" />
+        <error line="215" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorViewTest.kt">
+        <error line="106" column="1" source="standard:max-line-length" />
+        <error line="214" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/logins/SavedLoginsInteractorTest.kt">
+        <error line="34" column="1" source="standard:max-line-length" />
+        <error line="44" column="1" source="standard:max-line-length" />
+        <error line="54" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/logins/SyncPreferenceViewTest.kt">
+        <error line="62" column="1" source="standard:max-line-length" />
+        <error line="62" column="20" source="standard:wrapping" />
+        <error line="63" column="1" source="standard:max-line-length" />
+        <error line="68" column="1" source="standard:max-line-length" />
+        <error line="102" column="1" source="standard:max-line-length" />
+        <error line="102" column="86" source="standard:argument-list-wrapping" />
+        <error line="102" column="129" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt">
+        <error line="149" column="1" source="standard:max-line-length" />
+        <error line="359" column="1" source="standard:max-line-length" />
+        <error line="385" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentStoreTest.kt">
+        <error line="309" column="1" source="standard:max-line-length" />
+        <error line="309" column="26" source="standard:argument-list-wrapping" />
+        <error line="309" column="47" source="standard:argument-list-wrapping" />
+        <error line="309" column="125" source="standard:argument-list-wrapping" />
+        <error line="311" column="1" source="standard:max-line-length" />
+        <error line="311" column="26" source="standard:argument-list-wrapping" />
+        <error line="311" column="51" source="standard:argument-list-wrapping" />
+        <error line="311" column="126" source="standard:argument-list-wrapping" />
+        <error line="312" column="1" source="standard:max-line-length" />
+        <error line="312" column="26" source="standard:argument-list-wrapping" />
+        <error line="312" column="48" source="standard:argument-list-wrapping" />
+        <error line="312" column="123" source="standard:argument-list-wrapping" />
+        <error line="313" column="1" source="standard:max-line-length" />
+        <error line="313" column="26" source="standard:argument-list-wrapping" />
+        <error line="313" column="57" source="standard:argument-list-wrapping" />
+        <error line="313" column="102" source="standard:argument-list-wrapping" />
+        <error line="313" column="121" source="standard:argument-list-wrapping" />
+        <error line="313" column="141" source="standard:argument-list-wrapping" />
+        <error line="316" column="1" source="standard:max-line-length" />
+        <error line="316" column="26" source="standard:argument-list-wrapping" />
+        <error line="316" column="51" source="standard:argument-list-wrapping" />
+        <error line="316" column="133" source="standard:argument-list-wrapping" />
+        <error line="319" column="1" source="standard:max-line-length" />
+        <error line="319" column="26" source="standard:argument-list-wrapping" />
+        <error line="319" column="51" source="standard:argument-list-wrapping" />
+        <error line="319" column="127" source="standard:argument-list-wrapping" />
+        <error line="320" column="1" source="standard:max-line-length" />
+        <error line="320" column="26" source="standard:argument-list-wrapping" />
+        <error line="320" column="58" source="standard:argument-list-wrapping" />
+        <error line="320" column="103" source="standard:argument-list-wrapping" />
+        <error line="320" column="126" source="standard:argument-list-wrapping" />
+        <error line="320" column="137" source="standard:argument-list-wrapping" />
+        <error line="322" column="1" source="standard:max-line-length" />
+        <error line="322" column="26" source="standard:argument-list-wrapping" />
+        <error line="322" column="51" source="standard:argument-list-wrapping" />
+        <error line="322" column="130" source="standard:argument-list-wrapping" />
+        <error line="323" column="1" source="standard:max-line-length" />
+        <error line="323" column="26" source="standard:argument-list-wrapping" />
+        <error line="323" column="57" source="standard:argument-list-wrapping" />
+        <error line="323" column="102" source="standard:argument-list-wrapping" />
+        <error line="323" column="125" source="standard:argument-list-wrapping" />
+        <error line="323" column="145" source="standard:argument-list-wrapping" />
+        <error line="326" column="1" source="standard:max-line-length" />
+        <error line="326" column="26" source="standard:argument-list-wrapping" />
+        <error line="326" column="53" source="standard:argument-list-wrapping" />
+        <error line="326" column="98" source="standard:argument-list-wrapping" />
+        <error line="326" column="123" source="standard:argument-list-wrapping" />
+        <error line="326" column="137" source="standard:argument-list-wrapping" />
+        <error line="327" column="1" source="standard:max-line-length" />
+        <error line="327" column="26" source="standard:argument-list-wrapping" />
+        <error line="327" column="53" source="standard:argument-list-wrapping" />
+        <error line="327" column="98" source="standard:argument-list-wrapping" />
+        <error line="327" column="123" source="standard:argument-list-wrapping" />
+        <error line="327" column="131" source="standard:argument-list-wrapping" />
+        <error line="328" column="1" source="standard:max-line-length" />
+        <error line="328" column="26" source="standard:argument-list-wrapping" />
+        <error line="328" column="51" source="standard:argument-list-wrapping" />
+        <error line="328" column="96" source="standard:argument-list-wrapping" />
+        <error line="328" column="121" source="standard:argument-list-wrapping" />
+        <error line="328" column="132" source="standard:argument-list-wrapping" />
+        <error line="329" column="1" source="standard:max-line-length" />
+        <error line="329" column="26" source="standard:argument-list-wrapping" />
+        <error line="329" column="48" source="standard:argument-list-wrapping" />
+        <error line="329" column="129" source="standard:argument-list-wrapping" />
+        <error line="330" column="1" source="standard:max-line-length" />
+        <error line="330" column="26" source="standard:argument-list-wrapping" />
+        <error line="330" column="57" source="standard:argument-list-wrapping" />
+        <error line="330" column="102" source="standard:argument-list-wrapping" />
+        <error line="330" column="127" source="standard:argument-list-wrapping" />
+        <error line="330" column="147" source="standard:argument-list-wrapping" />
+        <error line="333" column="1" source="standard:max-line-length" />
+        <error line="333" column="26" source="standard:argument-list-wrapping" />
+        <error line="333" column="49" source="standard:argument-list-wrapping" />
+        <error line="333" column="129" source="standard:argument-list-wrapping" />
+        <error line="334" column="1" source="standard:max-line-length" />
+        <error line="334" column="26" source="standard:argument-list-wrapping" />
+        <error line="334" column="49" source="standard:argument-list-wrapping" />
+        <error line="334" column="123" source="standard:argument-list-wrapping" />
+        <error line="335" column="1" source="standard:max-line-length" />
+        <error line="335" column="26" source="standard:argument-list-wrapping" />
+        <error line="335" column="51" source="standard:argument-list-wrapping" />
+        <error line="335" column="128" source="standard:argument-list-wrapping" />
+        <error line="336" column="1" source="standard:max-line-length" />
+        <error line="336" column="26" source="standard:argument-list-wrapping" />
+        <error line="336" column="48" source="standard:argument-list-wrapping" />
+        <error line="336" column="125" source="standard:argument-list-wrapping" />
+        <error line="337" column="1" source="standard:max-line-length" />
+        <error line="337" column="26" source="standard:argument-list-wrapping" />
+        <error line="337" column="57" source="standard:argument-list-wrapping" />
+        <error line="337" column="102" source="standard:argument-list-wrapping" />
+        <error line="337" column="123" source="standard:argument-list-wrapping" />
+        <error line="337" column="143" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/quicksettings/ext/PhoneFeatureExtKtTest.kt">
+        <error line="65" column="1" source="standard:max-line-length" />
+        <error line="65" column="21" source="standard:argument-list-wrapping" />
+        <error line="65" column="57" source="standard:argument-list-wrapping" />
+        <error line="65" column="90" source="standard:argument-list-wrapping" />
+        <error line="65" column="115" source="standard:argument-list-wrapping" />
+        <error line="65" column="122" source="standard:argument-list-wrapping" />
+        <error line="65" column="123" source="standard:argument-list-wrapping" />
+        <error line="66" column="1" source="standard:max-line-length" />
+        <error line="66" column="21" source="standard:argument-list-wrapping" />
+        <error line="66" column="121" source="standard:argument-list-wrapping" />
+        <error line="70" column="1" source="standard:max-line-length" />
+        <error line="70" column="21" source="standard:argument-list-wrapping" />
+        <error line="70" column="57" source="standard:argument-list-wrapping" />
+        <error line="70" column="89" source="standard:argument-list-wrapping" />
+        <error line="70" column="114" source="standard:argument-list-wrapping" />
+        <error line="70" column="121" source="standard:argument-list-wrapping" />
+        <error line="70" column="122" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsViewTest.kt">
+        <error line="90" column="1" source="standard:max-line-length" />
+        <error line="108" column="1" source="standard:max-line-length" />
+        <error line="125" column="1" source="standard:max-line-length" />
+        <error line="159" column="1" source="standard:max-line-length" />
+        <error line="172" column="1" source="standard:max-line-length" />
+        <error line="186" column="1" source="standard:max-line-length" />
+        <error line="201" column="1" source="standard:max-line-length" />
+        <error line="208" column="1" source="standard:max-line-length" />
+        <error line="215" column="1" source="standard:max-line-length" />
+        <error line="235" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/DefaultCookieBannerDetailsControllerTest.kt">
+        <error line="148" column="1" source="standard:max-line-length" />
+        <error line="176" column="1" source="standard:max-line-length" />
+        <error line="224" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/search/SearchEngineFragmentTest.kt">
+        <error line="33" column="1" source="standard:max-line-length" />
+        <error line="57" column="1" source="standard:max-line-length" />
+        <error line="57" column="59" source="standard:argument-list-wrapping" />
+        <error line="57" column="81" source="standard:argument-list-wrapping" />
+        <error line="57" column="122" source="standard:argument-list-wrapping" />
+        <error line="57" column="123" source="standard:argument-list-wrapping" />
+        <error line="62" column="1" source="standard:max-line-length" />
+        <error line="62" column="59" source="standard:argument-list-wrapping" />
+        <error line="62" column="81" source="standard:argument-list-wrapping" />
+        <error line="62" column="123" source="standard:argument-list-wrapping" />
+        <error line="62" column="124" source="standard:argument-list-wrapping" />
+        <error line="67" column="1" source="standard:max-line-length" />
+        <error line="67" column="61" source="standard:argument-list-wrapping" />
+        <error line="67" column="83" source="standard:argument-list-wrapping" />
+        <error line="67" column="135" source="standard:argument-list-wrapping" />
+        <error line="67" column="136" source="standard:argument-list-wrapping" />
+        <error line="72" column="1" source="standard:max-line-length" />
+        <error line="72" column="59" source="standard:argument-list-wrapping" />
+        <error line="72" column="81" source="standard:argument-list-wrapping" />
+        <error line="72" column="122" source="standard:argument-list-wrapping" />
+        <error line="72" column="123" source="standard:argument-list-wrapping" />
+        <error line="87" column="1" source="standard:max-line-length" />
+        <error line="87" column="59" source="standard:argument-list-wrapping" />
+        <error line="87" column="81" source="standard:argument-list-wrapping" />
+        <error line="87" column="125" source="standard:argument-list-wrapping" />
+        <error line="87" column="126" source="standard:argument-list-wrapping" />
+        <error line="92" column="1" source="standard:max-line-length" />
+        <error line="92" column="59" source="standard:argument-list-wrapping" />
+        <error line="92" column="81" source="standard:argument-list-wrapping" />
+        <error line="92" column="125" source="standard:argument-list-wrapping" />
+        <error line="92" column="126" source="standard:argument-list-wrapping" />
+        <error line="97" column="1" source="standard:max-line-length" />
+        <error line="97" column="59" source="standard:argument-list-wrapping" />
+        <error line="97" column="81" source="standard:argument-list-wrapping" />
+        <error line="97" column="128" source="standard:argument-list-wrapping" />
+        <error line="97" column="129" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/search/SearchStringValidatorTest.kt">
+        <error line="37" column="1" source="standard:max-line-length" />
+        <error line="37" column="64" source="standard:argument-list-wrapping" />
+        <error line="37" column="72" source="standard:argument-list-wrapping" />
+        <error line="37" column="121" source="standard:argument-list-wrapping" />
+        <error line="63" column="1" source="standard:max-line-length" />
+        <error line="63" column="64" source="standard:argument-list-wrapping" />
+        <error line="63" column="72" source="standard:argument-list-wrapping" />
+        <error line="63" column="121" source="standard:argument-list-wrapping" />
+        <error line="72" column="1" source="standard:max-line-length" />
+        <error line="72" column="64" source="standard:argument-list-wrapping" />
+        <error line="72" column="72" source="standard:argument-list-wrapping" />
+        <error line="72" column="121" source="standard:argument-list-wrapping" />
+        <error line="86" column="1" source="standard:max-line-length" />
+        <error line="86" column="64" source="standard:argument-list-wrapping" />
+        <error line="86" column="72" source="standard:argument-list-wrapping" />
+        <error line="86" column="121" source="standard:argument-list-wrapping" />
+        <error line="100" column="1" source="standard:max-line-length" />
+        <error line="100" column="64" source="standard:argument-list-wrapping" />
+        <error line="100" column="72" source="standard:argument-list-wrapping" />
+        <error line="100" column="121" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragmentTest.kt">
+        <error line="134" column="1" source="standard:max-line-length" />
+        <error line="150" column="1" source="standard:max-line-length" />
+        <error line="166" column="1" source="standard:max-line-length" />
+        <error line="187" column="1" source="standard:max-line-length" />
+        <error line="208" column="1" source="standard:max-line-length" />
+        <error line="224" column="1" source="standard:max-line-length" />
+        <error line="240" column="1" source="standard:max-line-length" />
+        <error line="261" column="1" source="standard:max-line-length" />
+        <error line="282" column="1" source="standard:max-line-length" />
+        <error line="298" column="1" source="standard:max-line-length" />
+        <error line="314" column="1" source="standard:max-line-length" />
+        <error line="335" column="1" source="standard:max-line-length" />
+        <error line="356" column="1" source="standard:max-line-length" />
+        <error line="384" column="1" source="standard:max-line-length" />
+        <error line="412" column="1" source="standard:max-line-length" />
+        <error line="440" column="1" source="standard:max-line-length" />
+        <error line="468" column="1" source="standard:max-line-length" />
+        <error line="496" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsWifiIntegrationTest.kt">
+        <error line="47" column="1" source="standard:max-line-length" />
+        <error line="78" column="1" source="standard:max-line-length" />
+        <error line="92" column="1" source="standard:max-line-length" />
+        <error line="107" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/settings/wallpaper/ExtensionsTest.kt">
+        <error line="16" column="1" source="standard:max-line-length" />
+        <error line="19" column="1" source="standard:max-line-length" />
+        <error line="19" column="46" source="standard:wrapping" />
+        <error line="19" column="83" source="standard:argument-list-wrapping" />
+        <error line="19" column="116" source="standard:argument-list-wrapping" />
+        <error line="19" column="139" source="standard:argument-list-wrapping" />
+        <error line="38" column="1" source="standard:max-line-length" />
+        <error line="41" column="1" source="standard:max-line-length" />
+        <error line="41" column="56" source="standard:wrapping" />
+        <error line="41" column="93" source="standard:argument-list-wrapping" />
+        <error line="41" column="126" source="standard:argument-list-wrapping" />
+        <error line="41" column="149" source="standard:argument-list-wrapping" />
+        <error line="49" column="1" source="standard:max-line-length" />
+        <error line="59" column="1" source="standard:max-line-length" />
+        <error line="77" column="1" source="standard:max-line-length" />
+        <error line="79" column="1" source="standard:max-line-length" />
+        <error line="79" column="46" source="standard:wrapping" />
+        <error line="79" column="83" source="standard:argument-list-wrapping" />
+        <error line="79" column="116" source="standard:argument-list-wrapping" />
+        <error line="79" column="139" source="standard:argument-list-wrapping" />
+        <error line="91" column="1" source="standard:max-line-length" />
+        <error line="93" column="1" source="standard:max-line-length" />
+        <error line="93" column="33" source="standard:property-wrapping" />
+        <error line="93" column="70" source="standard:argument-list-wrapping" />
+        <error line="93" column="103" source="standard:argument-list-wrapping" />
+        <error line="93" column="127" source="standard:argument-list-wrapping" />
+        <error line="95" column="1" source="standard:max-line-length" />
+        <error line="95" column="33" source="standard:property-wrapping" />
+        <error line="95" column="70" source="standard:argument-list-wrapping" />
+        <error line="95" column="103" source="standard:argument-list-wrapping" />
+        <error line="95" column="127" source="standard:argument-list-wrapping" />
+        <error line="97" column="1" source="standard:max-line-length" />
+        <error line="97" column="34" source="standard:property-wrapping" />
+        <error line="97" column="71" source="standard:argument-list-wrapping" />
+        <error line="97" column="104" source="standard:argument-list-wrapping" />
+        <error line="97" column="128" source="standard:argument-list-wrapping" />
+        <error line="99" column="1" source="standard:max-line-length" />
+        <error line="99" column="33" source="standard:property-wrapping" />
+        <error line="99" column="70" source="standard:argument-list-wrapping" />
+        <error line="99" column="103" source="standard:argument-list-wrapping" />
+        <error line="99" column="127" source="standard:argument-list-wrapping" />
+        <error line="101" column="1" source="standard:max-line-length" />
+        <error line="101" column="34" source="standard:property-wrapping" />
+        <error line="101" column="71" source="standard:argument-list-wrapping" />
+        <error line="101" column="104" source="standard:argument-list-wrapping" />
+        <error line="101" column="128" source="standard:argument-list-wrapping" />
+        <error line="115" column="1" source="standard:max-line-length" />
+        <error line="117" column="1" source="standard:max-line-length" />
+        <error line="117" column="33" source="standard:property-wrapping" />
+        <error line="117" column="70" source="standard:argument-list-wrapping" />
+        <error line="117" column="102" source="standard:argument-list-wrapping" />
+        <error line="117" column="125" source="standard:argument-list-wrapping" />
+        <error line="140" column="1" source="standard:max-line-length" />
+        <error line="151" column="1" source="standard:max-line-length" />
+        <error line="153" column="1" source="standard:max-line-length" />
+        <error line="153" column="46" source="standard:wrapping" />
+        <error line="153" column="83" source="standard:argument-list-wrapping" />
+        <error line="153" column="116" source="standard:argument-list-wrapping" />
+        <error line="153" column="139" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/share/SaveToPDFMiddlewareTest.kt">
+        <error line="58" column="1" source="standard:max-line-length" />
+        <error line="104" column="1" source="standard:max-line-length" />
+        <error line="148" column="1" source="standard:max-line-length" />
+        <error line="256" column="1" source="standard:max-line-length" />
+        <error line="277" column="1" source="standard:max-line-length" />
+        <error line="322" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/shopping/ReviewQualityCheckFeatureTest.kt">
+        <error line="242" column="1" source="standard:max-line-length" />
+        <error line="299" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/shopping/middleware/DefaultReviewQualityCheckServiceTest.kt">
+        <error line="41" column="1" source="standard:max-line-length" />
+        <error line="128" column="1" source="standard:max-line-length" />
+        <error line="159" column="1" source="standard:max-line-length" />
+        <error line="188" column="1" source="standard:max-line-length" />
+        <error line="245" column="1" source="standard:max-line-length" />
+        <error line="281" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt">
+        <error line="56" column="1" source="standard:max-line-length" />
+        <error line="174" column="1" source="standard:max-line-length" />
+        <error line="339" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckTelemetryMiddlewareTest.kt">
+        <error line="92" column="1" source="standard:max-line-length" />
+        <error line="100" column="1" source="standard:max-line-length" />
+        <error line="116" column="1" source="standard:max-line-length" />
+        <error line="132" column="1" source="standard:max-line-length" />
+        <error line="150" column="1" source="standard:max-line-length" />
+        <error line="236" column="1" source="standard:max-line-length" />
+        <error line="244" column="1" source="standard:max-line-length" />
+        <error line="252" column="1" source="standard:max-line-length" />
+        <error line="278" column="1" source="standard:max-line-length" />
+        <error line="303" column="1" source="standard:max-line-length" />
+        <error line="327" column="1" source="standard:max-line-length" />
+        <error line="358" column="1" source="standard:max-line-length" />
+        <error line="397" column="1" source="standard:max-line-length" />
+        <error line="459" column="1" source="standard:max-line-length" />
+        <error line="480" column="1" source="standard:max-line-length" />
+        <error line="501" column="1" source="standard:max-line-length" />
+        <error line="501" column="85" source="standard:parameter-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStateTest.kt">
+        <error line="19" column="1" source="standard:max-line-length" />
+        <error line="89" column="1" source="standard:max-line-length" />
+        <error line="122" column="1" source="standard:max-line-length" />
+        <error line="159" column="1" source="standard:max-line-length" />
+        <error line="172" column="1" source="standard:max-line-length" />
+        <error line="188" column="1" source="standard:max-line-length" />
+        <error line="205" column="1" source="standard:max-line-length" />
+        <error line="236" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStoreTest.kt">
+        <error line="55" column="1" source="standard:max-line-length" />
+        <error line="136" column="1" source="standard:max-line-length" />
+        <error line="164" column="1" source="standard:max-line-length" />
+        <error line="189" column="1" source="standard:max-line-length" />
+        <error line="224" column="1" source="standard:max-line-length" />
+        <error line="267" column="1" source="standard:max-line-length" />
+        <error line="310" column="1" source="standard:max-line-length" />
+        <error line="353" column="1" source="standard:max-line-length" />
+        <error line="555" column="1" source="standard:max-line-length" />
+        <error line="592" column="1" source="standard:max-line-length" />
+        <error line="636" column="1" source="standard:max-line-length" />
+        <error line="664" column="1" source="standard:max-line-length" />
+        <error line="690" column="1" source="standard:max-line-length" />
+        <error line="823" column="1" source="standard:max-line-length" />
+        <error line="863" column="1" source="standard:max-line-length" />
+        <error line="936" column="1" source="standard:max-line-length" />
+        <error line="1126" column="1" source="standard:max-line-length" />
+        <error line="1293" column="1" source="standard:max-line-length" />
+        <error line="1338" column="1" source="standard:max-line-length" />
+        <error line="1381" column="1" source="standard:max-line-length" />
+        <error line="1416" column="1" source="standard:max-line-length" />
+        <error line="1457" column="1" source="standard:max-line-length" />
+        <error line="1498" column="1" source="standard:max-line-length" />
+        <error line="1541" column="1" source="standard:max-line-length" />
+        <error line="1574" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/sync/ext/SyncedDeviceTabsTest.kt">
+        <error line="95" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt">
+        <error line="196" column="1" source="standard:max-line-length" />
+        <error line="223" column="1" source="standard:max-line-length" />
+        <error line="257" column="1" source="standard:max-line-length" />
+        <error line="271" column="1" source="standard:max-line-length" />
+        <error line="278" column="1" source="standard:max-line-length" />
+        <error line="300" column="1" source="standard:max-line-length" />
+        <error line="315" column="1" source="standard:max-line-length" />
+        <error line="328" column="1" source="standard:max-line-length" />
+        <error line="340" column="1" source="standard:max-line-length" />
+        <error line="367" column="1" source="standard:max-line-length" />
+        <error line="393" column="1" source="standard:max-line-length" />
+        <error line="422" column="1" source="standard:max-line-length" />
+        <error line="451" column="1" source="standard:max-line-length" />
+        <error line="472" column="1" source="standard:max-line-length" />
+        <error line="493" column="1" source="standard:max-line-length" />
+        <error line="510" column="1" source="standard:max-line-length" />
+        <error line="526" column="1" source="standard:max-line-length" />
+        <error line="572" column="1" source="standard:max-line-length" />
+        <error line="598" column="1" source="standard:max-line-length" />
+        <error line="626" column="1" source="standard:max-line-length" />
+        <error line="657" column="1" source="standard:max-line-length" />
+        <error line="688" column="1" source="standard:max-line-length" />
+        <error line="711" column="1" source="standard:max-line-length" />
+        <error line="739" column="1" source="standard:max-line-length" />
+        <error line="777" column="1" source="standard:max-line-length" />
+        <error line="789" column="1" source="standard:max-line-length" />
+        <error line="848" column="1" source="standard:max-line-length" />
+        <error line="904" column="1" source="standard:max-line-length" />
+        <error line="930" column="1" source="standard:max-line-length" />
+        <error line="974" column="1" source="standard:max-line-length" />
+        <error line="975" column="1" source="standard:max-line-length" />
+        <error line="975" column="25" source="standard:property-wrapping" />
+        <error line="975" column="42" source="standard:argument-list-wrapping" />
+        <error line="975" column="113" source="standard:argument-list-wrapping" />
+        <error line="975" column="130" source="standard:argument-list-wrapping" />
+        <error line="976" column="1" source="standard:max-line-length" />
+        <error line="976" column="25" source="standard:property-wrapping" />
+        <error line="976" column="42" source="standard:argument-list-wrapping" />
+        <error line="976" column="111" source="standard:argument-list-wrapping" />
+        <error line="976" column="128" source="standard:argument-list-wrapping" />
+        <error line="1005" column="1" source="standard:max-line-length" />
+        <error line="1066" column="1" source="standard:max-line-length" />
+        <error line="1084" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayInteractorTest.kt">
+        <error line="144" column="1" source="standard:max-line-length" />
+        <error line="151" column="1" source="standard:max-line-length" />
+        <error line="158" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt">
+        <error line="126" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/tabstray/SecureTabsTrayBindingTest.kt">
+        <error line="68" column="1" source="standard:max-line-length" />
+        <error line="87" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/tabstray/TabSheetBehaviorManagerTest.kt">
+        <error line="71" column="1" source="standard:max-line-length" />
+        <error line="134" column="1" source="standard:max-line-length" />
+        <error line="160" column="1" source="standard:max-line-length" />
+        <error line="192" column="1" source="standard:max-line-length" />
+        <error line="225" column="1" source="standard:max-line-length" />
+        <error line="256" column="1" source="standard:max-line-length" />
+        <error line="280" column="1" source="standard:max-line-length" />
+        <error line="312" column="1" source="standard:max-line-length" />
+        <error line="342" column="1" source="standard:max-line-length" />
+        <error line="372" column="1" source="standard:max-line-length" />
+        <error line="385" column="1" source="standard:max-line-length" />
+        <error line="428" column="1" source="standard:max-line-length" />
+        <error line="443" column="1" source="standard:max-line-length" />
+        <error line="458" column="1" source="standard:max-line-length" />
+        <error line="473" column="1" source="standard:max-line-length" />
+        <error line="488" column="1" source="standard:max-line-length" />
+        <error line="503" column="1" source="standard:max-line-length" />
+        <error line="518" column="1" source="standard:max-line-length" />
+        <error line="533" column="1" source="standard:max-line-length" />
+        <error line="548" column="1" source="standard:max-line-length" />
+        <error line="563" column="1" source="standard:max-line-length" />
+        <error line="579" column="1" source="standard:max-line-length" />
+        <error line="595" column="1" source="standard:max-line-length" />
+        <error line="611" column="1" source="standard:max-line-length" />
+        <error line="627" column="1" source="standard:max-line-length" />
+        <error line="643" column="1" source="standard:max-line-length" />
+        <error line="659" column="1" source="standard:max-line-length" />
+        <error line="678" column="1" source="standard:max-line-length" />
+        <error line="746" column="1" source="standard:max-line-length" />
+        <error line="771" column="1" source="standard:max-line-length" />
+        <error line="796" column="1" source="standard:max-line-length" />
+        <error line="821" column="1" source="standard:max-line-length" />
+        <error line="847" column="1" source="standard:max-line-length" />
+        <error line="873" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt">
+        <error line="93" column="1" source="standard:max-line-length" />
+        <error line="126" column="1" source="standard:max-line-length" />
+        <error line="158" column="1" source="standard:max-line-length" />
+        <error line="191" column="1" source="standard:max-line-length" />
+        <error line="291" column="1" source="standard:max-line-length" />
+        <error line="306" column="1" source="standard:max-line-length" />
+        <error line="317" column="1" source="standard:max-line-length" />
+        <error line="339" column="1" source="standard:max-line-length" />
+        <error line="350" column="1" source="standard:max-line-length" />
+        <error line="351" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayStateTest.kt">
+        <error line="46" column="1" source="standard:max-line-length" />
+        <error line="67" column="1" source="standard:max-line-length" />
+        <error line="83" column="1" source="standard:max-line-length" />
+        <error line="99" column="1" source="standard:max-line-length" />
+        <error line="128" column="1" source="standard:max-line-length" />
+        <error line="145" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolderTest.kt">
+        <error line="89" column="1" source="standard:max-line-length" />
+        <error line="126" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsViewErrorTypeTest.kt">
+        <error line="23" column="1" source="standard:max-line-length" />
+        <error line="26" column="1" source="standard:max-line-length" />
+        <error line="26" column="117" source="standard:argument-list-wrapping" />
+        <error line="26" column="126" source="standard:argument-list-wrapping" />
+        <error line="26" column="139" source="standard:argument-list-wrapping" />
+        <error line="27" column="1" source="standard:max-line-length" />
+        <error line="27" column="107" source="standard:argument-list-wrapping" />
+        <error line="27" column="116" source="standard:argument-list-wrapping" />
+        <error line="27" column="129" source="standard:argument-list-wrapping" />
+        <error line="28" column="1" source="standard:max-line-length" />
+        <error line="28" column="115" source="standard:argument-list-wrapping" />
+        <error line="28" column="124" source="standard:argument-list-wrapping" />
+        <error line="28" column="137" source="standard:argument-list-wrapping" />
+        <error line="32" column="1" source="standard:max-line-length" />
+        <error line="32" column="22" source="standard:argument-list-wrapping" />
+        <error line="32" column="90" source="standard:argument-list-wrapping" />
+        <error line="32" column="126" source="standard:argument-list-wrapping" />
+        <error line="38" column="1" source="standard:max-line-length" />
+        <error line="38" column="22" source="standard:argument-list-wrapping" />
+        <error line="38" column="82" source="standard:argument-list-wrapping" />
+        <error line="38" column="122" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt">
+        <error line="103" column="1" source="standard:max-line-length" />
+        <error line="137" column="1" source="standard:max-line-length" />
+        <error line="148" column="1" source="standard:max-line-length" />
+        <error line="372" column="1" source="standard:max-line-length" />
+        <error line="372" column="36" source="standard:argument-list-wrapping" />
+        <error line="372" column="42" source="standard:argument-list-wrapping" />
+        <error line="372" column="51" source="standard:argument-list-wrapping" />
+        <error line="372" column="82" source="standard:argument-list-wrapping" />
+        <error line="372" column="108" source="standard:argument-list-wrapping" />
+        <error line="372" column="126" source="standard:argument-list-wrapping" />
+        <error line="372" column="127" source="standard:argument-list-wrapping" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionBlockingFragmentTest.kt">
+        <error line="25" column="1" source="standard:max-line-length" />
+        <error line="43" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/translations/preferences/downloadlanguages/DownloadLanguagesFeatureTest.kt">
+        <error line="77" column="1" source="standard:max-line-length" />
+        <error line="90" column="1" source="standard:max-line-length" />
+        <error line="103" column="1" source="standard:max-line-length" />
+        <error line="116" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/utils/ClipboardHandlerTest.kt">
+        <error line="84" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt">
+        <error line="720" column="1" source="standard:max-line-length" />
+        <error line="738" column="1" source="standard:max-line-length" />
+        <error line="754" column="1" source="standard:max-line-length" />
+        <error line="773" column="1" source="standard:max-line-length" />
+        <error line="801" column="1" source="standard:max-line-length" />
+        <error line="809" column="1" source="standard:max-line-length" />
+        <error line="814" column="1" source="standard:max-line-length" />
+        <error line="822" column="1" source="standard:max-line-length" />
+        <error line="867" column="1" source="standard:max-line-length" />
+        <error line="906" column="1" source="standard:max-line-length" />
+        <error line="956" column="1" source="standard:max-line-length" />
+        <error line="971" column="1" source="standard:max-line-length" />
+        <error line="986" column="1" source="standard:max-line-length" />
+        <error line="1000" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/wallpapers/LegacyWallpaperMigrationTest.kt">
+        <error line="65" column="1" source="standard:max-line-length" />
+        <error line="85" column="1" source="standard:max-line-length" />
+        <error line="138" column="1" source="standard:max-line-length" />
+        <error line="159" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperDownloaderTest.kt">
+        <error line="59" column="1" source="standard:max-line-length" />
+        <error line="79" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperTest.kt">
+        <error line="20" column="1" source="standard:max-line-length" />
+        <error line="27" column="1" source="standard:max-line-length" />
+        <error line="34" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/wallpapers/WallpapersUseCasesTest.kt">
+        <error line="129" column="1" source="standard:max-line-length" />
+        <error line="159" column="1" source="standard:max-line-length" />
+        <error line="189" column="1" source="standard:max-line-length" />
+        <error line="215" column="1" source="standard:max-line-length" />
+        <error line="220" column="1" source="standard:max-line-length" />
+        <error line="245" column="1" source="standard:max-line-length" />
+        <error line="270" column="1" source="standard:max-line-length" />
+        <error line="301" column="1" source="standard:max-line-length" />
+        <error line="328" column="1" source="standard:max-line-length" />
+        <error line="352" column="1" source="standard:max-line-length" />
+        <error line="382" column="1" source="standard:max-line-length" />
+        <error line="404" column="1" source="standard:max-line-length" />
+        <error line="421" column="1" source="standard:max-line-length" />
+        <error line="421" column="17" source="standard:wrapping" />
+        <error line="421" column="40" source="standard:argument-list-wrapping" />
+        <error line="421" column="95" source="standard:argument-list-wrapping" />
+        <error line="421" column="114" source="standard:argument-list-wrapping" />
+        <error line="421" column="150" source="standard:argument-list-wrapping" />
+        <error line="421" column="151" source="standard:argument-list-wrapping" />
+        <error line="422" column="1" source="standard:max-line-length" />
+        <error line="422" column="17" source="standard:wrapping" />
+        <error line="422" column="40" source="standard:argument-list-wrapping" />
+        <error line="422" column="95" source="standard:argument-list-wrapping" />
+        <error line="422" column="114" source="standard:argument-list-wrapping" />
+        <error line="422" column="149" source="standard:argument-list-wrapping" />
+        <error line="422" column="150" source="standard:argument-list-wrapping" />
+        <error line="428" column="1" source="standard:max-line-length" />
+        <error line="445" column="1" source="standard:max-line-length" />
+        <error line="445" column="17" source="standard:wrapping" />
+        <error line="445" column="40" source="standard:argument-list-wrapping" />
+        <error line="445" column="95" source="standard:argument-list-wrapping" />
+        <error line="445" column="114" source="standard:argument-list-wrapping" />
+        <error line="445" column="150" source="standard:argument-list-wrapping" />
+        <error line="445" column="151" source="standard:argument-list-wrapping" />
+        <error line="446" column="1" source="standard:max-line-length" />
+        <error line="446" column="17" source="standard:wrapping" />
+        <error line="446" column="40" source="standard:argument-list-wrapping" />
+        <error line="446" column="95" source="standard:argument-list-wrapping" />
+        <error line="446" column="114" source="standard:argument-list-wrapping" />
+        <error line="446" column="144" source="standard:argument-list-wrapping" />
+        <error line="446" column="145" source="standard:argument-list-wrapping" />
+        <error line="451" column="1" source="standard:max-line-length" />
+        <error line="475" column="1" source="standard:max-line-length" />
+        <error line="499" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/widget/SearchWidgetProviderTest.kt">
+        <error line="145" column="1" source="standard:max-line-length" />
+    </file>
+    <file name="app/src/test/java/org/mozilla/fenix/wifi/WifiConnectionMonitorTest.kt">
+        <error line="176" column="1" source="standard:max-line-length" />
     </file>
 </baseline>

From 79f9afd18ad4ded11615e18cf4026838dddb85a9 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Sat, 27 Jan 2024 00:03:23 +0000
Subject: [PATCH 042/222] Import translations from android-l10n

---
 app/src/main/res/values-fi/strings.xml     |  55 +++-----
 app/src/main/res/values-fur/strings.xml    | 144 +++++++++++++++------
 app/src/main/res/values-fy-rNL/strings.xml |  90 +++++++------
 app/src/main/res/values-oc/strings.xml     | 110 ++++++++++------
 app/src/main/res/values-ug/strings.xml     | 106 +++++++++------
 5 files changed, 305 insertions(+), 200 deletions(-)

diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index af4573f63..90e41e2f8 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -265,8 +265,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skannaa</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Hakukone</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Hakukoneasetukset</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -322,14 +320,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Ilmoitukset auttavat sinua tekemään enemmän %silla</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Ilmoitukset auttavat sinua tekemään enemmän %silla</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synkronoi välilehdet laitteiden välillä, hallitse latauksia, hanki vinkkejä %sin yksityisyyden suojan hyödyntämiseen liittyen ja paljon muuta.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synkronoi välilehdet laitteiden välillä, hallitse latauksia, hanki vinkkejä %sin yksityisyyden suojan hyödyntämiseen liittyen ja paljon muuta.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Jatka</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Jatka</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ei nyt</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ei nyt</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -448,21 +446,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Vain HTTPS -tila</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Evästeilmoitusten vähennys</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Evästeilmoitusten esto</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Evästeilmoitusten esto yksityisessä selaamisessa</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Vähennä evästeisiin liittyviä ilmoituksia</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Pois</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Päällä</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s yrittää hylätä automaattisesti evästeilmoituksissa olevat evästepyynnöt.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Ei käytössä tällä sivustolla</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -480,35 +468,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Sivusto ei ole tuettu tällä hetkellä</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Haluatko ottaa evästeilmoitusten vähennystoiminnon käyttöön sivustolla %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Haluatko ottaa evästeilmoitusten eston käyttöön sivustolla %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Haluatko poistaa evästeilmoitusten vähennystoiminnon käytöstä sivustolla %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Haluatko poistaa evästeilmoitusten eston käytöstä sivustolla %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s ei voi automaattisesti hylätä tämän sivuston evästepyyntöjä. Voit lähettää pyynnön ja pyytää tukea tälle sivustolle tulevaisuudessa.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s poistaa tämän sivuston evästeet ja päivittää sivun. Kaikkien evästeiden poistaminen saattaa kirjata sinut ulos tai tyhjentää ostoskorit.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Poista käytöstä ja %1$s poistaa evästeet sekä lataa tämän sivuston uudelleen. Tämä voi kirjata sinut ulos tai tyhjentää ostoskorin.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s yrittää hylätä kaikki evästepyynnöt automaattisesti tuetuilla sivustoilla.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Ota käyttöön ja %1$s yrittää automaattisesti hylätä evästeilmoitukset tällä sivustolla.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Saako %1$s vastata evästepyyntöihin kielteisesti?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s voi automaattisesti vastata moniin evästepyyntöihin kielteisesti.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ei nyt</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Näet vähemmän evästepyyntöjä</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Salli</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s kieltäytyi juuri evästeistä</string>
@@ -1300,8 +1269,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Hylkää</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Tulostaminen ei onnistu</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Sivun tulostaminen ei onnistunut</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Tulosta</string>
@@ -2088,12 +2055,20 @@
     <string name="dialog_delete_negative">Peruuta</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Kirjautumistietojen valinnat</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Salasanojen asetukset</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Muokattava tekstikenttä kirjautumisen verkkosivua varten.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Salasanan verkkosivuston osoitteen muokattava tekstikenttä.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Muokattava tekstikenttä kirjautumisen käyttäjätunnusta varten.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Salasanan käyttäjätunnuksen muokattava tekstikenttä.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Muokattava tekstikenttä kirjautumisen salasanaa varten.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Salasanan muokattava tekstikenttä.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Tallenna muutokset kirjautumistietoihin.</string>
     <!--  The button description to save changes to an edited password. -->
@@ -2466,6 +2441,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Älä koskaan käännä %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Älä koskaan käännä sivustoa</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Ohittaa kaikki muut asetukset</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Ohittaa käännöstarjoukset</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Käännösasetukset</string>
 
diff --git a/app/src/main/res/values-fur/strings.xml b/app/src/main/res/values-fur/strings.xml
index c51838da3..94313f628 100644
--- a/app/src/main/res/values-fur/strings.xml
+++ b/app/src/main/res/values-fur/strings.xml
@@ -260,8 +260,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scansione</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Motôr di ricercje</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Impostazions motôr di ricercje</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -313,24 +311,29 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Lis notifichis ti judin a jessi plui produtîf cun %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Lis notifichis ti judin a jessi plui produtîf cun %s</string>
 
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sincronize lis tôs schedis tra i dispositîfs, gjestìs i discjariaments, oten conseis par sfrutâ miôr che si pues la protezion de riservatece di %s, e tant altri.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sincronize lis tôs schedis tra i dispositîfs, gjestìs i discjariaments, oten conseis par sfrutâ miôr che si pues la protezion de riservatece di %s, e tant altri.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Continue</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Continue</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">No cumò</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">No cumò</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Informative su la riservatece di Firefox</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Nus plâs tignîti di cont</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Il nestri navigadôr, supuartât di une organizazion cence fins di vuadagn, ti jude a blocâ in automatic lis societâts che, di scuindon, a cirin di stâti daûr a ce che tu fasis in rêt.\n\nScuvierç di plui te nestre informative su la riservatece.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Il nestri navigadôr, supuartât di une organizazion cence fins di vuadagn, al bloche in automatic lis societâts che, di scuindon, a cirin di stâti daûr tes tôs ativitâts ator pal web.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Il nestri navigadôr, supuartât di une organizazion cence fins di vuadagn, ti jude a blocâ in automatic lis societâts che, di scuindon, a cirin di stâti daûr a ce che tu fasis in rêt.\n\nScuvierç di plui te nestre informative su la riservatece.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">informative su la riservatece</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">informative su la riservatece</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Met come navigadôr predefinît</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -434,22 +437,12 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modalitât dome-HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Riduzion strissons pai cookies</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Bloc strissons pai cookies</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Bloc strissons pai cookies te navigazion privade</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Ridûs i strissons pai cookies</string>
 
 
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Disativât</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Ativât</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s al cîr in automatic di refudâ lis richiestis dai cookies sui strissons dai cookies.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Disative par chest sît</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -467,35 +460,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Sît pal moment no supuartât</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Ativâ la riduzion strissons dai cookies par %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Ativâ il bloc strissons pai cookies in %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Disativâ la riduzion strissons dai cookies par %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Disativâ il bloc strissons pai cookies in %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s nol pues refudâ in automatic lis richiestis dai cookies su chest sît. Tu puedis inviâ une richieste par supuartâ un doman chest sît.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s al netarà vie i cookies di chest sît e al inzornarà la pagjine. Al è pussibil che netant vie ducj i cookies tu vegnis disconetût dal sît opûr che i carei des spesis a sedin disvuedâts.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Dopo la disativazion, %1$s al netarà vie i cookies e al tornarà a cjariâ il sît. Cheste operazion e podarès fâti disconeti dal sît o disvuedâ i carei pes compris tal sît.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s al cîr di refudâ in automatic dutis lis richiestis dai cookies sui sîts supuartâts.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Ativilu e %1$s al cirarà di refudâ in automatic ducj i strissons dai cookies su chest sît.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Permeti a %1$s di refudâ i strissons dai cookies?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s al pues refudâ in automatic tantis richiestis dai strissons dai cookies.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">No cumò</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Tu viodarâs mancul richiestis di cookies</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Permet</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s al à a pene refudât i cookies par te</string>
@@ -719,6 +693,8 @@
     <string name="preferences_sync_bookmarks">Segnelibris</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Credenziâls</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Passwords</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Schedis viertis</string>
     <!-- Preference for signing out -->
@@ -743,6 +719,8 @@
     <string name="default_device_name_2">%1$s su %2$s %3$s</string>
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Cjartis di credit</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Metodis di paiament</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Recapits</string>
 
@@ -1285,8 +1263,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Siere</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Impussibil stampâ</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Impussibil stampâ cheste pagjine</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Stampe</string>
@@ -1689,8 +1665,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Credenziâls e passwords</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Passwords</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Salve credenziâls e passwords</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Salve passwords</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Domande prime di salvâ</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1706,27 +1686,47 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Zonte credenziâl</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Zonte password</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronize lis credenziâls</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronize passwords</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sincronize lis credenziâls tra dispositîfs</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronize passwords tra i tiei dispositîfs</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Credenziâls salvadis</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Passwords salvadis</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Lis credenziâls che tu salvis o sincronizis su %s a vignaran fûr achì.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Lis passwords salvadis o sincronizadis su %s a vignaran listadis achì. Dutis lis passwords che tu salvis a vegnin cifradis.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Plui informazions su Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Plui informazions su la sincronizazion</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Ecezions</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Lis credenziâls e lis passwords che no tu âs salvât a vignaran fûr achì.</string>
 
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s nol salvarà lis passwords pai sîts listâts achì.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Lis credenziâls e lis passwords no vignaran salvadis par chescj sîts.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s nol salvarà lis passwords par chescj sîts.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Elimine dutis lis ecezions</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Cîr credenziâls</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Cîr tes passwords</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sît</string>
     <!-- The header for the username for a login -->
@@ -1755,10 +1755,16 @@
     <string name="saved_login_hide_password">Plate password</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Sbloche par visualizâ lis credenziâls salvadis</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Sbloche par viodi lis passwords salvadis</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Protêç lis tôs credenziâls di acès</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Protêç lis passwords salvadis</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Configure une secuence di bloc, PIN o password par protezi lis tôs credenziâls e lis passwords salvadis, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâlis.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Configure une secuence di bloc, PIN o password par protezi lis passwords salvadis, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâlis.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Plui indenant</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1776,6 +1782,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordene il menù des credenziâls</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menù par ordenâ lis passwords</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Compilazion automatiche</string>
@@ -1783,28 +1792,43 @@
     <string name="preferences_addresses">Recapits</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Cjartis di credit</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Metodis di paiament</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Salve e compile in automatic lis cjartis</string>
 
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Salve e compile i metodis di paiament</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">I dâts a son cifrâts</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s al cifre ducj i metodis di paiaments salvâts</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronize lis cjartis tra plui dispositîfs</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sincronize cjartis di credit</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Zonte cjarte di credit</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Zonte cjarte</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Gjestìs cjartis salvadis</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gjestìs cjartis</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Zonte recapit</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Gjestìs recapits</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Salve e compile in automatic i recapits</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Salve e compile direzions</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Includi informazions come numars, e-mail e recapits di spedizion</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Inclût numars di telefon e direzions e-mail</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Zonte cjarte</string>
     <!-- Title of the "Edit card" screen -->
@@ -1825,6 +1849,8 @@
     <string name="credit_cards_delete_card_button">Elimine cjarte</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Eliminâ pardabon cheste cjarte di credit?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Eliminâ la cjarte?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Elimine</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1837,15 +1863,23 @@
     <string name="credit_cards_saved_cards">Cjartis salvadis</string>
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Inserìs un numar di cjarte di credit valit</string>
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Inserìs un numar di cjarte valit</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Compile chest cjamp</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Zonte un non</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Sbloche par visualizâ lis cjartis di credit salvadis</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Protêç lis tôs cjartis di credit</string>
 
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Protêç i metodis di paiament salvâts</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configure une secuence di bloc, PIN o password par protezi lis tôs cjartis di credit salvadis, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâlis.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configure une secuence di bloc, PIN o password par protezi lis tôs cjartis salvadis, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâlis.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configure cumò</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1854,6 +1888,8 @@
     <string name="credit_cards_biometric_prompt_message_pin">Sbloche il dispositîf</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Sbloche par doprâ lis informazions des cjartis di credit memorizadis</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Sbloche par doprâ i metodis di paiament</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Zonte recapit</string>
     <!-- Title of the "Edit address" screen -->
@@ -1890,6 +1926,8 @@
     <string name="addressess_delete_address_button">Elimine recapit</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Eliminâ pardabon chest recapit?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Eliminâ cheste direzion?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Elimine</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1988,30 +2026,52 @@
     <string name="login_menu_edit_button">Modifiche</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Eliminâ pardabon cheste credenziâl?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Eliminâ pardabon cheste password?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Elimine</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Anule</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Opzions credenziâls</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opzions password</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Il cjamp di test modificabil pe direzion web de credenziâl.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Il cjamp di test che si pues modificâ pe direzion dal sît web de password.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Il cjamp di test modificabil pal non utent de credenziâl.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Il cjamp di test che si pues modificâ pal non utent de password.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Il cjamp di test modificabil pe password de credenziâl.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Il cjamp di test che si pues modificâ pe password.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Salve lis modifichis ae credenziâl.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Salve modifichis.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Modifiche</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Modifiche password</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Zonte gnove credenziâl</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Zonte password</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Password necessarie</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Inserìs une password</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Non utent necessari</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Inserìs un non utent</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Non servidôr necessari</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Inserìs une direzion web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Ricercje vocâl</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2174,8 +2234,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[I elements <b>in evidence</b> a rivin des recensions su %s dai ultins 80 dîs che o ritignìn afidabilis.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Scuvierç altris informazions su %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">cemût che %s di Mozilla al determine la cualitât des recensions</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">cemût che %s al determine la cualitât des recensions</string>
     <!-- Text for title of settings section. -->
@@ -2389,6 +2447,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">No sta tradusi mai dal %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">No sta voltâ mai chest sît</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Al sostituìs dutis lis altris impostazions</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Al sostituìs la sielte par proponi la traduzion</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Impostazions di traduzion</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 1d46f9afd..fec73513a 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -262,8 +262,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scanne</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Sykmasine</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Ynstellingen sykmasine</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -319,14 +317,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Meldingen helpe jo mear te dwaan mei %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Meldingen helpe jo mear te dwaan mei %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Syngronisearje jo ljepblêden tusken apparaten, behear downloads, krij tips oer it optimaal benutten fan de privacybeskerming fan %s en mear.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Syngronisearje jo ljepblêden tusken apparaten, behear downloads, krij tips oer it optimaal benutten fan de privacybeskerming fan %s en mear.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Trochgean</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Trochgean</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">No net</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">No net</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -443,21 +441,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Allinnich-HTTPS-modus</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduksje fan cookiebanners</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blokkearring fan cookiebanners</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blokkearring fan cookiebanners wylst priveenavigaasje</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookiebanners redusearje</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Ut</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Oan</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s probearret automatysk cookiefersiken op cookiebanners te wegerjen.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Ut foar dizze website</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -475,35 +463,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Website wurdt op dit stuit net stipe</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduksje fan cookiebanners ynskeakelje foar %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Blokkearring fan cookiebanners ynskeakelje foar %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduksje fan cookiebanners útskeakelje foar %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Blokkearring fan cookiebanners útskeakelje foar %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s kin cookiefersiken op dizze website net automatysk wegerje. Jo kinne in oanfraach stjoere om dizze website yn de takomst te stypjen.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s wisket de cookies foar dizze website en fernijt de side. As alle cookies wiske wurde, wurde jo mooglik ôfmeld of wurde winkelweintsjes lege.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Skeakelje dit út en %1$s sil cookies wiskje en dizze website opnij lade. Dit kin jo ôfmelde of winkelweintsjes leegje.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s probearret alle cookiefersiken op stipe websites automatysk te wegerjen.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Skeakelje dit yn en %1$s sil probearje cookiebanners op dizze website automatysk te wegerjen.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s tastean om cookiebanners te wegerjen?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s kin in protte cookiebannerfersiken automatysk wegerje.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">No net</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Jo sille minder cookie-oanfragen sjen</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Tastean</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s hat sakrekt cookies foar jo wegere</string>
@@ -720,6 +689,8 @@
     <string name="preferences_sync_bookmarks">Blêdwizers</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Oanmeldingen</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Wachtwurden</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Iepen ljeplêden</string>
     <!-- Preference for signing out -->
@@ -746,6 +717,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Creditcards</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Betellingsmetoaden</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adressen</string>
 
@@ -1279,8 +1252,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Slute</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Kin net ôfdrukke</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Kin dizze side net ôfdrukke</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Ofdrukke</string>
@@ -1684,8 +1655,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Oanmeldingen en wachtwurden</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Wachtwurden</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Oanmeldingen en wachtwurden bewarje</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Wachtwurden bewarje</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Freegje om te bewarjen</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1702,16 +1677,27 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Oanmelding tafoegje</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Wachtwurd tafoegje</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Oanmeldingen syngronisearje</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Wachtwurden syngronisearje</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Oanmeldingen op apparaten syngronisearje</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Wachtwurden syngronisearje tusken apparaten</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Bewarre oanmeldingen</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Bewarre wachtwurden</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">De oanmeldingen dy’t jo bewarje of syngronisearje mei %s wurde hjir toand.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Mear ynfo oer Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Mear ynfo oer syngronisaasje</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Utsûnderingen</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
@@ -1772,6 +1758,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menu Oanmeldingen sortearje</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Wachtwurdmenu sortearje</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Automatysk ynfolje</string>
@@ -1779,8 +1768,12 @@
     <string name="preferences_addresses">Adressen</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Creditcards</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Betellingsmetoaden</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Kaarten bewarje en automatysk ynfolje</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Betellingsmetoaden bewarje en ynfolje</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Gegevens binne fersifere</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
@@ -1790,17 +1783,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Creditcard tafoegje</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Kaart tafoegje</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Bewarre kaarten beheare</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Kaarten beheare</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adres tafoegje</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Adressen beheare</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Adressen bewarje en automatysk ynfolje</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Adressen bewarje en ynfolje</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Ynformaasje lykas nûmers, e-mail- en ferstjoeradressen tafoegje</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Ynklusyf telefoannûmers en e-mailadressen</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Kaart tafoegje</string>
 
@@ -1822,6 +1824,8 @@
     <string name="credit_cards_delete_card_button">Kaart fuortsmite</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Binne jo wis dat jo dizze creditcard fuortsmite wolle?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Kaart fuortsmite?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Fuortsmite</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1837,12 +1841,18 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Fier in jildich creditkaartnûmer yn</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Fier in jildich kaartnûmer yn</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Folje dit fjild yn</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Foegje in namme ta</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Untskoattelje om jo bewarre kaarten te besjen</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Befeiligje jo creditcards</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Befeiligje jo bewarre betelmetoaden</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre creditcards te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
 
@@ -1893,6 +1903,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Binne jo wis dat jo dit adres fuortsmite wolle?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Dit adres fuortsmite?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Fuortsmite</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2186,8 +2198,6 @@ Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Hichtepunten</b> binne ôfkomstich fan beoardielingen fan %s yn de ôfrûne 80 dagen dy’t neffens ús betrouber binne.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Mear ynfo oer %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">hoe %s troch Mozilla de beoardielingskwaliteit bepaalt</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">hoe %s de beoardielingskwaliteit bepaalt</string>
     <!-- Text for title of settings section. -->
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index d95298bd1..862955cb7 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -261,8 +261,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Numerizar</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Motor de recèrca</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Paramètres del motor de recèrca</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -317,14 +315,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Las notificacions vos ajudan a ne far mai amb %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Las notificacions vos ajudan a ne far mai amb %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sincronizar los onglets entre vòstres aparelhs, gerissètz los telecargaments, obtenètz de conselhs per trapar çò melhor de la proteccion de la vida privada de %s e encara mai.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sincronizar los onglets entre vòstres aparelhs, gerissètz los telecargaments, obtenètz de conselhs per trapar çò melhor de la proteccion de la vida privada de %s e encara mai.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Contunhar</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Contunhar</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Mai tard</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Mai tard</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -442,21 +440,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Mòde HTTPS solament</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduccion de las bandièras de cookies</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blocador de bandièras de cookies</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blocador de bandièras de cookies en navegacion privada</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduire las bandièras de cookies</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Desactivada</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Activada</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ensaja de regetar automaticament las demandas de cookies de las banièras de cookies.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Desactivada per aqueste site</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -474,37 +462,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Site actualament pas pres en carga</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Activar la reduccion de las bandièras de cookies per %1$s ?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Activar lo blocador de bandièras de cookies per aqueste site %1$s ?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Desactivar la reduccion de las bandièras de cookies per %1$s ?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Desactivar lo blocador de bandièras de cookies per %1$s ?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s pòt pas refusar automaticament las demandas de cookies per aqueste site. Podètz enviar una demanda de presa en carga d’aqueste site pel futur.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s escafarà los cookies d’aqueste site e actualizarà la pagina. La supression de totes los cookies pòt vos desconnectar o voidar los panièrs de crompa.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Desactivatz-lo e %1$s escafarà los cookies puèi recargarà aqueste site. Vos poiriá desconnectar de la session o voidar lo panièr de crompas.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ensaja de regetar automaticament totas las demandas de cookies suls sites compatibles.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Activatz-lo e %1$s ensajarà de refusar automaticament las banièras de cookies sus aqueste site.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Autorizar %1$s a refusar las bandièras de cookies ?</string>
-
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s pòt refusar automaticament nombrosas demandas de cookies.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Mai tard</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Veiretz mens de demandas de cookies</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Autorizar</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s ven de refusar un cookie per vos</string>
@@ -727,6 +695,8 @@
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Identificants</string>
 
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Senhals</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Onglets dobèrts</string>
     <!-- Preference for signing out -->
@@ -754,6 +724,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Cartas de crèdit</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Metòdes de pagament</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adreças</string>
 
@@ -1301,8 +1273,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Ignorar</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Impression impossibla</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Impossible d’imprimir aquesta pagina</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Imprimir</string>
@@ -1718,8 +1688,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Identificants e senhals</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Senhals</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Salvar los identificants e senhals</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Salvar senhals</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Demandar per salvar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1738,26 +1712,43 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Apondre un identificant</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Apondre un senhal</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronizar los identificants</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizar los senhals</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sincronizar los identificants entre totes los periferics</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronizar los senhals entre los periferics</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Identificants salvats</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Senhals salvats</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Aquí se mòstran los identificants que salvatz o sincronizatz amb %s.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Per ne saber mai sus Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Per ne saber mai sus sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Excepcions</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Los identificants e senhals pas salvats seràn mostrats aquí.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s enregistrarà pas los senhals pels sites listats aicí.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Los identificants e senhals seràn pas salvats per aquestes sites.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s enregistrarà pas los senhals per aquestes sites.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Suprimir totas las excepcions</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Recercar d’identificants</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Recercar de senhals</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Site</string>
     <!-- The header for the username for a login -->
@@ -1787,8 +1778,12 @@
 
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Desblocatz per veire los identificants enregistrats</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desblocatz per veire los senhals salvats</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Protegissètz vòstres identificants e senhals</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Securizatz los senhals salvats</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Configuratz un esquèma de verrolhatge, un còdi PIN o un senhal per protegir vòstres identificants de connexion e senhals enregistrats se per cas qualqu’un accedisca a vòstre periferic.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1809,6 +1804,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menú per triar los identificants</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menú de tria dels senhals</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Emplenament automatic</string>
@@ -1816,6 +1814,8 @@
     <string name="preferences_addresses">Adreças</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Cartas de crèdit</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Metòdes de pagament</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Salvar e completar automaticament las cartas</string>
     <!-- Preference summary for saving and autofilling credit card data -->
@@ -1827,8 +1827,12 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Apondre una cartas de crèdit</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Apondre una carta</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Gerir las cartas enregistradas</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gerir las cartas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Apondre una adreça</string>
     <!-- Preference option for managing saved addresses -->
@@ -1859,6 +1863,8 @@
     <string name="credit_cards_delete_card_button">Suprimir la carta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Volètz vertadièrament suprimir aquesta carta bancària ?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Suprimir la carta ?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Suprimir</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1874,8 +1880,12 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Picatz un numèro de carta de crèdit valid</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Picatz un numèro de carta valid</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Completatz aqueste camp</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Apondre un nom</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desblocatz per veire las cartas enregistradas</string>
 
@@ -1930,6 +1940,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Volètz vertadièrament suprimir aquesta adreça ?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Suprimir aquesta adreça ?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Suprimir</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2016,7 +2028,7 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <!-- label shown when there are not site exceptions to show in the site exception settings -->
     <string name="no_site_exceptions">Cap d’excepcions de site</string>
     <!-- Bookmark deletion confirmation -->
-    <string name="bookmark_deletion_confirmation">Sètz segur que volètz suprimir aqueste marcapagina ?</string>
+    <string name="bookmark_deletion_confirmation">Volètz vertadièrament suprimir aqueste marcapagina ?</string>
     <!-- Browser menu button that adds a shortcut to the home fragment -->
     <string name="browser_menu_add_to_shortcuts">Apondre als acorchis</string>
     <!-- Browser menu button that removes a shortcut from the home fragment -->
@@ -2029,7 +2041,7 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Modificar</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Sètz segur que volètz suprimir aqueste identificant ?</string>
+    <string name="login_deletion_confirmation">Volètz vertadièrament suprimir aqueste identificant ?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Suprimir</string>
 
@@ -2037,6 +2049,8 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <string name="dialog_delete_negative">Anullar</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Opcions de l’identificant</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opcions de senhal</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Lo camp de tèxt modificable per l’adreça web de l’identificant.</string>
     <!--  The editable text field for a login's username. -->
@@ -2045,16 +2059,28 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <string name="saved_login_password_description">Lo camp de tèxt modificable pel senhal de l’identificant.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Enregistratz las modificacions de l’identificant.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Enregistrar las modificacions.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Modificar</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Modificar lo senhal</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Apondre un identificant novèl</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Apondre un senhal</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Senhal requesit</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Picar lo senhal</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Lo nom d’utilizaire es obligatòri</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Picar un nom d’utilizaire</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Lo nom d’òste es obligatòri</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Picar una adreça web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Recèrca a la votz</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2225,8 +2251,6 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Notables</b> venon dels avises de %s dels darrièrs 80 jorns que pensam que son fisables.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Per ne saber mai sus %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">cossí %s per Mozilla determina la qualitat de l’avís</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">cossí %s determina la qualitat de l’avís</string>
     <!-- Text for title of settings section. -->
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index 1ff7fc2ed..48fcd8d26 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -259,8 +259,6 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">سايىلەش</string>
 
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">ئىزدەش ماتورى</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">ئىزدەش ماتورى تەڭشىكى</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -311,14 +309,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">ئۇقتۇرۇشلار %s بىلەن تېخىمۇ كۆپ ئىشلارنى قىلىشىڭىزغا ياردەم بېرىدۇ</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">ئۇقتۇرۇشلار %s بىلەن تېخىمۇ كۆپ ئىشلارنى قىلىشىڭىزغا ياردەم بېرىدۇ</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">بەتكۈچلىرىڭىزنى ئۈسكۈنىلەر ئارا قەدەمداشلايدۇ، چۈشۈرۈشنى باشقۇرىدۇ، %s نىڭ شەخسىيەت قوغدىشى ۋە باشقا تېخىمۇ كۆپ ئىشلىتىش ھەققىدىكى تەكلىپلەرگە ئېرىشتۈرىدۇ.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">بەتكۈچلىرىڭىزنى ئۈسكۈنىلەر ئارا قەدەمداشلايدۇ، چۈشۈرۈشنى باشقۇرىدۇ، %s نىڭ شەخسىيەت قوغدىشى ۋە باشقا تېخىمۇ كۆپ ئىشلىتىش ھەققىدىكى تەكلىپلەرگە ئېرىشتۈرىدۇ.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">داۋاملاشتۇر</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">داۋاملاشتۇر</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">ھازىر ئەمەس</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">ھازىر ئەمەس</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -435,20 +433,10 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">ساپ HTTPS ھالىتى</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">cookie لوزۇنكىسىنى ئازايتىش</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">cookie لوزۇنكىسى توسقۇچ</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">شەخسىي تور زىيارەتتىكى cookie لوزۇنكىسىنى توسقۇچ</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">cookie لوزۇنكىسىدىن ساقلان</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">تاقاق</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">ئوچۇق</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ئۆزلۈكىدىن cookie لوزۇنكىسىنىڭ cookie ئىلتىماسىنى رەت قىلىشنى سىنايدۇ.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">بۇ تور بېكەتكە تاقاق</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -467,33 +455,15 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">بېكەت ھازىر قوللىمايدۇ</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s غا cookie لوزۇنكىسى ئازايتىشنى ئاچامدۇ؟</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">%1$s غا cookie لوزۇنكىسى توسقۇچنى ئاچامدۇ؟</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s غا cookie لوزۇنكىسى ئازايتىشنى تاقامدۇ؟</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">%1$s غا cookie لوزۇنكىسى توسقۇچنى تاقامدۇ؟</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s بۇ تور بېكەتنىڭ ساقلانما ئىلتىماسىنى ئۆزلۈكىدىن رەت قىلالمايدۇ. كەلگۈسىدە بۇ تور بېكەتنى قوللاش ئىلتىماسىنى ئەۋەتسىڭىز بولىدۇ.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s بۇ تور بېكەتنىڭ ساقلانمىسىنى تازىلاپ بەتنى يېڭىلايدۇ. بارلىق ساقلانمىلار تازىلانسا سىز تىزىمدىن چىقىپ كېتىشىڭىز ياكى مال ھارۋىسى بوشىتىلىشى مۇمكىن.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">تاقالسا ۋە %1$s ساقلانمىنى تازىلاپ بۇ تور بېكەتنى قايتا يۈكلەيدۇ. سىز تىزىمدىن چىقىپ كېتىشىڭىز ياكى مال ھارۋىسى بوشىتىلىشى مۇمكىن.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s قوللايدىغان تور بېكەتلەرنىڭ بارلىق ساقلانما تەلەپلىرىنى ئاپتوماتىك رەت قىلىشنى سىنايدۇ.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">ئېچىلسا، %1$s بۇ تور بېكەتتىكى بارلىق ساقلانما لوزۇنكىسىنى ئۆزلۈكىدىن رەت قىلىشنى سىنايدۇ.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s نىڭ cookie لوزۇنكىسىنى رەت قىلىشىغا يول قويامدۇ؟</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s نۇرغۇن cookie لوزۇنكا تەلىپىنى ئاپتوماتىك رەت قىلالايدۇ.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">ھازىر ئەمەس</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">سىز كۆرىدىغان cookie ئىلتىماسلىرى ئازىيىدۇ</string>
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">يول قوي</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s سىز ئۈچۈن ساقلانمىنى رەت قىلدى</string>
@@ -1280,8 +1250,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">بولدىلا</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">باسالمىدى</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">بۇ بەتنى باسالمايدۇ</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">باس</string>
@@ -1771,10 +1739,16 @@
 
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">ساقلانغان كىرىشلىرىڭىزنى كۆرۈش ئۈچۈن قۇلۇپ ئېچىڭ</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">ساقلانغان پارولىڭىزنى كۆرۈش ئۈچۈن قۇلۇپ ئېچىڭ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">كىرىش ۋە ئىمنى قوغدايدۇ</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">ساقلانغان ئىملىرىڭىز شىفىرلىنىدۇ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان تىزىمغا كىرىش ئۇچۇرى ۋە ئىمنى زىيارەت قىلالمايدۇ.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان ئىملىرىڭىزنى زىيارەت قىلالمايدۇ.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">كېيىنچە</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1794,6 +1768,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">كىرىش تىزىملىكىنى تەرتىپلەيدۇ</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">ئىم تىزىملىكىنى تەرتىپلە</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">ئاپتوماتىك تولدۇر</string>
@@ -1801,27 +1778,42 @@
     <string name="preferences_addresses">ئادرېس</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">ئىناۋەتلىك كارتا</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">چىقىم قىلىش ئۇسۇلى</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">كارتا ساقلاش ۋە ئاپتوماتىك تولدۇرۇش</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">چىقىم قىلىش ئۇسۇلىنى ساقلاپ ۋە تولدۇرىدۇ</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">سانلىق مەلۇمات شىفىرلانغان</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">سىز ساقلىغان بارلىق چىقىم قىلىش ئۇسۇللىرىنى %s شىفىرلايدۇ</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">كارتىنى ئۈسكۈنىلەر ئارا قەدەمداشلايدۇ</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">كارتا قەدەمداشلا</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">ئىناۋەتلىك كارتا قوش</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">كارتا قوش</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">ساقلانغان كارتا باشقۇرۇش</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">كارتا باشقۇرۇش</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">ئادرېس قوش</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">ئادرېس باشقۇرۇش</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">ئادرېسلارنى ساقلاش ۋە ئاپتوماتىك تولدۇرۇش</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">ئادرېس ساقلاپ تولدۇرىدۇ</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">سان، ئېلخەت ۋە توشۇش ئادرېسى قاتارلىق ئۇچۇرلارنى ئۆز ئىچىگە ئالىدۇ</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">تېلېفون نومۇرى ۋە ئېلخەت ئادرېسىنى ئۆز ئىچىگە ئالىدۇ</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">كارتا قوش</string>
     <!-- Title of the "Edit card" screen -->
@@ -1842,6 +1834,8 @@
     <string name="credit_cards_delete_card_button">كارتىنى ئۆچۈر</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">بۇ ئىناۋەتلىك كارتىنى راستىنلا ئۆچۈرەمسىز؟</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">كارتىنى ئۆچۈرەمدۇ؟</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">ئۆچۈر</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1854,15 +1848,23 @@
     <string name="credit_cards_saved_cards">ساقلانغان كارتا</string>
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">ئىناۋەتلىك كارتا نومۇرىنى كىرگۈزۈڭ</string>
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">ئىناۋەتلىك كارتا نومۇرى كىرگۈزۈلىدۇ</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">بۇ بۆلەكنى تولدۇرۇڭ</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">ئات قوش</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">ساقلانغان كارتىلىرىڭىزنى كۆرۈش ئۈچۈن قۇلۇپ ئېچىڭ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">ئىناۋەتلىك كارتىڭىزنى شىفىرلايدۇ</string>
 
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">ساقلانغان چىقىم قىلىش ئۇسۇللىرىڭىز شىفىرلىنىدۇ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان ئىناۋەتلىك كارتىڭىزنى زىيارەت قىلالمايدۇ.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان كارتىلىرىڭىزنى زىيارەت قىلالمايدۇ.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">ھازىر تەڭشە</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1871,6 +1873,8 @@
     <string name="credit_cards_biometric_prompt_message_pin">ئۈسكۈنىڭىزنىڭ قۇلۇپىنى ئېچىڭ</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">ساقلانغان ئىناۋەتلىك كارتا ئۇچۇرلىرىنى ئىشلىتىش ئۈچۈن قۇلۇپ ئېچىڭ</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">ساقلانغان چىقىم قىلىش ئۇسۇلىنى ئىشلىتىش ئۈچۈن قۇلۇپ ئېچىڭ</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">ئادرېس قوش</string>
     <!-- Title of the "Edit address" screen -->
@@ -1907,6 +1911,8 @@
     <string name="addressess_delete_address_button">ئادرېس ئۆچۈر</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">بۇ ئادرېسنى راستىنلا ئۆچۈرەمسىز؟</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">بۇ ئادرېسنى ئۆچۈرەمدۇ؟</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">ئۆچۈر</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2005,31 +2011,53 @@
     <string name="login_menu_edit_button">تەھرىر</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">بۇ كىرىشنى راستىنلا ئۆچۈرەمسىز؟</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">بۇ ئىمنى راستىنلا ئۆچۈرەمسىز؟</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">ئۆچۈر</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">ۋاز كەچ</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">كىرىش تاللانمىلىرى</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">ئىم تاللانمىسى</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">كىرىشنىڭ تور ئادرېسىنى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">ئىمنىڭ تور بېكەت ئادرېسىدىكى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">كىرىشنىڭ ئىشلەتكۈچى ئىسمىنى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
 
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">ئىمنىڭ ئىشلەتكۈچى ئىسمىدىكى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">كىرىشنىڭ ئىمىنى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">ئىمنىڭ تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">كىرىش ئۆزگەرتىشلىرىنى ساقلايدۇ.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">ئۆزگەرتىشلەرنى ساقلايدۇ.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">تەھرىر</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">ئىم تەھرىر</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">يېڭى كىرىش قوش</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">ئىم قوش</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">ئىم زۆرۈر</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">ئىم كىرگۈزۈلىدۇ</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">ئىشلەتكۈچى ئىسمى زۆرۈر</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">ئىشلەتكۈچى ئاتى كىرگۈزۈلىدۇ</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">مۇلازىم ئىسمى زۆرۈر</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">تور ئادرېسى كىرگۈزۈلىدۇ</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">ئاۋازلىق ئىزدەش</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2193,8 +2221,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>يارقىن نۇقتىلار</b> بىز ئىشەنچلىك دەپ قارىغان يېقىنقى 80 كۈن ئىچىدىكى %s باھادىن كەلگەن.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">%s ھەققىدىكى تەپسىلاتلار.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">Mozilla قانداق قىلىپ %s نىڭ تەكشۈرۈش سۈپىتىنى بەلگىلەيدۇ</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">%s تەكشۈرۈش سۈپىتىنى قانداق بەلگىلەيدۇ</string>
     <!-- Text for title of settings section. -->
@@ -2407,6 +2433,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">%1$s نى ھەرگىز تەرجىمە قىلمىسۇن</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">بۇ تور بەتنى تەرجىمە قىلمىسۇن</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">باشقا بارلىق تەڭشەكلەرنى قاپلايدۇ</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">تەرجىمە تەكلىپىنى قاپلايدۇ</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">تەرجىمە تەڭشەكلىرى</string>
 

From 5c381185e7739320d6f29cf8f46cfbd569c2d3c3 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Sun, 28 Jan 2024 00:03:57 +0000
Subject: [PATCH 043/222] Import translations from android-l10n

---
 app/src/main/res/values-am/strings.xml |  45 +-----
 app/src/main/res/values-cs/strings.xml | 115 +++++++++-----
 app/src/main/res/values-fi/strings.xml |   6 +
 app/src/main/res/values-oc/strings.xml |  32 ++++
 app/src/main/res/values-si/strings.xml |  93 ++++++-----
 app/src/main/res/values-sq/strings.xml | 107 ++++++++-----
 app/src/main/res/values-th/strings.xml | 205 +++++++++++++++++++------
 app/src/main/res/values-uk/strings.xml |   6 +-
 8 files changed, 397 insertions(+), 212 deletions(-)

diff --git a/app/src/main/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml
index 07c85260b..0e91772a4 100644
--- a/app/src/main/res/values-am/strings.xml
+++ b/app/src/main/res/values-am/strings.xml
@@ -256,8 +256,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">ቃኝ</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">የፍለጋ ፍርግም</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">የፍለጋ ፍርግም ቅንብሮች</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -310,14 +308,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">ማሳወቂያዎች በ%s የበለጠ እንዲሰሩ ያግዝዎታል</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">ማሳወቂያዎች በ%s የበለጠ እንዲሰሩ ያግዝዎታል</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">ትሮችዎን በመሳሪያዎች መካከል ያመሳስሉ፣ ውርዶችን ያስተዳድሩ፣ የ%sን ግላዊነት ጥበቃን የበለጠ ስለመጠቀም እና ሌሎችም ጠቃሚ ምክሮችን ያግኙ።</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">ትሮችዎን በመሳሪያዎች መካከል ያመሳስሉ፣ ውርዶችን ያስተዳድሩ፣ የ%sን ግላዊነት ጥበቃን የበለጠ ስለመጠቀም እና ሌሎችም ጠቃሚ ምክሮችን ያግኙ።</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">ቀጥል</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">ቀጥል</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">አሁን አይሆንም</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">አሁን አይሆንም</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -435,20 +433,10 @@
     <string name="preferences_https_only_title">HTTPS-ብቻ ሁነታ</string>
 
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">የኩኪ ሰሌዳ ቅነሳ</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">የኩኪ ባነር ማገጃ</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">በግል አሰሳ ውስጥ የኩኪ ባነር ማገጃ</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">የኩኪ ሰሌዳዎችን ይቀንሱ</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">ጠፍቷል</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">በርቷል</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s በኩኪ ሰንደቆች ላይ የኩኪ ጥያቄዎችን በራስ-ሰር ውድቅ ለማድረግ ይሞክራል።</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">ለዚህ ድረ-ገፅ ጠፍቷል</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -465,38 +453,19 @@
     <string name="reduce_cookie_banner_unsupported_site_request_submitted_2">የድጋፍ ጥያቄው ተልኳል</string>
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">በአሁኑ ጊዜ የማይደገፍ ድረ-ገፅ</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">ለ%1$s የኩኪ ሰሌዳ ቅነሳ ይብራ?</string>
 
 
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">ለ%1$s የኩኪ ባነር ማገጃ ይብራ?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">ለ%1$s የኩኪ ሰሌዳ ቅነሳ ይጥፋ?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">ለ%1$s የኩኪ ባነር ማገጃ ይጥፋ?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s በዚህ ጣቢያ ላይ የኩኪ ጥያቄዎችን በራስ ሰር ውድቅ ማድረግ አይችልም። ለወደፊቱ ይህንን ጣቢያ ለመደገፍ ጥያቄ መላክ ይችላሉ።</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s የዚህን ድረ-ገፅ ኩኪዎች ያፀዳ እና ገጹን ያድሳል። ሁሉንም ኩኪዎች ማጽዳት እርስዎን ሊያስወጣዎት ወይም የግዢ ጋሪዎችን ባዶ ሊያደርግ ይችላል።</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">አጥፋ እና %1$s ኩኪዎችን አጽድቶ ይህን ጣቢያ እንደገና ይጭናል። ይህ ሊያስወጣዎት ወይም የግዢ ጋሪዎችን ባዶ ሊያደርግ ይችላል።</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s በሚደገፉ ድረ-ገፆች ላይ ያሉ ሁሉንም የኩኪ ጥያቄዎችን በራስ ሰር ውድቅ ለማድረግ ይሞክራል።</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">አብራ እና %1$s በዚህ ጣቢያ ላይ ያሉትን ሁሉንም የኩኪ ባነሮች በራስ ሰር እምቢ ለማለት ይሞክራል።</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s የኩኪ ሰንደቆችን ውድቅ እንዲያደርግ ይፈቀድለት?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ብዙ የኩኪ ባነር ጥያቄዎችን በራስ ሰር ውድቅ ያደርጋል።</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">አሁን አይሆንም</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">ያነሱ የኩኪ ጥያቄዎችን ያያሉ</string>
-
 
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">ፍቀድ</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s አሁን ለእርስዎ ኩኪዎችን አልተቀበለም</string>
@@ -713,6 +682,8 @@
     <string name="preferences_sync_bookmarks">እልባቶች</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">መግቢያዎች</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">የይለፍ ቃሎች</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">ክፍት ትሮች</string>
     <!-- Preference for signing out -->
@@ -1270,8 +1241,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">አሰናብት</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">ማተም አልተቻለም</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">ይህን ገጽ ማተም አልተቻለም</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">አትም</string>
@@ -2157,8 +2126,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>ዋና ዋናዎቹ</b> አስተማማኝ ናቸው ብለን የምናምንባቸው ባለፉት 80 ቀናት ውስጥ ከ%s ግምገማዎች የተገኙ ናቸው።]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">ስለ%s የበለጠ ይወቁ።</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">%s በሞዚላ እንዴት የግምገማ ጥራት እንደሚወስን</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">%s የግምገማ ጥራትን እንዴት እንደሚወስን</string>
     <!-- Text for title of settings section. -->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 2ace826fc..00d156123 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -267,8 +267,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Naskenovat</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Vyhledávač</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Nastavení vyhledávače</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -323,14 +321,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Oznámení vám pomohou s aplikací %s udělat více</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Oznámení vám pomohou s aplikací %s udělat více</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synchronizujte své panely mezi zařízeními, spravujte stahování a získejte tipy, jak co nejlépe v aplikaci %s využívat ochranu soukromí a další.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synchronizujte své panely mezi zařízeními, spravujte stahování a získejte tipy, jak co nejlépe v aplikaci %s využívat ochranu soukromí a další.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Pokračovat</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Pokračovat</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Teď ne</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Teď ne</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -447,20 +445,10 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Režim „pouze HTTPS“</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Omezení cookie lišt</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blokování lišt cookie</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blokování lišt cookie při anonymním prohlížení</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Omezit cookie lišty</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Vypnuto</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Zapnuto</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s se automaticky pokusí odmítat cookie lišty žádající povolení používání cookies.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Vypnuto pro tento web</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -478,34 +466,15 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Server není aktuálně podporován</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Chcete zapnout omezení cookie lišt pro %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Zapnout blokování lišť cookie pro %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Chcete vypnout omezení cookie lišt pro %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Vypnout blokování lišť cookie pro %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s nemůže pro tuto stránku automaticky blokovat lištu s žádostí ohledně souborů cookie. Můžete však poslat žádost o podporu této stránky do budoucna.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s smaže cookies tohoto webu a stránku znovu načte. Vymazání všech cookies může způsobit vaše odhlášení nebo třeba vyprázdnění nákupního koše.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Vypněte a %1$s vymaže soubory cookie a znovu načte tuto stránku. To vás může odhlásit nebo vyprázdnit nákupní košíky.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s se pokusí automaticky odmítnout všechny žádosti o povolení cookies na podporovaných serverech.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Zapněte a %1$s se pokusí automaticky odmítnout všechny lišty cookie na této stránce.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Povolit aplikaci %1$s odmítat cookie lišty?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s dokáže automaticky odmítat mnoho lišt s žádostmi o povolení cookies.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Teď ne</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Uvidíte méně požadavků na cookies</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Povolit</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s za vás odmítl cookies</string>
@@ -722,6 +691,8 @@
     <string name="preferences_sync_bookmarks">Záložky</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Přihlašovací údaje</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Hesla</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Otevřené panely</string>
     <!-- Preference for signing out -->
@@ -749,6 +720,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Platební karty</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Platební metody</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresy</string>
 
@@ -1297,8 +1270,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Zavřít</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Nelze tisknout</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Tuto stránku nelze vytisknout</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Tisk</string>
@@ -1706,8 +1677,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Přihlašovací údaje</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Hesla</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Ukládat přihlašovací údaje</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Ukládání hesel</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Před uložením se zeptat</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1724,26 +1699,43 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Přidat přihlašovací údaje</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Přidat heslo</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Synchronizovat přihlašovací údaje</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synchronizovat hesla</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Synchronizovat přihlašovací údaje mezi zařízeními</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synchronizovat hesla napříč zařízeními</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Uložené přihlašovací údaje</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Uložená hesla</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Uložené nebo synchronizované údaje aplikace %s se zobrazí tady.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Zjistit více o službě Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Další informace o synchronizaci</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Výjimky</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Tady se zobrazí přihlašovací údaje, které se nebudou ukládat.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">Aplikace %s nebude nikdy ukládat hesla pro stránky uvedené v tomto seznamu.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Pro následující servery se nebudou přihlašovací údaje ukládat.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">Aplikace %s nebude nikdy ukládat hesla pro tyto stránky.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Odebrat všechny výjimky</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Hledat přihlašovací údaje</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Hledat v heslech</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Server</string>
     <!-- The header for the username for a login -->
@@ -1772,8 +1764,12 @@
     <string name="saved_login_hide_password">Skrýt heslo</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Odemknout pro zobrazení přihlašovacích údajů</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Pro zobrazení uložených hesel odemkněte</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Zabezpečte své přihlašovací údaje a hesla</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Zabezpečte svá uložená hesla</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Nastavte si gesto, PIN nebo heslo zámku obrazovky, který ochrání vaše uložené přihlašovací údaje, pokud by se vaše zařízení dostalo do ruky někomu jinému.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1803,10 +1799,16 @@
     <string name="preferences_addresses">Adresy</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Platební karty</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Platební metody</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Ukládat a automaticky vyplňovat karty</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Uložení a vyplnění platebních metod</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data jsou šifrována</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s šifruje všechny vaše uložené platební metody</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synchronizovat karty napříč zařízeními</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1814,17 +1816,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Přidat platební kartu</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Přidat kartu</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Správa uložených karet</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Spravovat karty</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Přidat adresu</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Správa adres</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Ukládat a automaticky vyplňovat adresy</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Ukládat a vyplňovat adresy</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Zahrnuje informace jako čísla a e-mailové a doručovací adresy</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Zahrnuje telefonní čísla a e-mailové adresy</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Přidat kartu</string>
     <!-- Title of the "Edit card" screen -->
@@ -1845,6 +1856,8 @@
     <string name="credit_cards_delete_card_button">Odstranit kartu</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Opravdu chcete tuto platební kartu smazat?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Odstranit kartu?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Smazat</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1860,12 +1873,18 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Zadejte prosím platné číslo platební karty</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Zadejte platné číslo karty</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Vyplňte prosím toto pole</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Zadejte jméno</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Odemknout pro zobrazení uložených karet</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Zabezpečte své platební karty</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Zabezpečte vaše uložené platební metody</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Nastavte si gesto, PIN nebo heslo zámku obrazovky, který ochrání vaše uložené platební karty, pokud by se vaše zařízení dostalo do ruky někomu jinému.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1915,6 +1934,8 @@
     <string name="addressess_delete_address_button">Smazat adresu</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Opravdu chcete tuto adresu smazat?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Smazat tuto adresu?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Smazat</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2015,12 +2036,16 @@
     <string name="login_menu_edit_button">Upravit</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Opravdu chcete tyto přihlašovací údaje odstranit?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Opravdu chcete smazat toto heslo?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Odstranit</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Zrušit</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Možnosti přihlášení</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Možnosti hesel</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Textové pole pro webovou adresu pro přihlašovací údaje.</string>
     <!--  The editable text field for a login's username. -->
@@ -2029,16 +2054,28 @@
     <string name="saved_login_password_description">Textové pole pro heslo z přihlašovacích údajů.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Uložit změny přihlašovacích údajů.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Uložit změny.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Upravit</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Upravit heslo</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Přidat nové přihlašovací údaje</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Přidat heslo</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Je vyžadováno heslo</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Zadejte heslo</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Uživatelské je povinné</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Zadejte uživatelské jméno</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Adresa serveru je povinná</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Zadejte webovou stránku</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Hlasové vyhledávání</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2209,8 +2246,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Výběr</b> z recenzí %s za posledních 80 dní, které považujeme za spolehlivé.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Zjistit více o %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">jak %s od Mozilly určuje kvalitu recenzí</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">jak %s určuje kvalitu recenze</string>
     <!-- Text for title of settings section. -->
@@ -2413,6 +2448,8 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Nikdy nepřekládat z jazyka %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Nikdy nepřekládat tuto stránku</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Přepíše všechna ostatní nastavení</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Nastavení překladu</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 90e41e2f8..b12aece6c 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -2330,8 +2330,14 @@
     <string name="review_quality_check_no_analysis_body">Tarkista arvostelun laatu, jos haluat tietää, ovatko tämän tuotteen arvostelut luotettavia. Se kestää vain noin 60 sekuntia.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
     <string name="review_quality_check_no_analysis_link">Tarkista arvostelun laatu</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Kokeile luotettavaa tuotearvosteluopastamme</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Lue lisää</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Tietosuojakäytäntö</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Käyttöehdot</string>
     <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_primary_button_text">Kyllä, kokeile</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 862955cb7..9d7ae7841 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -1729,6 +1729,9 @@
     <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Senhals salvats</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Aquí se mòstran los identificants que salvatz o sincronizatz amb %s.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Los senhals que salvatz o sincronizatz amb %s seràn listats aquí. Totes los senhals qu’enregistratz son chifrats.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Per ne saber mai sus Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
@@ -1786,6 +1789,8 @@
     <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Securizatz los senhals salvats</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Configuratz un esquèma de verrolhatge, un còdi PIN o un senhal per protegir vòstres identificants de connexion e senhals enregistrats se per cas qualqu’un accedisca a vòstre periferic.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Configuratz un esquèma de desverrolhatge, un còdi PIN o un senhal per protegir vòstres senhals salvats se per cas qualqu’un accedisca a vòstre aparelh.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Mai tard</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1818,8 +1823,12 @@
     <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Metòdes de pagament</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Salvar e completar automaticament las cartas</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Enregistrar e entresenhar los metòdes de pagament</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Donadas chifradas</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s chifra totes los metòdes de pagament qu’enregistratz</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar las cartas entre los periferics</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1840,9 +1849,14 @@
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Salvar e completar automaticament las adreças</string>
 
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Salvar e emplenar automaticament las adreças</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Inclutz las informacions coma los numèros, las adreças electronicas e las adreças de liurason</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Incluses los numèros de telefòn e las adreças electronicas</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Apondre una carta</string>
     <!-- Title of the "Edit card" screen -->
@@ -1891,8 +1905,12 @@
 
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Securizatz vòstras cartas de crèdit</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Securizatz los metòdes de pagament enregistrats</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configuratz un esquèma de verrolhatge, un còdi PIN o un senhal per protegir vòstres identificants de cartas de crèdit enregistrats se per cas qualqu’un accedisca a vòstre periferic.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configuratz un esquèma de desverrolhatge, un còdi PIN o un senhal per protegir vòstras cartas salvadas se per cas qualqu’un accedisca a vòstre aparelh.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ara</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1903,6 +1921,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Desverrolhatz per utilizar las informacions de cartas de crèdit enregistradas</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desblocatz per utilizar de metòdes de pagament enregistrats</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Apondon d’adreça</string>
     <!-- Title of the "Edit address" screen -->
@@ -2042,6 +2062,8 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <string name="login_menu_edit_button">Modificar</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Volètz vertadièrament suprimir aqueste identificant ?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Volètz vertadièrament suprimir aqueste senhal ?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Suprimir</string>
 
@@ -2053,10 +2075,16 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Opcions de senhal</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Lo camp de tèxt modificable per l’adreça web de l’identificant.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Lo camp de tèxt modificable per l’adreça web del senhal.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Lo camp de tèxt modificable pel nom d’utilizaire de l’identificant.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Lo camp de tèxt modificable pel nom d’utilizaire del senhal.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Lo camp de tèxt modificable pel senhal de l’identificant.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Lo camp de tèxt modificable pel senhal.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Enregistratz las modificacions de l’identificant.</string>
     <!--  The button description to save changes to an edited password. -->
@@ -2421,6 +2449,10 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <string name="translation_option_bottom_sheet_never_translate_in_language">Traduire pas jamai las paginas en %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Traduire pas jamai aqueste site</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Remplaça totes los autres paramètres</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Remplaça las proposicions de traduccion</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Paramètres de traduccion</string>
 
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index a79b99221..18e803ffd 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -255,8 +255,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">පරිලෝකනය</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">සෙවුම් යන්ත්‍රය</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">සෙවුම් යන්ත්‍රයේ සැකසුම්</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -311,23 +309,23 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">%s සමඟ බොහෝ දෑ කිරීමට දැනුම්දීම් උපකාරී වේ</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">%s සමඟ බොහෝ දෑ කිරීමට දැනුම්දීම් උපකාරී වේ</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">උපාංග අතර පටිති සමමුහූර්තය, බාගැනීම් කළමනාකරණය, %s පෞද්ගලිකත්‍ව රැකවරණයෙන් උපරිම ප්‍රයෝජන ගැනීමට ඉඟි, සහ තවත් බොහෝ දෑ.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">උපාංග අතර පටිති සමමුහූර්තය, බාගැනීම් කළමනාකරණය, %s පෞද්ගලිකත්‍ව රැකවරණයෙන් උපරිම ප්‍රයෝජන ගැනීමට ඉඟි, සහ තවත් බොහෝ දෑ.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">ඉදිරියට</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">ඉදිරියට</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">දැන් නොවේ</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">දැන් නොවේ</string>
 
-    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">ඔබට ආරක්‍ෂාව සලසන්නෙමු</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">සමාගම් රහසින් අන්තර්ජාලය පුරා ඔබව ලුහුබැඳීම නැවැත්වීමට අපගේ ලාභ නොලබන පිටුබලයක් සහිත අතිරික්සුව සැමවිට උදව් කරයි.\n\nඅපගේ රහස්‍යතා දැන්වීමෙන් තව දැන ගන්න.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">සමාගම් රහසින් අන්තර්ජාලය පුරා ඔබව ලුහුබැඳීම නැවැත්වීමට අපගේ ලාභ නොලබන පිටුබලයක් සහිත අතිරික්සුව සැමවිට උදව් කරයි.\n\nඅපගේ රහස්‍යතා දැන්වීමෙන් තව දැන ගන්න.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">පෞද්ගලිකත්‍ව දැන්වීම</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">පෞද්ගලිකත්‍ව දැන්වීම</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">පෙරනිමි අතිරික්සුව කරන්න</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -425,18 +423,8 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">HTTPS-පමණි ප්‍රකාරය</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">දත්තකඩ පතාක අවකරණය</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">දත්තකඩ පතාක අවහිරය</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">දත්තකඩ පතාක අවම කරන්න</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">අක්‍රිය</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">සක්‍රිය</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ස්වයංක්‍රීයව දත්තකඩ පතාකවල දත්තකඩ ඉල්ලීම් ප්‍රතික්‍ෂේප කිරීමට උත්සාහ කරයි.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">මෙම අඩවියට අක්‍රියයි</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -453,28 +441,8 @@
     <string name="reduce_cookie_banner_unsupported_site_request_submitted_2">සහාය ඉල්ලීම යැවිණි</string>
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">අඩවියට සහාය නොදක්වයි</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s සඳහා දත්තකඩ පතාක අවකරණය සක්‍රිය කරන්නද?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s සඳහා දත්තකඩ පතාක අවකරණය අක්‍රිය කරන්නද?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s මඟින්  මෙම අඩවියේ දත්තකඩ ඉල්ලීම් ස්වයංක්‍රීයව ඉවතලීමට නොහැක. ඉදිරියේ දී මෙම අඩවිය සඳහා සහාය දැක්වීමට ඉල්ලීමක් යැවීමට හැකිය.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s මෙම අඩවියේ දත්තකඩ ඉවත් කර පිටුව නැවුම් කරයි. සියළුම දත්තකඩ මැකීමෙන් බඩු කරත්ත හිස් වීමට හෝ ඔබව නික්මවීමට ඉඩ ඇත.</string>
-
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s සහාය දක්වන අඩවිවල තිබෙන සියළුම දත්තකඩ ඉල්ලීම් ස්වයංක්‍රීයව ප්‍රතික්‍ෂේප කිරීමට උත්සාහ කරයි.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">දත්තකඩ පතාක ප්‍රතික්‍ෂේපයට %1$s වෙත ඉඩ දෙන්නද?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s මඟින් බොහෝ දත්තකඩ පතාක ඉල්ලීම් ස්වයංක්‍රීයව ඉවතලිය හැකිය.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">දැන් නොවේ</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">ඔබ දත්තකඩ ඉල්ලීම් අඩුවෙන් දකිනු ඇත</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">ඉඩ දෙන්න</string>
 
     <!-- Description of the preference to enable "HTTPS-Only" mode. -->
     <string name="preferences_https_only_summary">ඉහළ ආරක්‍ෂාවක් සඳහා HTTPS සංකේතන කෙටුම්පත භාවිතයෙන් අඩවි වෙත ස්වයංක්‍රීයව සම්බන්ධ වීමට තැත් කරයි.</string>
@@ -686,6 +654,8 @@
     <string name="preferences_sync_bookmarks">පොත්යොමු</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">පිවිසුම්</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">මුරපද</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">පටිති අරින්න</string>
     <!-- Preference for signing out -->
@@ -710,6 +680,8 @@
     <string name="default_device_name_2">%2$s %3$s හි %1$s</string>
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">ණය පත්</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">ගෙවීමේ ක්‍රම</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">ලිපින</string>
 
@@ -1244,8 +1216,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">ඉවතලන්න</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">මුද්‍රණයට නොහැකිය</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">මෙම පිටුව මුද්‍රණයට නොහැකිය</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">මුද්‍රණය</string>
@@ -1290,6 +1260,9 @@
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">පෞද්. පටිති වසන්න</string>
 
+    <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
+    <string name="notification_erase_title_android_14">පෞද්. පටිති වසන්නද?</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">අළෙවිකරණය</string>
 
@@ -1641,8 +1614,12 @@
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">පිවිසුම් සහ මුරපද</string>
 
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">මුරපද</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">පිවිසුම් සහ මුරපද සුරකින්න</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">මුරපද සුරකින්න</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">සුරැකීමට අසන්න</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1658,12 +1635,19 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">පිවිසුම යොදන්න</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">මුරපදය එක් කරන්න</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">පිවිසුම් සමමුහූර්තය</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">මුරපද සමමුහූර්තය</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">උපාංගවල පිවිසුම් සමමුහූර්තය</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">සුරැකි පිවිසුම්</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">සුරැකි මුරපද</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">ඔබ සුරකින හෝ %s වෙත සමමුහූර්ත කරන පිවිසුම් මෙහි පෙන්වයි.</string>
     <!-- Preference to access list of saved logins -->
@@ -1678,6 +1662,8 @@
     <string name="preferences_passwords_exceptions_remove_all">සියළු හැරදැමීම් මකන්න</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">පිවිසුම් සොයන්න</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">මුරපද සොයන්න</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">අඩවිය</string>
     <!-- The header for the username for a login -->
@@ -1735,6 +1721,8 @@
     <string name="preferences_addresses">ලිපින</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">ණය පත්</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">ගෙවීමේ ක්‍රම</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">පත් සුරැකීම හා ස්වයං පිරවීම</string>
     <!-- Preference summary for saving and autofilling credit card data -->
@@ -2275,6 +2263,10 @@
     <string name="download_languages_available_languages_preference">තිබෙන භාෂා</string>
     <!-- Text that will appear beside a core or pivot language package name to show that the language is necessary for the translation feature to function. -->
     <string name="download_languages_default_system_language_require_preference">වුවමනාය</string>
+    <!-- A text for download language preference item.
+    The first parameter is the language name, for example, "Spanish".
+    The second parameter is the language file size, for example, "(3.91 KB)" or, if the language package name is a pivot language, "(required)". -->
+    <string name="download_languages_language_item_preference">%1$s (%2$s)</string>
     <!-- The subhead of the download language preference screen will appear above the items that were not downloaded. -->
     <string name="download_language_header_preference">භාෂා බාගන්න</string>
     <!-- All languages list item. When the user presses this item, they can download or delete all languages. -->
@@ -2286,6 +2278,14 @@
     <!-- Content description (not visible, for screen readers etc.): For a language list item that is selected. -->
     <string name="download_languages_item_content_description_selected_state">තෝරාගත්</string>
 
+    <!-- Title for the dialog used by the translations feature to confirm deleting a language.
+    The dialog will be presented when the user requests deletion of a language.
+    The first parameter is the name of the language, for example, "Spanish" and the second parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_file_dialog_title">%1$s (%2$s) මකන්නද?</string>
+    <!-- Title for the dialog used by the translations feature to confirm deleting all languages file.
+    The dialog will be presented when the user requests deletion of all languages file.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_all_languages_file_dialog_title">සියලුම භාෂා (%1$s) මකන්නද?</string>
     <!-- Button text on the dialog used by the translations feature to confirm deleting a language. -->
     <string name="delete_language_file_dialog_positive_button_text">මකන්න</string>
     <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
@@ -2293,9 +2293,20 @@
 
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
     <string name="download_language_file_dialog_positive_button_text">බාගන්න</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file and perform a translation. -->
+    <string name="download_language_file_dialog_positive_button_text_all_languages">බාගෙන පරිවර්තනය කරන්න</string>
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
     <string name="download_language_file_dialog_negative_button_text">අවලංගු</string>
 
+    <!-- Debug drawer -->
+    <!-- The user-facing title of the Debug Drawer feature. -->
+    <string name="debug_drawer_title">නිදොස්කරණ මෙවලම්</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate back within the debug drawer. -->
+    <string name="debug_drawer_back_button_content_description">ආපසු යාත්‍රණය</string>
+    <!-- The title of the Tab Tools feature in the Debug Drawer. -->
+    <string name="debug_drawer_tab_tools_title">පටිති මෙවලම්</string>
+    <!-- The title of the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_title">පටිති ගණන</string>
     <!-- The active tab count category in the tab count section in Tab Tools. -->
     <string name="debug_drawer_tab_tools_tab_count_normal">සක්‍රිය</string>
     <!-- The inactive tab count category in the tab count section in Tab Tools. -->
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index ed8158806..24a9cb802 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -260,8 +260,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skanoje</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Motor kërkimesh</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Rregullime motorësh kërkimesh</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -314,23 +312,26 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Njoftimet ju ndihmojnë të arrini më tepër gjëra me %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Njoftimet ju ndihmojnë të arrini më tepër gjëra me %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Njëkohësoni skedat tuaja nëpër pajisje, administroni shkarkime, merrni ndihmëza mbi shfrytëzimin në maksimum të mbrojtjes së privatësisë në %s, etj.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Njëkohësoni skedat tuaja nëpër pajisje, administroni shkarkime, merrni ndihmëza mbi shfrytëzimin në maksimum të mbrojtjes së privatësisë në %s, etj.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Vazhdo</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Vazhdo</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Jo tani</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Jo tani</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Shënim Firefox mbi privatësinë</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Duam fort t’ju mbajmë të parrezik</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Shfletuesi ynë, me entin jofitimprurës nga pas, ndihmon të ndalen shoqëri t’ju ndjekin fshehtazi nëpër internet.\n\nMësoni më tepër te shënimi ynë mbi privatësinë.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Shfletuesi ynë, me entin jofitimprurës nga pas, ndihmon të ndalen shoqëri t’ju ndjekin fshehtazi nëpër internet.\n\nMësoni më tepër te shënimi ynë mbi privatësinë.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">shënim privatësie</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">shënim privatësie</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Vëre si shfletuesin parazgjedhje</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -435,21 +436,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Mënyra Vetëm-HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduktim Banderolash Për Cookie-t</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Bllokues Banderolash Cookie-sh</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Bllokues Banderolash Cooki-esh në shfletim privat</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Redukto banderola për cookie-t</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Off</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">On</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s provon vetvetiu të hedhë poshtë kërkesa depozitimi cookie -sh nga banderola cookie-sh.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Çaktivizuar për këtë sajt</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -468,35 +459,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Sajt aktualisht i pambuluar</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Të aktivizohet Reduktim Banderolash Cookie-sh për %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Të aktivizohet Bllokim Banderolash Cookie-sh për %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Të çaktivizohet Reduktim Banderolash Cookie-sh për %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Të çaktivizohet Bllokim Banderolash Cookie-sh për %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s s’mund të hedhë poshtë automatikisht kërkesa për “cookie” në këtë sajt. Mund të dërgoni një kërkesë për mbulimin e këtij sajti në të ardhmen.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s do të spastrojë cookie-t për këtë sajt dhe do të rifreskojë faqen. Spastrimi i krejt cookie-ve mund të sjellë nxjerrjen tuaj nga llogaria, ose zbrazje shportash blerjesh.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Çaktivizojeni dhe %1$s do të spastrojë cookie-t dhe do të ringarkojë këtë sajt. Kjo mund sjellë nxjerrjen tuaj nga llogaria, ose zbrazjen e shportave tuaja të blerjes.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s provon të hedhë poshtë automatikisht krejt kërkesat për cookies, në sajtet që e mbulojnë.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Aktivizojeni dhe %1$s do të provojë të hedhë poshtë automatikisht banderola cookie-sh në këtë sajt.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Të lejohet %1$s të hedhë poshtë banderola cookie-sh?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s mund të hedhë vetvetiu poshtë mjaft kërkesa banderolash cookie-sh.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Jo Tani</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Do të shihni më pak kërkesa depozitimi cookie-sh</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Lejoje</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s sapo hodhi poshtë “cookies” për ju</string>
@@ -713,6 +685,8 @@
     <string name="preferences_sync_bookmarks">Faqerojtës</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Kredenciale Hyrjesh</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Fjalëkalime</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Skeda të hapura</string>
     <!-- Preference for signing out -->
@@ -740,6 +714,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Karta krediti</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Metoda pagesash</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresa</string>
 
@@ -1275,8 +1251,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Hidhe tej</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">S’arrihet të shtypet</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">S’arrihet të shtypet kjo faqe</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Shtypni</string>
@@ -1682,8 +1656,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Kredenciale hyrjesh dhe fjalëkalime</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Fjalëkalime</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Ruaj kredenciale hyrjesh dhe fjalëkalime</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Ruani fjalëkalime</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Pyet të ruhet a jo</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1701,12 +1679,21 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Shtoni kredenciale hyrjeje</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Shtoni fjalëkalim</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Njëkohëso kredenciale hyrjeje</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Njëkohësoni fjalëkalime</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Njëkohëso kredenciale hyrjesh nëpër pajisje</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Njëkohësoni fjalëkalime mes pajisjesh</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Kredenciale hyrjesh të ruajtur</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Fjalëkalime të ruajtur</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Këtu do të shfaqen kredencialet e hyrjeve që ruani ose njëkohësoni në %s.</string>
     <!-- Preference to access list of saved logins -->
@@ -1721,6 +1708,8 @@
     <string name="preferences_passwords_exceptions_remove_all">Fshi krejt përjashtimet</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Kërkoni te kredenciale hyrjesh</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Kërko te fjalëkalimet</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sajt</string>
     <!-- The header for the username for a login -->
@@ -1779,8 +1768,12 @@
     <string name="preferences_addresses">Adresa</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Karta krediti</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Metoda pagesash</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Ruaj dhe plotëso vetvetiu të dhëna kartash</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Ruaj dhe plotëso metoda pagesash</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Të dhënat janë të fshehtëzuara</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
@@ -1789,8 +1782,12 @@
     <string name="preferences_credit_cards_sync_cards">Njëkohëso karta</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Shtoni kartë krediti</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Shtoni kartë</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Administroni karta të ruajtura</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Administroni karta</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Shtoni adresë</string>
     <!-- Preference option for managing saved addresses -->
@@ -1798,6 +1795,8 @@
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Ruaj dhe vetëplotëso adresa</string>
 
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Ruaj dhe vetëplotëso adresa</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Përfshini hollësi të tilla si numra, email dhe adresa dërgimi</string>
 
@@ -1821,6 +1820,8 @@
     <string name="credit_cards_delete_card_button">Fshije kartën</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Jeni i sigurt se doni të fshihet kjo kartë krediti?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Të fshihet karta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Fshije</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1835,8 +1836,12 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Ju lutemi, jepni një numër të vlefshëm karte krediti</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Jepni një numër karte të vlefshme</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Ju lutemi, plotësojeni këtë fushë</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Shtoni emër</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Që të shihni kartat tuaja të ruajtura, shkyçeni</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
@@ -1986,12 +1991,16 @@
     <string name="login_menu_edit_button">Përpunoni</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Jeni i sigurt se doni të fshihen këto kredenciale hyrjeje?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Jeni i sigurt se doni të fshihet ky fjalëkalim?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Fshije</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Anuloje</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Mundësi hyrjesh</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Mundësi fjalëkalimesh</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Fusha e përpunueshme e teksteve për adresën web të kredencialeve të hyrjes.</string>
     <!--  The editable text field for a login's username. -->
@@ -2000,17 +2009,29 @@
     <string name="saved_login_password_description">Fusha e përpunueshme e teksteve për fjalëkalimin e kredencialeve të hyrjes.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Ruani ndryshimet te kredenciale hyrjesh.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Ruaji ndryshimet.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Përpunoni</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Përpunoni fjalëkalimin</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Shtoni kredenciale hyrjeje të re</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Shtoni fjalëkalim</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Lypset fjalëkalim</string>
 
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Jepni një fjalëkalim</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Emri i përdoruesit është i domosdoshëm</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Jepni emër përdoruesi</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Lypset strehëemër</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Jepni një adresë web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Kërkim zanor</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2180,8 +2201,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Gjërat në pah</b> janë nga shqyrtime %s brenda 80 ditëve të fundit, të cilave besojmë se mund t’u zihet besë.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Mësoni më tepër mbi %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">si e përcakton cilësinë e shqyrtimeve %s nga Mozilla</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">si e përcakton %s cilësinë e shqyrtimeve</string>
     <!-- Text for title of settings section. -->
@@ -2386,6 +2405,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Mos përkthe kurrë në %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Mos e përkthe kurrë këtë sajt</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Anashkalo krejt rregullimet e tjera</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Anashkalo ofertë për përkthim</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Rregullime përkthimi</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index f9a9ad5c7..481dcdaca 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -210,6 +210,8 @@
     <string name="resync_button_content_description">ซิงค์ใหม่</string>
     <!-- Browser menu button that opens the find in page menu -->
     <string name="browser_menu_find_in_page">ค้นหาในหน้า</string>
+    <!-- Browser menu button that opens the translations dialog, which has options to translate the current browser page. -->
+    <string name="browser_menu_translations">แปลหน้า</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">บันทึกไปยังชุดสะสม</string>
     <!-- Browser menu button that open a share menu to share the current site -->
@@ -257,8 +259,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">สแกน</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">เครื่องมือค้นหา</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">การตั้งค่าเครื่องมือค้นหา</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -314,23 +314,28 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">การแจ้งเตือนช่วยให้คุณทำสิ่งต่างๆ ได้มากขึ้นด้วย %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">การแจ้งเตือนช่วยให้คุณทำสิ่งต่างๆ ได้มากขึ้นด้วย %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">ซิงค์แท็บของคุณระหว่างอุปกรณ์ต่างๆ จัดการการดาวน์โหลด รับคำแนะนำเกี่ยวกับการใช้ประโยชน์สูงสุดจากการปกป้องความเป็นส่วนตัวของ %s และอื่นๆ</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">ซิงค์แท็บของคุณระหว่างอุปกรณ์ต่างๆ จัดการการดาวน์โหลด รับคำแนะนำเกี่ยวกับการใช้ประโยชน์สูงสุดจากการปกป้องความเป็นส่วนตัวของ %s และอื่นๆ</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">ดำเนินการต่อ</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">ดำเนินการต่อ</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">ไม่ใช่ตอนนี้</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">ไม่ใช่ตอนนี้</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">ประกาศความเป็นส่วนตัวของ Firefox</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">เรารักที่จะดูแลคุณให้ปลอดภัย</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">เบราว์เซอร์ที่ได้รับการสนับสนุนจากองค์กรไม่แสวงหาผลกำไรของเราช่วยหยุดบริษัทต่าง ๆ ไม่ให้แอบติดตามคุณทางเว็บได้\n\nเรียนรู้เพิ่มเติมในประกาศความเป็นส่วนตัวของเรา</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">เบราว์เซอร์ที่สนับสนุนโดยองค์กรไม่แสวงหาผลกำไรของเราจะช่วยหยุดบริษัทต่างๆ ไม่ให้แอบติดตามคุณทางเว็บได้</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">เบราว์เซอร์ที่ได้รับการสนับสนุนจากองค์กรไม่แสวงหาผลกำไรของเราช่วยหยุดบริษัทต่าง ๆ ไม่ให้แอบติดตามคุณทางเว็บได้\n\nเรียนรู้เพิ่มเติมในประกาศความเป็นส่วนตัวของเรา</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">ประกาศความเป็นส่วนตัว</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">ประกาศความเป็นส่วนตัว</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">ตั้งเป็นเบราว์เซอร์เริ่มต้น</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -434,21 +439,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">โหมด HTTPS-Only</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">การลดคุกกี้แบนเนอร์</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">ตัวปิดกั้นแบนเนอร์คุกกี้</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">ตัวปิดกั้นแบนเนอร์คุกกี้ในการเรียกดูแบบส่วนตัว</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">ลดคุกกี้แบนเนอร์</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">ปิด</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">เปิด</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s จะพยายามปฏิเสธคำขอคุกกี้บนแบนเนอร์คุกกี้โดยอัตโนมัติ</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">ปิดสำหรับไซต์นี้</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -467,36 +462,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">ไม่รองรับไซต์ในขณะนี้</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">ต้องการเปิดการลดแบนเนอร์คุกกี้สำหรับ %1$s หรือไม่?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">ต้องการเปิดตัวปิดกั้นแบนเนอร์คุกกี้สำหรับ %1$s หรือไม่?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">ต้องการปิดการลดแบนเนอร์คุกกี้สำหรับ %1$s หรือไม่?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">ต้องการปิดตัวปิดกั้นแบนเนอร์คุกกี้สำหรับ %1$s หรือไม่?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s ไม่สามารถปฏิเสธคำขอคุกกี้โดยอัตโนมัติบนไซต์นี้ คุณสามารถส่งคำขอให้รองรับไซต์นี้ในอนาคตได้</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s จะล้างคุกกี้ของไซต์นี้และรีเฟรชหน้า การล้างคุกกี้ทั้งหมดอาจนำคุณออกจากระบบหรือล้างรถเข็นช็อปปิ้ง</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">หลังจากปิดแล้ว %1$s จะล้างคุกกี้และโหลดไซต์นี้ใหม่ การกระทำนี้อาจนำคุณลงชื่อออกหรือล้างรถเข็นช็อปปิ้ง</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s จะพยายามปฏิเสธคำขอคุกกี้ทั้งหมดบนไซต์ที่รองรับโดยอัตโนมัติ</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">หลังจากเปิดแล้ว %1$s จะพยายามปฏิเสธแบนเนอร์คุกกี้ทั้งหมดบนไซต์นี้โดยอัตโนมัติ</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">อนุญาตให้ %1$s ปฏิเสธแบนเนอร์คุกกี้หรือไม่?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s สามารถปฏิเสธคำขอคุกกี้จำนวนมากได้โดยอัตโนมัติ</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">ไม่ใช่ตอนนี้</string>
-
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">คุณจะเห็นคำขอคุกกี้น้อยลง</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">อนุญาต</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s เพิ่งปฏิเสธคุกกี้สำหรับคุณ</string>
@@ -716,6 +691,8 @@
     <string name="preferences_sync_bookmarks">ที่คั่นหน้า</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">การเข้าสู่ระบบ</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">รหัสผ่าน</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">แท็บที่เปิดอยู่</string>
     <!-- Preference for signing out -->
@@ -742,6 +719,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">บัตรเครดิต</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">วิธีการชำระเงิน</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">ที่อยู่</string>
 
@@ -1278,8 +1257,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">ปิด</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">ไม่สามารถพิมพ์</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">ไม่สามารถพิมพ์หน้านี้</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">พิมพ์</string>
@@ -1323,6 +1300,10 @@
     <!-- Notifications -->
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">ปิดแท็บส่วนตัว</string>
+
+    <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
+    <string name="notification_erase_title_android_14">ปิดแท็บส่วนตัว?</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">การตลาด</string>
 
@@ -1678,9 +1659,13 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">การเข้าสู่ระบบและรหัสผ่าน</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">รหัสผ่าน</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">บันทึกการเข้าสู่ระบบและรหัสผ่าน</string>
 
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">บันทึกรหัสผ่าน</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">ถามเพื่อบันทึก</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1698,16 +1683,29 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">เพิ่มการเข้าสู่ระบบ</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">เพิ่มรหัสผ่าน</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">ซิงค์การเข้าสู่ระบบ</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">ซิงค์รหัสผ่าน</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">ซิงค์การเข้าสู่ระบบระหว่างอุปกรณ์</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">ซิงค์รหัสผ่านระหว่างอุปกรณ์</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">การเข้าสู่ระบบที่บันทึกไว้</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">รหัสผ่านที่บันทึกไว้</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">การเข้าสู่ระบบที่คุณบันทึกหรือซิงค์กับ %s จะปรากฏที่นี่</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">รหัสผ่านที่คุณบันทึกหรือซิงค์กับ %s จะแสดงอยู่ที่นี่ รหัสผ่านทั้งหมดที่คุณบันทึกจะถูกเข้ารหัสไว้</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">เรียนรู้เพิ่มเติมเกี่ยวกับ Sync</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">เรียนรู้เพิ่มเติมเกี่ยวกับซิงค์</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">ข้อยกเว้น</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
@@ -1718,6 +1716,8 @@
     <string name="preferences_passwords_exceptions_remove_all">ลบข้อยกเว้นทั้งหมด</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">ค้นหาการเข้าสู่ระบบ</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">ค้นหารหัสผ่าน</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">ไซต์</string>
     <!-- The header for the username for a login -->
@@ -1746,6 +1746,8 @@
     <string name="saved_login_hide_password">ซ่อนรหัสผ่าน</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">ปลดล็อกเพื่อดูการเข้าสู่ระบบที่บันทึกไว้ของคุณ</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">ปลดล็อกเพื่อดูรหัสผ่านที่บันทึกไว้ของคุณ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">รักษาความปลอดภัยการเข้าสู่ระบบและรหัสผ่านของคุณ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
@@ -1776,8 +1778,12 @@
     <string name="preferences_addresses">ที่อยู่</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">บัตรเครดิต</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">วิธีการชำระเงิน</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">บันทึกและเติมข้อมูลบัตรอัตโนมัติ</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">บันทึกและเติมวิธีการชำระเงิน</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">ข้อมูลถูกเข้ารหัส</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
@@ -1787,8 +1793,12 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">เพิ่มบัตรเครดิต</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">เพิ่มบัตร</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">จัดการบัตรที่บันทึกไว้</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">จัดการบัตร</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">เพิ่มที่อยู่</string>
     <!-- Preference option for managing saved addresses -->
@@ -1796,9 +1806,14 @@
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">บันทึกและป้อนที่อยู่อัตโนมัติ</string>
 
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">บันทึกและเติมที่อยู่อัตโนมัติ</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">รวมข้อมูลเช่นหมายเลข อีเมล และที่อยู่ในการจัดส่ง</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">รวมหมายเลขโทรศัพท์และที่อยู่อีเมล</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">เพิ่มบัตร</string>
     <!-- Title of the "Edit card" screen -->
@@ -1819,6 +1834,8 @@
     <string name="credit_cards_delete_card_button">ลบบัตร</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">คุณแน่ใจหรือไม่ว่าต้องการลบบัตรเครดิตนี้?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">ลบบัตร?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">ลบ</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1833,8 +1850,12 @@
 
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">โปรดป้อนหมายเลขบัตรเครดิตที่ถูกต้อง</string>
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">ใส่หมายเลขบัตรที่ถูกต้อง</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">โปรดกรอกช่องนี้</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">เพิ่มชื่อ</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">ปลดล็อกเพื่อดูบัตรเครดิตที่บันทึกไว้ของคุณ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
@@ -1999,16 +2020,26 @@
     <string name="saved_login_password_description">ช่องข้อความที่แก้ไขได้สำหรับรหัสผ่านของการเข้าสู่ระบบ</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">บันทึกการเปลี่ยนแปลงเพื่อเข้าสู่ระบบ</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">บันทึกการเปลี่ยนแปลง</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">แก้ไข</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">แก้ไขรหัสผ่าน</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">เพิ่มการเข้าสู่ระบบใหม่</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">เพิ่มรหัสผ่าน</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">ต้องการรหัสผ่าน</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">ใส่รหัสผ่าน</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">ต้องการชื่อผู้ใช้</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">ต้องการชื่อโฮสต์</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">ป้อนที่อยู่เว็บ</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">ค้นหาด้วยเสียง</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2178,8 +2209,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>ไฮไลต์</b>มาจาก %s บทวิจารณ์ภายใน 80 วันที่ผ่านมา ซึ่งเราเชื่อว่าน่าเชื่อถือ]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">เรียนรู้เพิ่มเติมเกี่ยวกับ %s</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">วิธีที่ %s โดย Mozilla พิจารณาคุณภาพบทวิจารณ์</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">วิธีที่  %s พิจารณาคุณภาพบทวิจารณ์</string>
     <!-- Text for title of settings section. -->
@@ -2252,16 +2281,18 @@
     <string name="review_quality_check_no_analysis_body">หากต้องการทราบว่าบทวิจารณ์ของผลิตภัณฑ์นี้เชื่อถือได้หรือไม่ ให้ตรวจสอบคุณภาพบทวิจารณ์ โดยจะใช้เวลาเพียงประมาณ 60 วินาที</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
     <string name="review_quality_check_no_analysis_link">ตรวจสอบคุณภาพบทวิจารณ์</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">ลองใช้คำแนะนำที่เชื่อถือได้ของเราเกี่ยวกับบทวิจารณ์ผลิตภัณฑ์</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">เรียนรู้เพิ่มเติม</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="121" tools:ignore="UnusedResources">นโยบายความเป็นส่วนตัว</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">นโยบายความเป็นส่วนตัว</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy_2">นโยบายความเป็นส่วนตัว</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">นโยบายความเป็นส่วนตัว</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
-    <string name="review_quality_check_contextual_onboarding_terms_use" moz:RemovedIn="121" tools:ignore="UnusedResources">เงื่อนไขการใช้งาน</string>
+    <string name="review_quality_check_contextual_onboarding_terms_use">เงื่อนไขการใช้งาน</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
-    <string name="review_quality_check_contextual_onboarding_terms_use_2">เงื่อนไขการใช้งาน</string>
+    <string name="review_quality_check_contextual_onboarding_terms_use_2" moz:RemovedIn="123" tools:ignore="UnusedResources">เงื่อนไขการใช้งาน</string>
     <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_primary_button_text">ใช่ลองดู</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
@@ -2314,8 +2345,53 @@
     <!-- Action label for links to the Firefox Pocket website. Talkback will append this to say "Double tap to open link to learn more". -->
     <string name="a11y_action_label_pocket_learn_more">เปิดลิงก์เพื่อเรียนรู้เพิ่มเติม</string>
 
+    <!-- Title for dialog displayed when trying to access links present in a text. -->
+    <string name="a11y_links_title">ลิงก์</string>
+    <!-- Additional content description for text bodies that contain urls. -->
+    <string name="a11y_links_available">ลิงค์ที่มีอยู่</string>
+
     <!-- Translations feature-->
 
+    <!-- Translation request dialog -->
+    <!-- Title for the translation dialog that allows a user to translate the webpage. -->
+    <string name="translations_bottom_sheet_title">แปลหน้านี้?</string>
+    <!-- Text that links to additional information about the Firefox translations feature. -->
+    <string name="translations_bottom_sheet_info_message_learn_more">เรียนรู้เพิ่มเติม</string>
+    <!-- Label for the dropdown to select which language to translate from on the translations dialog. Usually the translate from language selected will be the same as the page language. -->
+    <string name="translations_bottom_sheet_translate_from">แปลจาก</string>
+    <!-- Label for the dropdown to select which language to translate to on the translations dialog. Usually the translate to language selected will be the user's preferred language. -->
+    <string name="translations_bottom_sheet_translate_to">แปลเป็น</string>
+    <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
+    <string name="translations_bottom_sheet_negative_button">ไม่ใช่ตอนนี้</string>
+    <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
+    <string name="translations_bottom_sheet_negative_button_error">เสร็จสิ้น</string>
+    <!-- Button text on the translations dialog to begin a translation of the website. -->
+    <string name="translations_bottom_sheet_positive_button">แปล</string>
+    <!-- Button text on the translations dialog when a translation error appears. -->
+    <string name="translations_bottom_sheet_positive_button_error">ลองอีกครั้ง</string>
+    <!-- Inactive button text on the translations dialog that indicates a translation is currently in progress. This button will be accompanied by a loading icon. -->
+    <string name="translations_bottom_sheet_translating_in_progress">กำลังแปล</string>
+    <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
+    <string name="translations_bottom_sheet_translating_in_progress_content_description">อยู่ระหว่างการแปล</string>
+    <!-- The title of the warning card informs the user that a translation could not be completed. -->
+    <string name="translation_error_could_not_translate_warning_text">เกิดปัญหาในการแปล โปรดลองอีกครั้ง</string>
+
+    <!-- Translation settings dialog -->
+    <!-- Title of the translation settings dialog that allows a user to set their preferred translation settings. -->
+    <string name="translation_settings_toolbar_title">การแปล</string>
+    <!-- Toggle switch label that indicates that the browser should signal or indicate when a translation is possible for any page. -->
+    <string name="translation_settings_offer_to_translate">เสนอให้แปลเมื่อเป็นไปได้</string>
+    <!-- Toggle switch label that indicates that downloading files required for translating is permitted when using data saver mode in Android. -->
+    <string name="translation_settings_always_download">ดาวน์โหลดภาษาในโหมดประหยัดข้อมูลเสมอ</string>
+    <!-- Section header text that begins the section of a list of different options the user may select to adjust their translation preferences. -->
+    <string name="translation_settings_translation_preference">ค่ากำหนดการแปล</string>
+    <!-- Button text for the button that will take the user to the automatic translations settings dialog. On the automatic translations settings dialog, the user can set if translations should occur automatically for a given language. -->
+    <string name="translation_settings_automatic_translation">การแปลอัตโนมัติ</string>
+    <!-- Button text for the button that will take the user to the never translate these sites dialog. On the never translate these sites dialog, the user can set if translations should never occur on certain websites. -->
+    <string name="translation_settings_automatic_never_translate_sites">ไม่ต้องแปลไซต์เหล่านี้</string>
+    <!-- Button text for the button that will take the user to the download languages dialog. On the download languages dialog, the user can manage which languages they would like to download for translations. -->
+    <string name="translation_settings_download_language">ดาวน์โหลดภาษา</string>
+
     <!-- Automatic translation preference screen -->
     <!-- Title of the automatic translation preference screen that will appear on the toolbar.-->
     <string name="automatic_translation_toolbar_title_preference">การแปลอัตโนมัติ</string>
@@ -2364,4 +2440,37 @@
     <!-- Content description (not visible, for screen readers etc.): For a language list item that is selected. -->
     <string name="download_languages_item_content_description_selected_state">เลือกแล้ว</string>
 
-    </resources>
+    <!-- Button text on the dialog used by the translations feature to confirm deleting a language. -->
+    <string name="delete_language_file_dialog_positive_button_text">ลบ</string>
+    <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
+    <string name="delete_language_file_dialog_negative_button_text">ยกเลิก</string>
+
+    <!-- Checkbox label text on the data saving mode warning dialog used by the translations feature. This checkbox allows users to ignore the data usage warnings. -->
+    <string name="download_language_file_dialog_checkbox_text">ดาวน์โหลดในโหมดประหยัดข้อมูลเสมอ</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
+    <string name="download_language_file_dialog_positive_button_text">ดาวน์โหลด</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file and perform a translation. -->
+    <string name="download_language_file_dialog_positive_button_text_all_languages">ดาวน์โหลดและแปล</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
+    <string name="download_language_file_dialog_negative_button_text">ยกเลิก</string>
+
+    <!-- Debug drawer -->
+    <!-- The user-facing title of the Debug Drawer feature. -->
+    <string name="debug_drawer_title">เครื่องมือดีบัก</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate back within the debug drawer. -->
+    <string name="debug_drawer_back_button_content_description">นำทางย้อนกลับ</string>
+    <!-- The active tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_normal">ใช้งานอยู่</string>
+    <!-- The inactive tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_inactive">ไม่มีการใช้งานอยู่</string>
+    <!-- The private tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_private">ส่วนตัว</string>
+    <!-- The total tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_total">รวมทั้งหมด</string>
+    <!-- The button text to add tabs to the active tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_active">เพิ่มไปยังแท็บที่ใช้งานอยู่</string>
+    <!-- The button text to add tabs to the inactive tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_inactive">เพิ่มไปยังแท็บที่ไม่ได้ใช้งาน</string>
+    <!-- The button text to add tabs to the private tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_private">เพิ่มไปยังแท็บส่วนตัว</string>
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 40da4c74c..fededc1bb 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -465,16 +465,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Сайт наразі не підтримується</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Увімкнути блокувальник банерів файлів cookie для %1$s?</string>
+    <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Увімкнути блокувальник банерів про файли cookie для %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Вимкнути блокувальник банерів файлів cookie для %1$s?</string>
+    <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Вимкнути блокувальник банерів про файли cookie для %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">На цьому сайті %1$s не може автоматично відхиляти запити на збереження файлів cookie. Ви можете надіслати запит для підтримки цього сайту в майбутньому.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Вимкніть %1$s, щоб очистити файли cookie та перезавантажити цей сайт. Це може призвести до виходу з вебсайту та очищення збережених покупок у кошику.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Увімкніть, і %1$s намагатиметься автоматично відхиляти всі банери файлів cookie на цьому сайті.</string>
+    <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Увімкніть, і %1$s намагатиметься автоматично відхиляти всі банери про файли cookie на цьому сайті.</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s щойно відхилив файли cookie</string>

From 6ebfa864653ff2a37512062e6fb437b9443f2262 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Mon, 29 Jan 2024 00:03:31 +0000
Subject: [PATCH 044/222] Import translations from android-l10n

---
 app/src/main/res/values-am/strings.xml     |  65 ++++
 app/src/main/res/values-oc/strings.xml     |  34 ++
 app/src/main/res/values-pt-rBR/strings.xml | 106 +++---
 app/src/main/res/values-pt-rPT/strings.xml | 360 ++++++++++++++++++---
 app/src/main/res/values-sq/strings.xml     |  40 ++-
 5 files changed, 518 insertions(+), 87 deletions(-)

diff --git a/app/src/main/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml
index 0e91772a4..536812bbd 100644
--- a/app/src/main/res/values-am/strings.xml
+++ b/app/src/main/res/values-am/strings.xml
@@ -710,6 +710,8 @@
     <string name="default_device_name_2">%1$s በ%2$s %3$s ላይ</string>
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">ክሬዲት ካርዶች</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">የክፍያ ዘዴዎች</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">አድራሻዎች</string>
 
@@ -1640,8 +1642,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">መግቢያዎች እና የይለፍ ቃሎች</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">የይለፍ ቃሎች</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">መግቢያዎችን እና የይለፍ ቃሎችን ያስቀምጡ</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">የይለፍ ቃሎችን አስቀምጥ</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">ለማስቀመጥ ይጠይቁ</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1657,16 +1663,28 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">መግቢያ አክል</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">የይለፍ ቃል ያክሉ</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">መግቢያዎችን ያመሳስሉ</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">የይለፍ ቃሎችን አሰናስል</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">በመሳሪያዎች ላይ መግቢያዎችን ያመሳስሉ</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">የይለፍ ቃሎችን በሁሉም መሳሪያዎች ላይ ያሰናስሉ</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">የተቀመጡ መግቢያዎች</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">ያስቀመጡት ወይም ከ%s ጋር ያመሳስሏቸው መግቢያዎች እዚህ ይታያሉ።</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">ከ%s ጋር ያስቀመጧቸው ወይም ያሰናሰሏቸው የይለፍ ቃሎች እዚህ ይዘረዘራሉ። የሚያስቀምጡት ሁሉም የይለፍ ቃሎች የተመሰጠሩ ናቸው።
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">ስለ ማመሳሰል የበለጠ ይረዱ።</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">ስለ ማሰናሰል የበለጠ ይረዱ</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">ልዩ ሁኔታዎች</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
@@ -1705,6 +1723,8 @@
     <string name="saved_login_hide_password">የይለፍ ቃል ደብቅ</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">የተቀመጡ መግቢያዎችዎን ለማየት ይክፈቱ</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">ያስቀመጧቸውን የይለፍ ቃሎች ለማየት ቁልፉን ይክፈቱ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">የእርስዎን መግቢያዎች እና የይለፍ ቃላት ደህንነት ይጠብቁ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
@@ -1744,8 +1764,12 @@
 
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">ክሬዲት ካርድ ያክሉ</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">ካርድ ጨምር</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">የተቀመጡ ካርዶችን ያስተዳድሩ</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">ካርዶችን ያስተዳድሩ</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">አድራሻ ጨምር</string>
     <!-- Preference option for managing saved addresses -->
@@ -1753,9 +1777,14 @@
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">አድራሻዎችን ያስቀምጡ እና በራስ-ሙላ</string>
 
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">አድራሻዎችን ያስቀምጡ እና በራስ-ሰር ይሙሉ</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">እንደ ቁጥሮች፣ ኢሜይል እና የመላኪያ አድራሻዎች ያሉ መረጃዎችን ያካትቱ</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">ስልክ ቁጥሮች እና የኢሜይል አድራሻዎችን ያካትታል</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">ካርድ ጨምር</string>
     <!-- Title of the "Edit card" screen -->
@@ -1776,6 +1805,8 @@
     <string name="credit_cards_delete_card_button">ካርድ ሰርዝ</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">እርግጠኛ ነዎት ይህን ክሬዲት ካርድ መሰረዝ ይፈልጋሉ?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">ካርዱ ይጥፋ?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">ሰርዝ</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1788,12 +1819,18 @@
     <string name="credit_cards_saved_cards">የተቀመጡ ካርዶች</string>
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">እባክዎ የሚሰራ የክሬዲት ካርድ ቁጥር ያስገቡ</string>
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">የሚሰራ ካርድ ቁጥር ያስገቡ</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">እባክዎ ይህንን መስክ ይሙሉ</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">ስም ይጨምሩ</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">የተቀመጡ ካርዶችዎን ለማየት ይክፈቱ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">የክሬዲት ካርዶችዎን ደህንነት ይጠብቁ</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">የተቀመጡ የመክፈያ ዘዴዎችዎን ደህንነት ይጠብቁ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">የተቀመጡ ክሬዲት ካርዶችዎን ሌላ ሰው የእርስዎን መሣሪያ በመጠቀም እንዳይደረስበት ለመከላከል የመሣሪያ መቆለፊያ ስርዓተ ጥለትን፣ ፒን ወይም የይለፍ ቃል ያዘጋጁ።</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1840,6 +1877,8 @@
     <string name="addressess_delete_address_button">አድራሻ ሰርዝ</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">እርግጠኛ ነዎት ይህን አድራሻ መሰረዝ ይፈልጋሉ?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">ይህ አድራሻ ይጥፋ?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">ሰርዝ</string>
 
@@ -1941,30 +1980,52 @@
     <string name="login_menu_edit_button">አርትዕ</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">እርግጠኛ ነዎት ይህን መግቢያ መሰረዝ ይፈልጋሉ?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">እርግጠኛ ነዎት ይህን የይለፍ ቃል መሰረዝ ይፈልጋሉ?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">ሰርዝ</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">ተወው</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">የመግቢያ አማራጮች</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">የይለፍ ቃል አማራጮች</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">ለመግቢያው የድር አድራሻ ሊስተካከል የሚችል የጽሑፍ መስክ።</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">የይለፍ ቃል የድርጣቢያ አድራሻ ሊስተካከል የሚችል የጽሑፍ መስክ።</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">ለመግቢያው የተጠቃሚ ስም ሊስተካከል የሚችል የጽሑፍ መስክ።</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">የይለፍ ቃል የተጠቃሚ ስም ሊስተካከል የሚችል የጽሑፍ መስክ።</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">ለመግቢያው የይለፍ ቃል ሊስተካከል የሚችል የጽሑፍ መስክ።</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">ለይለፍ ቃል ሊስተካከል የሚችል የጽሑፍ መስክ።</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">መግቢያው ላይ የተደረገውን ለውጥ አስቀምጥ።</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">ለውጦችን አስቀምጥ።</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">አርትዕ</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">የይለፍ ቃል አርትዕ</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">አዲስ መግቢያ ያክሉ</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">የይለፍ ቃል ያክሉ</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">የይለፍ ቃል ያስፈልጋል</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">የይለፍ ቃል ያስገቡ</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">የተጠቃሚ ስም ያስፈልጋል</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">የተጠቃሚ ስም ያስገቡ</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">የአስተናጋጅ ስም ያስፈልጋል</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">የድር አድራሻ ያስገቡ</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">የድምጽ ፍለጋ</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2333,6 +2394,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">%1$sን በጭራሽ አትተርጉም</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">ይህን ጣቢያ በጭራሽ አትተርጉም</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">ሁሉንም ሌሎች ቅንብሮችን ይሽራል</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">የመተርጎም ቅናሾችን ይሽራል</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">የትርጉም ቅንብሮች</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 9d7ae7841..3220d9990 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -2323,18 +2323,48 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <string name="review_quality_check_analysis_in_progress_warning_body">Aquò trigar unes 60 segondas.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title">Mercés pel senhalament !</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body">Deuriam aver d’informacions tocant los avises d’aqueste produch d’aquí 24 oras. Tornatz mai tard.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Podèm pas verificar aquestes avises</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Malastrosament, podèm pas verificar la qualitat dels avises d’unes tipes de produches. Per exemple, las cartas present, la transmission de vidèo, la musica e los jòcs.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Mai d’info lèu</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Deuriam aver d’informacions tocant los avises d’aqueste produch d’aquí 24 oras. Tornatz mai tard.</string>
     <!-- Title for info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">Las analisis son a jorn</string>
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Plan realizat</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
     <string name="review_quality_check_generic_error_title">Cap d’info pas disponible pel moment</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Sèm a trabalhar per resòlver aqueste problèma. Mercés de tornar ensajar mai tard.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
     <string name="review_quality_check_no_connection_title">Cap de connexion ret</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Verificatz la connexion ret puèi tornatz ensajar d’actualizar la pagina.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Cap d’informacion suls avises pel moment</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Per saber si los avises son fisables, verificatz lor qualitat. Sonque pren 60 segondas.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
     <string name="review_quality_check_no_analysis_link">Valorar la qualitat dels avises</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Ensajatz nòstra guida de fisança pels avises de produches</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Agachatz quina fisabilitat acordar als avises de produches sus %1$s abans de crompar. Lo verificador d’avises, una foncionalitat experimentala de %2$s, es integrada al navegador. Fonciona tanben per %3$s e %4$s.</string>
+    <!-- Description for review quality check contextual onboarding card. The first parameters is for retailer name (e.g. Amazon). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description_one_vendor">Agachatz quina fisabilitat acordar als avises de produches sus %1$s abans de crompar. Lo verificador d’avises, una foncionalitat experimentala de %2$s, es integrada al navegador.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Amb lo poder de %1$s per Mozilla, vos ajudam a evitar los avises biaissats e non autentics. Nòstre modèl d’IA es a se melhorar en permanéncia per vos protegir quand crompatz. %2$s</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Ne saber mai</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">En seleccionant « Òc-ben, ensajar », acceptatz la %1$s de %2$s e las %3$s de Mozilla.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
+    <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">En seleccionant « òc-ben, ensajar » acceptatz los elements seguent de %1$s :</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy">politica de confidencialitat</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
@@ -2347,8 +2377,12 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <string name="review_quality_check_contextual_onboarding_primary_button_text">Òc-ben, ensajar</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_secondary_button_text">Mai tard</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Verificatz se vos podètz fisar dels avises sul produch, abans de crompar.</string>
     <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Ensajar lo verificador d’avises</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Aquestes avises son fisables ? Verificatz-o ara per veire una evaluacion corregida.</string>
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Dobrir lo verificador d’avises</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6e3a51aab..f31b19fc6 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -264,8 +264,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Digitalizar</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Mecanismo de pesquisa</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Configurações de mecanismos de pesquisa</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -320,14 +318,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Notificações ajudam você a aproveitar mais o %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Notificações ajudam você a aproveitar mais o %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sincronize suas abas entre dispositivos, gerencie arquivos baixados, receba dicas de como aproveitar ao máximo a proteção de privacidade do %s e muito mais.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sincronize suas abas entre dispositivos, gerencie arquivos baixados, receba dicas de como aproveitar ao máximo a proteção de privacidade do %s e muito mais.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Avançar</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Avançar</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Agora não</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Agora não</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -444,21 +442,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modo somente HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Redução de avisos de cookies</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Bloqueador de avisos de cookies</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Bloqueador de avisos de cookies na navegação privativa</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduzir avisos de cookies</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Desativado</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Ativado</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">O %1$s tenta rejeitar automaticamente solicitações de cookies em avisos de cookies.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Desativado neste site</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -476,37 +464,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Site atualmente não suportado</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Ativar redução de avisos de cookies em %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Ativar bloqueador de avisos de cookies em %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Desativar redução de avisos de cookies em %1$s?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Desativar bloqueador de avisos de cookies em %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">O %1$s não pode rejeitar solicitações de cookies automaticamente neste site. Você pode enviar uma solicitação para passar a funcionar neste site.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">O %1$s irá limpar os cookies deste site e atualizar a página. Limpar todos os cookies pode encerrar a sessão de acesso no site ou esvaziar carrinhos de compras.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Desative e o %1$s limpa cookies e recarrega este site. Isso pode desconectar você de uma conta ou esvaziar um carrinho de compras.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">O %1$s tenta rejeitar automaticamente todas as solicitações de cookies em sites suportados.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Ative e o %1$s tenta recusar avisos de cookies automaticamente neste site.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Permitir que %1$s rejeite avisos de cookies?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s pode rejeitar automaticamente muitas solicitações de avisos de cookies.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Agora não</string>
-
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Aparecerão menos solicitações de cookies</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Permitir</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">O %1$s acabou de recusar cookies para você</string>
@@ -1293,8 +1261,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Descartar</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Não foi possível imprimir</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Não foi possível imprimir esta página</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Imprimir</string>
@@ -1799,6 +1765,8 @@
     <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Proteja as senhas salvas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a suas contas e senhas salvas, caso outras pessoas usem seu dispositivo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a suas senhas salvas, caso outras pessoas usem seu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Mais tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1817,6 +1785,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menu de ordenação de contas</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu de ordenação de senhas</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Preenchimento automático</string>
@@ -1824,10 +1795,16 @@
     <string name="preferences_addresses">Endereços</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Cartões de crédito</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Métodos de pagamento</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Salvar e preencher cartões automaticamente</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Salvar e preencher métodos de pagamento</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Os dados são criptografados</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">O %s criptografa todos os métodos de pagamento que você salva</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar cartões entre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1835,17 +1812,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Adicionar cartão de crédito</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Adicionar cartão</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Gerenciar cartões salvos</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gerenciar cartões</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adicionar endereço</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Gerenciar endereços</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Salvar e preencher endereços automaticamente</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Salvar e preencher endereços</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Incluir informações como números, email e endereços de entrega</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Incluir números de telefone e endereços de email</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Adicionar cartão</string>
     <!-- Title of the "Edit card" screen -->
@@ -1866,6 +1852,8 @@
     <string name="credit_cards_delete_card_button">Excluir cartão</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Tem certeza que quer excluir este cartão de crédito?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Excluir cartão?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Excluir</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1881,14 +1869,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Digite um número de cartão de crédito válido</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Digite um número de cartão válido</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Preencha este campo</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Adicionar um nome</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloqueie para ver seus cartões salvos</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Proteja seus cartões de crédito</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Proteja seus métodos de pagamento salvos</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a seus cartões de crédito salvos, caso outras pessoas usem seu dispositivo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a seus cartões salvos, caso outras pessoas usem seu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar agora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1899,6 +1895,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Desbloqueie para usar informações armazenadas de cartões de crédito</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desbloqueie para usar formas de pagamento salvas</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adicionar endereço</string>
     <!-- Title of the "Edit address" screen -->
@@ -1937,6 +1935,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Tem certeza que quer excluir este endereço?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Excluir este endereço?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Excluir</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2035,30 +2035,52 @@
     <string name="login_menu_edit_button">Editar</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Tem certeza que quer excluir esta conta?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Tem certeza que quer excluir esta senha?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Excluir</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancelar</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Opções da conta</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opções de senhas</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">O campo de texto editável do endereço web da conta.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">O campo de texto editável do endereço do site da senha.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">O campo de texto editável do nome de usuário da conta.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">O campo de texto editável do nome de usuário da senha.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">O campo de texto editável da senha da conta.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">O campo de texto editável da senha.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Salvar alterações na conta.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Salvar alterações.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Editar</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Editar senha</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Adicionar conta</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Adicionar senha</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Senha é obrigatória</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Digite uma senha</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Nome de usuário é obrigatório</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Digite um nome de usuário</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Nome de servidor é obrigatório</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Digite um endereço web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Pesquisa por voz</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2230,8 +2252,6 @@
 
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Saiba mais sobre o %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">como o %s da Mozilla determina a qualidade das avaliações</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">como o %s determina a qualidade das avaliações</string>
     <!-- Text for title of settings section. -->
@@ -2439,6 +2459,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Nunca traduzir %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Nunca traduzir este site</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Sobrepõe todas as outras configurações</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Sobrepõe ofertas de traduzir</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Configurações de tradução</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 11a39e438..849bf639c 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -69,7 +69,7 @@
 
     <!-- True Private Browsing Mode -->
     <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
-    <string name="felt_privacy_desc_card_title">Não deixe evidências neste dispositivo</string>
+    <string name="felt_privacy_desc_card_title">Não deixe vestígios neste dispositivo</string>
     <!-- Explanation for private browsing displayed to users on home view when they first enable
         private mode in our new Total Private Browsing mode.
         The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
@@ -105,7 +105,7 @@
 
     <!-- Private browsing erase action "contextual feature recommendation" (CFR) -->
     <!-- Text for the message displayed in the contextual feature recommendation popup promoting the erase private browsing feature. -->
-    <string name="erase_action_cfr_message">Toque aqui para iniciar uma nova sessão privada. Exclua o seu histórico, cookies — tudo.</string>
+    <string name="erase_action_cfr_message">Toque aqui para iniciar uma nova sessão privada. Elimine o seu histórico, cookies – tudo.</string>
 
 
     <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
@@ -213,6 +213,8 @@
     <string name="resync_button_content_description">Ressincronizar</string>
     <!-- Browser menu button that opens the find in page menu -->
     <string name="browser_menu_find_in_page">Encontrar na página</string>
+    <!-- Browser menu button that opens the translations dialog, which has options to translate the current browser page. -->
+    <string name="browser_menu_translations">Traduzir página</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">Guardar na coleção</string>
     <!-- Browser menu button that open a share menu to share the current site -->
@@ -261,8 +263,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Digitalizar</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Motor de pesquisa</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Definições do motor de pesquisa</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -317,23 +317,28 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">As notificações ajudam a fazer mais com o %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">As notificações ajudam a fazer mais com o %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sincronize os seus separadores entre dispositivos, gira transferências, obtenha dicas sobre como aproveitar ao máximo a proteção de privacidade do %s e muito mais.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sincronize os seus separadores entre dispositivos, gira transferências, obtenha dicas sobre como aproveitar ao máximo a proteção de privacidade do %s e muito mais.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Continuar</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Continuar</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Agora não</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Agora não</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Política de privacidade do Firefox</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Adoramos mantê-lo(a) seguro(a)</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">O nosso navegador, apoiado por uma organização sem fins lucrativos, ajuda a impedir que as empresas o sigam secretamente pela web.\n\n Saiba mais nas nossas informações de privacidade.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">O nosso navegador, apoiado por uma organização sem fins lucrativos, ajuda a impedir que as empresas o sigam secretamente pela Internet.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">O nosso navegador, apoiado por uma organização sem fins lucrativos, ajuda a impedir que as empresas o sigam secretamente pela web.\n\n Saiba mais nas nossas informações de privacidade.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">informação de privacidade</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">informação de privacidade</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Definir como navegador predefinido</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -437,21 +442,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modo apenas HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Redução de Faixas de Cookies</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Bloqueador de faixas de cookies</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Bloqueador de faixas de cookies na navegação privada</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduzir faixas de cookies</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Desligado</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Ligado</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">O %1$s tenta rejeitar automaticamente pedidos de cookies em faixas de cookies.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Desativado para este site</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -469,35 +464,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Site atualmente não suportado</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Ativar Redução de Faixa de Cookie para %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Ativar o bloqueador de faixa de cookies para %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Desativar Redução de Faixa de Cookie para %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Desativar o bloqueador de faixa de cookies para %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s não pode rejeitar automaticamente pedidos de cookies neste site. Pode enviar um pedido para suportar este site no futuro.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s limpará os cookies deste site e atualizará a página. A limpeza de todos os cookies pode fazer com que se desconecte da sessão ou esvazie os carrinhos de compras.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Desative e o %1$s irá limpar os cookies e recarregar este site. Isto pode terminar a sua sessão ou esvaziar os carrinhos de compras.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">O %1$s tenta rejeitar automaticamente todos os pedidos de cookies em sites suportados.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Ative e o %1$s tentará recusar automaticamente todas as faixas de cookies neste site.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Permitir que %1$s rejeite faixas de cookies?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s pode rejeitar automaticamente muitos pedidos de faixas de cookie.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Agora não</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Verá menos pedidos de cookies</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Permitir</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s acabou de recusar cookies por si</string>
@@ -714,6 +690,8 @@
     <string name="preferences_sync_bookmarks">Marcadores</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Credenciais</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Palavras-passe</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Separadores abertos</string>
     <!-- Preference for signing out -->
@@ -740,6 +718,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Cartões de crédito</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Métodos de pagamento</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Moradas</string>
 
@@ -1279,8 +1259,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Dispensar</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Não é possível imprimir</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Não é possível imprimir esta página</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Imprimir</string>
@@ -1328,6 +1306,8 @@
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
     <string name="notification_erase_title_android_14">Fechar separadores privados?</string>
 
+    <string name="notification_erase_text_android_14">Toque ou deslize esta notificação para fechar os separadores privados.</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">Marketing</string>
 
@@ -1566,6 +1546,8 @@
     <string name="preference_enhanced_tracking_protection_custom_cookies_4">Todos os cookies (irá causar falhas nos sites)</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
     <string name="preference_enhanced_tracking_protection_custom_cookies_5">Isolar cookies inter-sites</string>
+    <!-- Preference for Global Privacy Control for the custom privacy settings for Global Privacy Control. '&amp;' is replaced with the ampersand symbol: &-->
+    <string name="preference_enhanced_tracking_protection_custom_global_privacy_control">Indique aos sites para não partilhar e vender dados</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content">Conteúdo de monitorização</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
@@ -1683,9 +1665,13 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Credenciais e palavras-passe</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Palavras-passe</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Guardar credenciais e palavras-passe</string>
 
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Guardar palavras-passe</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Pedir para guardar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1702,26 +1688,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Adicionar credenciais</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Adicionar palavra-passe</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronização de credenciais</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizar palavras-passe</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sincronizar credenciais entre dispositivos</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronize palavras-passe entre dispositivos</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Credenciais guardadas</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Palavras-passe guardadas</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">As credenciais que guardar ou sincronizar com o %s serão apresentadas aqui.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">As palavras-passe que guardar ou sincronizar com o %s serão listadas aqui. Todas as palavras-passe que guarda são encriptadas.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Saber mais sobre a sincronização.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Saber mais sobre a sincronização</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Exceções</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">As credenciais e palavras-passe que não estão guardadas serão mostradas aqui.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">O %s não irá guardar palavras-passe para sites listados aqui.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">As credenciais e palavras-passe não serão guardadas para estes sites.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">O %s não irá guardar as palavras-passe para estes sites.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eliminar todas as exceções</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Pesquisar credenciais</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Procurar palavras-passe</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Site</string>
     <!-- The header for the username for a login -->
@@ -1751,10 +1757,16 @@
     <string name="saved_login_hide_password">Ocultar palavra-passe</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Desbloqueie para ver as credenciais guardadas</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desbloqueie para ver as palavras-passe guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Proteja as suas credenciais e palavras-passe</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Proteja as suas palavras-passe guardadas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que as suas credenciais e palavras-passe guardadas sejam acedidas por outra pessoa que tenha acesso ao seu dispositivo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que as suas palavras-passe guardadas sejam acedidas por outra pessoa que tenha acesso ao seu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Mais tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1773,6 +1785,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menu de ordenação de credenciais</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu de ordenação de palavras-passe</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Preenchimento automático</string>
@@ -1780,10 +1795,16 @@
     <string name="preferences_addresses">Endereços</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Cartões de crédito</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Métodos de pagamento</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Guardar e preencher automaticamente cartões</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Guardar e preencher métodos de pagamento</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Os dados são encriptados</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">O %s encripta todos os métodos de pagamento que guarda</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar cartões entre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1791,8 +1812,12 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Adicionar cartão de crédito</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Adicionar cartão</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Gerir cartões guardados</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gerir cartões</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adicionar endereço</string>
     <!-- Preference option for managing saved addresses -->
@@ -1800,9 +1825,14 @@
 
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Guardar e preencher automaticamente endereços</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Guardar e preencher endereços</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Incluir informações como números, e-mail e endereços de entrega</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Inclui números de telefone e endereços de e-mail</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Adicionar cartão</string>
     <!-- Title of the "Edit card" screen -->
@@ -1823,6 +1853,8 @@
     <string name="credit_cards_delete_card_button">Eliminar cartão</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Tem a certeza de que quer apagar este cartão de crédito?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Eliminar cartão?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Apagar</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1837,14 +1869,22 @@
 
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Por favor, introduza um número de cartão de crédito válido</string>
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Insira um número de cartão válido</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Por favor preencha este campo</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Adicionar um nome</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloquear para ver os cartões guardados</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Proteja os seus cartões de crédito</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Proteja os seus métodos de pagamento guardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que os seus cartões de crédito guardados sejam acedidos por outra pessoa que tenha acesso ao seu dispositivo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que os seus cartões guardados sejam acedidos por outra pessoa que tenha acesso ao seu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar agora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1854,6 +1894,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Desbloquear para utilizar as informações de cartão de crédito armazenadas</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desbloquear para utilizar métodos de pagamento guardados</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adicionar endereço</string>
     <!-- Title of the "Edit address" screen -->
@@ -1891,6 +1933,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Tem a certeza de que quer eliminar este endereço?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Eliminar este endereço?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Apagar</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1990,30 +2034,52 @@
     <string name="login_menu_edit_button">Editar</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Tem a certeza que deseja eliminar esta credencial?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Tem a certeza que quer eliminar esta palavra-passe?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Eliminar</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancelar</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Opções de credenciais</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opções de palavra-passe</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">O campo de texto editável para o endereço de Internet da credencial.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">O campo de texto editável para o endereço da palavra-passe.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">O campo de texto editável para o nome de utilizador da credencial.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">O campo de texto editável para o nome de utilizador da palavra-passe.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">O campo de texto editável para a palavra-passe da credencial.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">O campo de texto editável para a palavra-passe.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Guardar alterações na credencial.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Guardar alterações.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Editar</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Editar palavra-passe</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Adicionar nova credencial</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Adicionar palavra-passe</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">É necessária uma palavra-passe</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Introduza uma palavra-passe</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">É necessário um nome de utilizador</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Introduza um nome de utilizador</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">É necessário um nome de servidor</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Introduza um endereço de Internet</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Pesquisa por voz</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2161,6 +2227,8 @@
     <string name="review_quality_check_adjusted_rating_title">Classificação ajustada</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Avaliações não confiáveis removidas</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description_2">Baseado em avaliações confiáveis</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Destaques das avaliações recentes</string>
     <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
@@ -2181,8 +2249,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Os destaques</b> são avaliações de %s dos últimos 80 dias que acreditamos serem confiáveis.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Saiba mais acerca do %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">como %s da Mozilla determina a qualidade da revisão</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">como %s determina a qualidade da avaliação</string>
     <!-- Text for title of settings section. -->
@@ -2221,6 +2287,8 @@
     <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">A verificar a qualidade da avaliação</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
     <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">A verificar a qualidade da avaliação</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
+    <string name="review_quality_check_analysis_in_progress_warning_title_2">A verificar a qualidade da avaliação (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
     <string name="review_quality_check_analysis_in_progress_warning_body">Isto pode demorar cerca de 60 segundos.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
@@ -2310,6 +2378,9 @@
     <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
     <string name="review_quality_check_highlights_type_competitiveness">Competitividade</string>
 
+    <!-- Text that is surrounded by quotes. The parameter is the actual text that is in quotes. An example of that text could be: Excellent craftsmanship, and that is displayed as “Excellent craftsmanship”. The text comes from a buyer's review that the feature is highlighting"   -->
+    <string name="surrounded_with_quotes">“%s”</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">colapsar</string>
@@ -2328,6 +2399,205 @@
     <!-- Content description for headings announced by accessibility service. The first parameter is the text of the heading. Talkback will announce the first parameter and then speak the word "Heading" indicating to the user that this text is a heading for a section. -->
     <string name="a11y_heading">%s, Título</string>
 
+    <!-- Title for dialog displayed when trying to access links present in a text. -->
+    <string name="a11y_links_title">Ligações</string>
+    <!-- Additional content description for text bodies that contain urls. -->
+    <string name="a11y_links_available">Ligações disponíveis</string>
+
     <!-- Translations feature-->
 
-    </resources>
+    <!-- Translation request dialog -->
+    <!-- Title for the translation dialog that allows a user to translate the webpage. -->
+    <string name="translations_bottom_sheet_title">Traduzir esta página?</string>
+    <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translations_bottom_sheet_title_first_time">Experimente as traduções privadas no %1$s</string>
+    <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
+    <string name="translations_bottom_sheet_info_message">Pela sua privacidade, as traduções nunca deixam o seu dispositivo. Novos idiomas e melhorias para breve! %1$s</string>
+    <!-- Text that links to additional information about the Firefox translations feature. -->
+    <string name="translations_bottom_sheet_info_message_learn_more">Saber mais</string>
+    <!-- Label for the dropdown to select which language to translate from on the translations dialog. Usually the translate from language selected will be the same as the page language. -->
+    <string name="translations_bottom_sheet_translate_from">Traduzir de</string>
+    <!-- Label for the dropdown to select which language to translate to on the translations dialog. Usually the translate to language selected will be the user's preferred language. -->
+    <string name="translations_bottom_sheet_translate_to">Traduzir para</string>
+    <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
+    <string name="translations_bottom_sheet_negative_button">Agora não</string>
+    <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
+    <string name="translations_bottom_sheet_negative_button_error">Feito</string>
+    <!-- Button text on the translations dialog to begin a translation of the website. -->
+    <string name="translations_bottom_sheet_positive_button">Traduzir</string>
+    <!-- Button text on the translations dialog when a translation error appears. -->
+    <string name="translations_bottom_sheet_positive_button_error">Tentar novamente</string>
+    <!-- Inactive button text on the translations dialog that indicates a translation is currently in progress. This button will be accompanied by a loading icon. -->
+    <string name="translations_bottom_sheet_translating_in_progress">Tradução</string>
+    <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
+    <string name="translations_bottom_sheet_translating_in_progress_content_description">Tradução em curso</string>
+    <!-- The title of the warning card informs the user that a translation could not be completed. -->
+    <string name="translation_error_could_not_translate_warning_text">Ocorreu um problema com a tradução. Por favor, tente novamente.</string>
+    <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
+    <string name="translation_error_could_not_load_languages_warning_text">Não foi possível carregar os idiomas. Verifique a sua ligação à Internet e tente novamente.</string>
+    <!-- The title of the warning card informs the user that a language is not supported. The first parameter is the name of the language that is not supported. -->
+    <string name="translation_error_language_not_supported_warning_text">Desculpe, nós ainda não suportamos o %1$s.</string>
+    <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
+    <string name="translation_error_language_not_supported_learn_more">Saber mais</string>
+
+    <!-- Translations options dialog -->
+    <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
+    <string name="translation_option_bottom_sheet_title">Opções de tradução</string>
+    <!-- Toggle switch label that allows a user to set the setting if they would like the browser to always offer or suggest translations when available. -->
+    <string name="translation_option_bottom_sheet_always_translate">Oferecer sempre a opção de tradução</string>
+    <!-- Toggle switch label that allows a user to set if they would like a given language to automatically translate or not. The first parameter is the language name, for example, "Spanish". -->
+    <string name="translation_option_bottom_sheet_always_translate_in_language">Traduzir sempre de %1$s</string>
+    <!-- Toggle switch label that allows a user to set if they would like to never be offered a translation of the given language. The first parameter is the language name, for example, "Spanish". -->
+    <string name="translation_option_bottom_sheet_never_translate_in_language">Nunca traduzir de %1$s</string>
+    <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
+    <string name="translation_option_bottom_sheet_never_translate_site">Nunca traduzir este site</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Sobrepõe todas as outras definições</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Sobrepõe pedidos de tradução</string>
+    <!-- Button text for the button that will take the user to the translation settings dialog. -->
+    <string name="translation_option_bottom_sheet_translation_settings">Definições de tradução</string>
+    <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translation_option_bottom_sheet_about_translations">Sobre as traduções no %1$s</string>
+
+    <!-- Translation settings dialog -->
+    <!-- Title of the translation settings dialog that allows a user to set their preferred translation settings. -->
+    <string name="translation_settings_toolbar_title">Traduções</string>
+    <!-- Toggle switch label that indicates that the browser should signal or indicate when a translation is possible for any page. -->
+    <string name="translation_settings_offer_to_translate">Sugerir a tradução, quando possível</string>
+    <!-- Toggle switch label that indicates that downloading files required for translating is permitted when using data saver mode in Android. -->
+    <string name="translation_settings_always_download">Transferir sempre idiomas no modo de poupança de dados</string>
+    <!-- Section header text that begins the section of a list of different options the user may select to adjust their translation preferences. -->
+    <string name="translation_settings_translation_preference">Preferências de tradução</string>
+    <!-- Button text for the button that will take the user to the automatic translations settings dialog. On the automatic translations settings dialog, the user can set if translations should occur automatically for a given language. -->
+    <string name="translation_settings_automatic_translation">Tradução automática</string>
+    <!-- Button text for the button that will take the user to the never translate these sites dialog. On the never translate these sites dialog, the user can set if translations should never occur on certain websites. -->
+    <string name="translation_settings_automatic_never_translate_sites">Nunca traduzir estes sites</string>
+    <!-- Button text for the button that will take the user to the download languages dialog. On the download languages dialog, the user can manage which languages they would like to download for translations. -->
+    <string name="translation_settings_download_language">Transferir idiomas</string>
+
+    <!-- Automatic translation preference screen -->
+    <!-- Title of the automatic translation preference screen that will appear on the toolbar.-->
+    <string name="automatic_translation_toolbar_title_preference">Tradução automática</string>
+    <!-- Screen header presenting the automatic translation preference feature. It will appear under the toolbar. -->
+    <string name="automatic_translation_header_preference">Selecione um idioma para gerir as preferências “traduzir sempre” e “nunca traduzir”.</string>
+
+    <!-- Automatic translation options preference screen -->
+    <!-- Preference option for offering to translate. Radio button title text.-->
+    <string name="automatic_translation_option_offer_to_translate_title_preference">Oferecer para traduzir (predefinição)</string>
+    <!-- Preference option for offering to translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_offer_to_translate_summary_preference">%1$s irá sugerir a tradução de sites neste idioma.</string>
+    <!-- Preference option for always translate. Radio button title text. -->
+    <string name="automatic_translation_option_always_translate_title_preference">Traduzir sempre</string>
+    <!-- Preference option for always translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_always_translate_summary_preference">O %1$s irá traduzir este idioma automaticamente quando a página for carregada.</string>
+    <!-- Preference option for never translate. Radio button title text.-->
+    <string name="automatic_translation_option_never_translate_title_preference">Nunca traduzir</string>
+    <!-- Preference option for never translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_never_translate_summary_preference">O %1$s nunca irá sugerir para traduzir sites neste idioma.</string>
+
+    <!-- Never translate site preference screen -->
+    <!-- Title of the never translate site preference screen that will appear on the toolbar.-->
+    <string name="never_translate_site_toolbar_title_preference">Nunca traduzir estes sites</string>
+    <!-- Screen header presenting the never translate site preference feature. It will appear under the toolbar. -->
+    <string name="never_translate_site_header_preference">Para adicionar um novo site: Visite o mesmo e selecione “Nunca traduzir este site” no menu de tradução.</string>
+    <!-- Content description (not visible, for screen readers etc.): For a never-translated site list item that is selected.
+             The first parameter is web site url (for example:"wikipedia.com") -->
+    <string name="never_translate_site_item_list_content_description_preference">Remover %1$s</string>
+    <!-- The Delete site dialogue title will appear when the user clicks on a list item.
+             The first parameter is web site url (for example:"wikipedia.com") -->
+    <string name="never_translate_site_dialog_title_preference">Eliminar %1$s?</string>
+    <!-- The Delete site dialogue positive button will appear when the user clicks on a list item. The site will be deleted. -->
+    <string name="never_translate_site_dialog_confirm_delete_preference">Eliminar</string>
+    <!-- The Delete site dialogue negative button will appear when the user clicks on a list item. The dialog will be dismissed. -->
+    <string name="never_translate_site_dialog_cancel_preference">Cancelar</string>
+
+    <!-- Download languages preference screen -->
+    <!-- Title of the download languages preference screen toolbar.-->
+    <string name="download_languages_toolbar_title_preference">Transferência de idiomas</string>
+    <!-- Screen header presenting the download language preference feature. It will appear under the toolbar.The first parameter is "Learn More," a clickable text with a link. Talkback will append this to say "Double tap to open link to learn more". -->
+    <string name="download_languages_header_preference">Transfira idiomas completos para traduções mais rápidas e para traduzir offline. %1$s</string>
+    <!-- Clickable text from the screen header that links to a website. -->
+    <string name="download_languages_header_learn_more_preference">Saber mais</string>
+    <!-- The subhead of the download language preference screen will appear above the pivot language. -->
+    <string name="download_languages_available_languages_preference">Idiomas disponíveis</string>
+    <!-- Text that will appear beside a core or pivot language package name to show that the language is necessary for the translation feature to function. -->
+    <string name="download_languages_default_system_language_require_preference">necessário</string>
+    <!-- A text for download language preference item.
+    The first parameter is the language name, for example, "Spanish".
+    The second parameter is the language file size, for example, "(3.91 KB)" or, if the language package name is a pivot language, "(required)". -->
+    <string name="download_languages_language_item_preference">%1$s (%2$s)</string>
+    <!-- The subhead of the download language preference screen will appear above the items that were not downloaded. -->
+    <string name="download_language_header_preference">Transferir idiomas</string>
+    <!-- All languages list item. When the user presses this item, they can download or delete all languages. -->
+    <string name="download_language_all_languages_item_preference">Todos os idiomas</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item that was downloaded, the user can now delete it. -->
+    <string name="download_languages_item_content_description_downloaded_state">Eliminar</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item, downloading is in progress. -->
+    <string name="download_languages_item_content_description_in_progress_state">Em curso</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item that was not downloaded. -->
+    <string name="download_languages_item_content_description_not_downloaded_state">Transferir</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item that is selected. -->
+    <string name="download_languages_item_content_description_selected_state">Selecionado</string>
+
+    <!-- Title for the dialog used by the translations feature to confirm deleting a language.
+    The dialog will be presented when the user requests deletion of a language.
+    The first parameter is the name of the language, for example, "Spanish" and the second parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_file_dialog_title">Eliminar %1$s (%2$s)?</string>
+    <!-- Additional information for the dialog used by the translations feature to confirm deleting a language. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="delete_language_file_dialog_message">Se eliminar este idioma, o %1$s irá transferir idiomas parciais para a sua cache à medida que você traduz.</string>
+    <!-- Title for the dialog used by the translations feature to confirm deleting all languages file.
+    The dialog will be presented when the user requests deletion of all languages file.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_all_languages_file_dialog_title">Eliminar todos os idiomas (%1$s)?</string>
+    <!-- Additional information for the dialog used by the translations feature to confirm deleting all languages file. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="delete_language_all_languages_file_dialog_message">Se eliminar todos os idiomas, o %1$s irá transferir idiomas parciais para a sua cache à medida que você traduz.</string>
+    <!-- Button text on the dialog used by the translations feature to confirm deleting a language. -->
+    <string name="delete_language_file_dialog_positive_button_text">Eliminar</string>
+    <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
+    <string name="delete_language_file_dialog_negative_button_text">Cancelar</string>
+
+    <!-- Title for the data saving mode warning dialog used by the translations feature.
+    This dialog will be presented when the user attempts to download a language or perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file.-->
+    <string name="download_language_file_dialog_title">Transferir (%1$s) no modo de poupança de dados?</string>
+    <!-- Additional information for the data saving mode warning dialog used by the translations feature. This text explains the reason a download is required for a translation. -->
+    <string name="download_language_file_dialog_message_all_languages">Transferimos idiomas parciais para a sua cache para manter as traduções privadas.</string>
+    <!-- Checkbox label text on the data saving mode warning dialog used by the translations feature. This checkbox allows users to ignore the data usage warnings. -->
+    <string name="download_language_file_dialog_checkbox_text">Transferir sempre no modo de poupança de dados</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
+    <string name="download_language_file_dialog_positive_button_text">Transferir</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file and perform a translation. -->
+    <string name="download_language_file_dialog_positive_button_text_all_languages">Transferir e traduzir</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
+    <string name="download_language_file_dialog_negative_button_text">Cancelar</string>
+
+    <!-- Debug drawer -->
+    <!-- The user-facing title of the Debug Drawer feature. -->
+    <string name="debug_drawer_title">Ferramentas de depuração</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate back within the debug drawer. -->
+    <string name="debug_drawer_back_button_content_description">Navegar de volta</string>
+    <!-- The title of the Tab Tools feature in the Debug Drawer. -->
+    <string name="debug_drawer_tab_tools_title">Ferramentas de separadores</string>
+    <!-- The title of the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_title">Contagem de separadores</string>
+    <!-- The active tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_normal">Ativo</string>
+    <!-- The inactive tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_inactive">Inativo</string>
+    <!-- The private tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_private">Privado</string>
+    <!-- The total tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_total">Total</string>
+    <!-- The title of the tab creation tool section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_title">Ferramenta de criação de separadores</string>
+    <!-- The label of the text field in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_text_field_label">Quantidade de separadores a criar</string>
+    <!-- The button text to add tabs to the active tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_active">Adicionar aos separadores ativos</string>
+    <!-- The button text to add tabs to the inactive tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_inactive">Adicionar aos separadores inativos</string>
+    <!-- The button text to add tabs to the private tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_private">Adicionar aos separadores privados</string>
+</resources>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 24a9cb802..ea099419b 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -323,11 +323,13 @@
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text">Shënim Firefox mbi privatësinë</string>
+    <string name="juno_onboarding_privacy_notice_text">Shënim mbi privatësinë në Firefox</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Duam fort t’ju mbajmë të parrezik</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Shfletuesi ynë, me entin jofitimprurës nga pas, ndihmon të ndalen shoqëri t’ju ndjekin fshehtazi nëpër internet.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Shfletuesi ynë, me entin jofitimprurës nga pas, ndihmon të ndalen shoqëri t’ju ndjekin fshehtazi nëpër internet.\n\nMësoni më tepër te shënimi ynë mbi privatësinë.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -1696,14 +1698,22 @@
     <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Fjalëkalime të ruajtur</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Këtu do të shfaqen kredencialet e hyrjeve që ruani ose njëkohësoni në %s.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Këtu do të shfaqen fjalëkalimet që ruani, ose njëkohësoni në %s. Krejt fjalëkalimet që ruani, fshehtëzohen.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Mësoni më tepër mbi Sync-un.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Mësoni më tepër mbi njëkohësimin</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Përjashtime</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Këtu do të shfaqen kredenciale hyrjesh dhe fjalëkalime që nuk janë ruajtur.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s s’do të ruajë fjalëkalime për sajte të radhitur këtu.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Për këto sajte s’do të ruhen kredenciale hyrjesh dhe fjalëkalime.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s s’do të ruajë fjalëkalime për këta sajte.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Fshi krejt përjashtimet</string>
     <!-- Hint for search box in logins list -->
@@ -1738,10 +1748,16 @@
     <string name="saved_login_hide_password">Fshihe fjalëkalimin</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Që të shihni kredenciale tuajt hyrjesh të ruajtur, shkyçeni</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Që të shihni fjalëkalimet tuaj të ruajtura, shkyçeni</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Siguroni kredenciale hyrjesh dhe fjalëkalime tuajt</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Siguroni fjalëkalimet tuaj të ruajtur</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur nga hyrja në to kredencialet e hyrjes dhe fjalëkalimet tuaj të ruajtur, nëse pajisjen tuaj e ka dikush tjetër.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur prej hyrjes në to fjalëkalimet tuaj të ruajtur, nëse pajisjen tuaj e ka dikush tjetër.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Më vonë</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1761,6 +1777,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Renditni menu kredencialesh</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu renditjeje fjalëkalimesh</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Vetëplotësime</string>
@@ -1776,6 +1795,8 @@
     <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Ruaj dhe plotëso metoda pagesash</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Të dhënat janë të fshehtëzuara</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s fshehtëzon krejt metodat e pagesave që ruani</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Njëkohëso të dhëna kartash mes pajisjesh</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1800,6 +1821,9 @@
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Përfshini hollësi të tilla si numra, email dhe adresa dërgimi</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Përfshin numra telefonash dhe adresa email</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Shtoni kartë</string>
     <!-- Title of the "Edit card" screen -->
@@ -1846,8 +1870,12 @@
     <string name="credit_cards_biometric_prompt_message">Që të shihni kartat tuaja të ruajtura, shkyçeni</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Siguroni kartat tuaja të kreditit</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Siguroni metodat tuaja të ruajtura të pagesave</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur nga hyrja në to kartat tuaja kreditit të ruajturar, nëse pajisjen tuaj e ka dikush tjetër.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur prej hyrjes në to hollësitë e ruajtura për kartat tuaja, nëse pajisjen tuaj e ka dikush tjetër.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Ujdiseni tani</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1857,6 +1885,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Që të përdorni të dhëna karte krediti të depozituara, shkyçeni</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Që të përdorni metoda të ruajtura pagesash, shkyçeni</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Shtoni adresë</string>
     <!-- Title of the "Edit address" screen -->
@@ -1893,6 +1923,8 @@
     <string name="addressess_delete_address_button">Përzgjidhni adresë</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Jeni i sigurt se doni të fshihet kjo adresë?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Të fshihet kjo adresë?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Fshije</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2003,10 +2035,16 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Mundësi fjalëkalimesh</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Fusha e përpunueshme e teksteve për adresën web të kredencialeve të hyrjes.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Fusha e përpunueshme e teksteve për adresën web të fjalëkalimit.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Fusha e përpunueshme e teksteve për emrin e përdoruesit të kredencialeve të hyrjes.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Fusha e përpunueshme e teksteve për emrin e përdoruesit të fjalëkalimit.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Fusha e përpunueshme e teksteve për fjalëkalimin e kredencialeve të hyrjes.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Fusha e përpunueshme e teksteve për fjalëkalimin.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Ruani ndryshimet te kredenciale hyrjesh.</string>
     <!--  The button description to save changes to an edited password. -->

From 93216ddbfcd3130b4c8b2f990685206f990d6d87 Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Fri, 26 Jan 2024 14:25:14 +0000
Subject: [PATCH 045/222] Bug 1876751 - Remove redundant preferences from
 SettingsFragment

---
 .../fenix/settings/SettingsFragment.kt        | 28 -------------------
 app/src/main/res/values/preference_keys.xml   |  3 --
 2 files changed, 31 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 118662dac..885407f0c 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -308,17 +308,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
             resources.getString(R.string.pref_key_sync_debug) -> {
                 SettingsFragmentDirections.actionSettingsFragmentToSyncDebugFragment()
             }
-            resources.getString(R.string.pref_key_help) -> {
-                (activity as HomeActivity).openToBrowserAndLoad(
-                    searchTermOrURL = SupportUtils.getSumoURLForTopic(
-                        requireContext(),
-                        SupportUtils.SumoTopic.HELP,
-                    ),
-                    newTab = true,
-                    from = BrowserDirection.FromSettings,
-                )
-                null
-            }
             resources.getString(R.string.pref_key_rate) -> {
                 try {
                     startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(SupportUtils.RATE_APP_URL)))
@@ -365,23 +354,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
             resources.getString(R.string.pref_key_customize) -> {
                 SettingsFragmentDirections.actionSettingsFragmentToCustomizationFragment()
             }
-            resources.getString(R.string.pref_key_privacy_link) -> {
-                val intent = SupportUtils.createCustomTabIntent(
-                    requireContext(),
-                    SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE),
-                )
-                startActivity(intent)
-                null
-            }
-            resources.getString(R.string.pref_key_your_rights) -> {
-                val context = requireContext()
-                val intent = SupportUtils.createCustomTabIntent(
-                    context,
-                    SupportUtils.getSumoURLForTopic(context, SupportUtils.SumoTopic.YOUR_RIGHTS),
-                )
-                startActivity(intent)
-                null
-            }
             resources.getString(R.string.pref_key_debug_settings) -> {
                 SettingsFragmentDirections.actionSettingsFragmentToSecretSettingsFragment()
             }
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index 97281deec..59e41aebe 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -18,7 +18,6 @@
     <string name="pref_key_advanced" translatable="false">pref_key_advanced</string>
     <string name="pref_key_language" translatable="false">pref_key_language</string>
     <string name="pref_key_data_choices" translatable="false">pref_key_data_choices</string>
-    <string name="pref_key_privacy_link" translatable="false">pref_key_privacy_link</string>
     <string name="pref_key_delete_browsing_data" translatable="false">pref_key_delete_browsing_data</string>
     <string name="pref_key_delete_browsing_data_on_quit_preference" translatable="false">pref_key_delete_browsing_data_on_quit_preference</string>
     <string name="pref_key_notifications" translatable="false">pref_key_notifications</string>
@@ -42,10 +41,8 @@
     <string name="pref_key_override_amo_user" translatable="false">pref_key_override_amo_user</string>
     <string name="pref_key_override_amo_collection" translatable="false">pref_key_override_amo_collection</string>
     <string name="pref_key_enable_gecko_logs" translatable="false">pref_key_enable_gecko_logs</string>
-    <string name="pref_key_help" translatable="false">pref_key_help</string>
     <string name="pref_key_rate" translatable="false">pref_key_rate</string>
     <string name="pref_key_about" translatable="false">pref_key_about</string>
-    <string name="pref_key_your_rights" translatable="false">pref_key_your_rights</string>
     <string name="pref_key_account" translatable="false">pref_key_account</string>
     <string name="pref_key_sign_in" translatable="false">pref_key_sign_in</string>
     <string name="pref_key_account_auth_error" translatable="false">pref_key_account_auth_error</string>

From 54c1c08010cf1e696b6f7bbdccb9bdb6f445e82d Mon Sep 17 00:00:00 2001
From: DreVla <vlad.dreghici@gmail.com>
Date: Thu, 11 Jan 2024 15:31:46 +0200
Subject: [PATCH 046/222] Bug 1871093 - Review checker change info card button
 color

This patch aims to increase accessibility of the review checker
feature by increasing the contrast of the info card button.
---
 app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
index 458a23dc5..2bdc1467a 100644
--- a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
+++ b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
@@ -104,7 +104,7 @@ private val darkColorPalette = FirefoxColors(
     layerWarning = PhotonColors.Yellow70A77,
     layerConfirmation = PhotonColors.Green80,
     layerError = PhotonColors.Pink80,
-    layerInfo = PhotonColors.Blue50A80,
+    layerInfo = PhotonColors.Blue50,
     actionPrimary = PhotonColors.Violet60,
     actionSecondary = PhotonColors.LightGrey30,
     actionTertiary = PhotonColors.DarkGrey10,
@@ -112,7 +112,7 @@ private val darkColorPalette = FirefoxColors(
     actionWarning = PhotonColors.Yellow40A41,
     actionConfirmation = PhotonColors.Green70,
     actionError = PhotonColors.Pink70A69,
-    actionInfo = PhotonColors.Blue30,
+    actionInfo = PhotonColors.Blue60,
     formDefault = PhotonColors.LightGrey05,
     formSelected = PhotonColors.Violet40,
     formSurface = PhotonColors.DarkGrey05,

From 506efb730b5c09c8aa7d2dc49d0e7dfadec4ff0d Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Fri, 26 Jan 2024 14:37:01 +0000
Subject: [PATCH 047/222] Bug 1876752 - Reorder preferences in
 `SettingsFragment` to match the UI layout

---
 .../fenix/settings/SettingsFragment.kt        | 178 +++++++++++-------
 1 file changed, 111 insertions(+), 67 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 885407f0c..81df60037 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -261,115 +261,112 @@ class SettingsFragment : PreferenceFragmentCompat() {
         recyclerView.isVerticalScrollBarEnabled = false
 
         val directions: NavDirections? = when (preference.key) {
+            /* Top level account preferences.
+            Note: Only ONE of these preferences is visible at a time. */
             resources.getString(R.string.pref_key_sign_in) -> {
                 SettingsMetrics.signIntoSync.add()
                 SettingsFragmentDirections.actionSettingsFragmentToTurnOnSyncFragment(
                     entrypoint = FenixFxAEntryPoint.SettingsMenu,
                 )
             }
-            resources.getString(R.string.pref_key_tabs) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToTabsSettingsFragment()
+
+            resources.getString(R.string.pref_key_account) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToAccountSettingsFragment()
             }
-            resources.getString(R.string.pref_key_home) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToHomeSettingsFragment()
+
+            resources.getString(R.string.pref_key_account_auth_error) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToAccountProblemFragment(
+                    entrypoint = FenixFxAEntryPoint.SettingsMenu,
+                )
             }
+
+            /* General preferences */
             resources.getString(R.string.pref_key_search_settings) -> {
                 SettingsFragmentDirections.actionSettingsFragmentToSearchEngineFragment()
             }
-            resources.getString(R.string.pref_key_tracking_protection_settings) -> {
-                TrackingProtection.etpSettings.record(NoExtras())
-                SettingsFragmentDirections.actionSettingsFragmentToTrackingProtectionFragment()
-            }
-            resources.getString(R.string.pref_key_site_permissions) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToSitePermissionsFragment()
-            }
-            resources.getString(R.string.pref_key_private_browsing) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToPrivateBrowsingFragment()
-            }
-            resources.getString(R.string.pref_key_https_only_settings) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToHttpsOnlyFragment()
-            }
-            resources.getString(R.string.pref_key_accessibility) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToAccessibilityFragment()
-            }
-            resources.getString(R.string.pref_key_language) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToLocaleSettingsFragment()
-            }
-            resources.getString(R.string.pref_key_addons) -> {
-                Addons.openAddonsInSettings.record(mozilla.components.service.glean.private.NoExtras())
-                SettingsFragmentDirections.actionSettingsFragmentToAddonsFragment()
-            }
-            resources.getString(R.string.pref_key_open_links_in_apps) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToOpenLinksInAppsFragment()
-            }
-            resources.getString(R.string.pref_key_data_choices) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToDataChoicesFragment()
+
+            resources.getString(R.string.pref_key_tabs) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToTabsSettingsFragment()
             }
-            resources.getString(R.string.pref_key_sync_debug) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToSyncDebugFragment()
+
+            resources.getString(R.string.pref_key_home) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToHomeSettingsFragment()
             }
-            resources.getString(R.string.pref_key_rate) -> {
-                try {
-                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(SupportUtils.RATE_APP_URL)))
-                } catch (e: ActivityNotFoundException) {
-                    // Device without the play store installed.
-                    // Opening the play store website.
-                    (activity as HomeActivity).openToBrowserAndLoad(
-                        searchTermOrURL = SupportUtils.FENIX_PLAY_STORE_URL,
-                        newTab = true,
-                        from = BrowserDirection.FromSettings,
-                    )
-                }
-                null
+
+            resources.getString(R.string.pref_key_customize) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToCustomizationFragment()
             }
+
             resources.getString(R.string.pref_key_passwords) -> {
                 SettingsMetrics.passwords.record()
                 SettingsFragmentDirections.actionSettingsFragmentToSavedLoginsAuthFragment()
             }
+
             resources.getString(R.string.pref_key_credit_cards) -> {
                 SettingsMetrics.autofill.record()
                 SettingsFragmentDirections.actionSettingsFragmentToAutofillSettingFragment()
             }
-            resources.getString(R.string.pref_key_about) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToAboutFragment()
+
+            resources.getString(R.string.pref_key_accessibility) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToAccessibilityFragment()
             }
-            resources.getString(R.string.pref_key_account) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToAccountSettingsFragment()
+
+            resources.getString(R.string.pref_key_language) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToLocaleSettingsFragment()
             }
-            resources.getString(R.string.pref_key_account_auth_error) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToAccountProblemFragment(
-                    entrypoint = FenixFxAEntryPoint.SettingsMenu,
-                )
+
+            /* Privacy and security preferences */
+            resources.getString(R.string.pref_key_private_browsing) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToPrivateBrowsingFragment()
+            }
+
+            resources.getString(R.string.pref_key_https_only_settings) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToHttpsOnlyFragment()
+            }
+
+            resources.getString(R.string.pref_key_tracking_protection_settings) -> {
+                TrackingProtection.etpSettings.record(NoExtras())
+                SettingsFragmentDirections.actionSettingsFragmentToTrackingProtectionFragment()
+            }
+
+            resources.getString(R.string.pref_key_site_permissions) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToSitePermissionsFragment()
             }
+
             resources.getString(R.string.pref_key_delete_browsing_data) -> {
                 SettingsFragmentDirections.actionSettingsFragmentToDeleteBrowsingDataFragment()
             }
+
             resources.getString(R.string.pref_key_delete_browsing_data_on_quit_preference) -> {
                 SettingsFragmentDirections.actionSettingsFragmentToDeleteBrowsingDataOnQuitFragment()
             }
+
             resources.getString(R.string.pref_key_notifications) -> {
                 context?.navigateToNotificationsSettings {}
                 null
             }
-            resources.getString(R.string.pref_key_customize) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToCustomizationFragment()
-            }
-            resources.getString(R.string.pref_key_debug_settings) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToSecretSettingsFragment()
-            }
-            resources.getString(R.string.pref_key_secret_debug_info) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToSecretInfoSettingsFragment()
+
+            resources.getString(R.string.pref_key_data_choices) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToDataChoicesFragment()
             }
-            resources.getString(R.string.pref_key_nimbus_experiments) -> {
-                SettingsFragmentDirections.actionSettingsFragmentToNimbusExperimentsFragment()
+
+            /* Advanced preferences */
+            resources.getString(R.string.pref_key_addons) -> {
+                Addons.openAddonsInSettings.record(mozilla.components.service.glean.private.NoExtras())
+                SettingsFragmentDirections.actionSettingsFragmentToAddonsFragment()
             }
+
+            // Only displayed when secret settings are enabled
             resources.getString(R.string.pref_key_install_local_addon) -> {
                 addonFilePicker.launch()
                 null
             }
+
+            // Only displayed when secret settings are enabled
             resources.getString(R.string.pref_key_override_amo_collection) -> {
                 val context = requireContext()
-                val dialogView = LayoutInflater.from(context).inflate(R.layout.amo_collection_override_dialog, null)
+                val dialogView = LayoutInflater.from(context)
+                    .inflate(R.layout.amo_collection_override_dialog, null)
 
                 val binding = AmoCollectionOverrideDialogBinding.bind(dialogView)
                 AlertDialog.Builder(context).apply {
@@ -381,7 +378,8 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
                     setPositiveButton(R.string.customize_addon_collection_ok) { _, _ ->
                         context.settings().overrideAmoUser = binding.customAmoUser.text.toString()
-                        context.settings().overrideAmoCollection = binding.customAmoCollection.text.toString()
+                        context.settings().overrideAmoCollection =
+                            binding.customAmoCollection.text.toString()
 
                         Toast.makeText(
                             context,
@@ -406,6 +404,51 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
                 null
             }
+
+            resources.getString(R.string.pref_key_open_links_in_apps) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToOpenLinksInAppsFragment()
+            }
+
+            resources.getString(R.string.pref_key_sync_debug) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToSyncDebugFragment()
+            }
+
+            /* About preferences */
+            resources.getString(R.string.pref_key_rate) -> {
+                try {
+                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(SupportUtils.RATE_APP_URL)))
+                } catch (e: ActivityNotFoundException) {
+                    // Device without the play store installed.
+                    // Opening the play store website.
+                    (activity as HomeActivity).openToBrowserAndLoad(
+                        searchTermOrURL = SupportUtils.FENIX_PLAY_STORE_URL,
+                        newTab = true,
+                        from = BrowserDirection.FromSettings,
+                    )
+                }
+                null
+            }
+
+            resources.getString(R.string.pref_key_about) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToAboutFragment()
+            }
+
+            // Only displayed when secret settings are enabled
+            resources.getString(R.string.pref_key_debug_settings) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToSecretSettingsFragment()
+            }
+
+            // Only displayed when secret settings are enabled
+            resources.getString(R.string.pref_key_secret_debug_info) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToSecretInfoSettingsFragment()
+            }
+
+            // Only displayed when secret settings are enabled
+            resources.getString(R.string.pref_key_nimbus_experiments) -> {
+                SettingsFragmentDirections.actionSettingsFragmentToNimbusExperimentsFragment()
+            }
+
+            // Only displayed when secret settings are enabled
             resources.getString(R.string.pref_key_start_profiler) -> {
                 if (profilerViewModel.getProfilerState().value == true) {
                     SettingsFragmentDirections.actionSettingsFragmentToStopProfilerDialog()
@@ -413,6 +456,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
                     SettingsFragmentDirections.actionSettingsFragmentToStartProfilerDialog()
                 }
             }
+
             else -> null
         }
         directions?.let { navigateFromSettings(directions) }

From 7a909e3f79961dd571c04d419f655726a084311c Mon Sep 17 00:00:00 2001
From: Aaron Train <aaron.train@gmail.com>
Date: Tue, 14 Nov 2023 15:22:15 -0500
Subject: [PATCH 048/222] Bug 1864692 - Create new startup-test Robo Test Task
 for Fenix/Focus w/opt-enabled Nightly

---
 .../androidTest/flank-arm-start-test-robo.yml | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 automation/taskcluster/androidTest/flank-arm-start-test-robo.yml

diff --git a/automation/taskcluster/androidTest/flank-arm-start-test-robo.yml b/automation/taskcluster/androidTest/flank-arm-start-test-robo.yml
new file mode 100644
index 000000000..503eae25f
--- /dev/null
+++ b/automation/taskcluster/androidTest/flank-arm-start-test-robo.yml
@@ -0,0 +1,27 @@
+# Google Cloud Documentation: https://cloud.google.com/sdk/gcloud/reference/firebase/test/android/run
+# Flank Documentation: https://flank.github.io/flank/
+gcloud:
+  results-bucket: fenix_test_artifacts
+  record-video: false
+  timeout: 5m
+  async: false
+
+  app: /app/path
+
+  auto-google-login: false
+  use-orchestrator: true
+  environment-variables:
+    clearPackageData: true
+
+  device:
+    - model: MediumPhone.arm
+      version: 30
+      locale: en_US
+
+  type: robo
+
+flank:
+  project: GOOGLE_PROJECT
+  num-test-runs: 1
+  output-style: compact
+  full-junit-result: true

From 3470a4e951dce116a5bc76cf05206fadadd802c5 Mon Sep 17 00:00:00 2001
From: ohall-m <ohall@mozilla.com>
Date: Thu, 25 Jan 2024 16:01:48 -0500
Subject: [PATCH 049/222] Bug 1876610 - Minor Translations UI Adjustments

This patch completes a few minor translations UI adjustments. Including
updating mock data on the "never translate these sites" page and the
"language settings" page.

Additionally, adds a content description on the toolbar for the
translation icon.
---
 .../java/org/mozilla/fenix/browser/BrowserFragment.kt     | 2 +-
 .../automatic/AutomaticTranslationPreference.kt           | 8 ++++----
 .../nevertranslatesite/NeverTranslateSitePreference.kt    | 7 +------
 app/src/main/res/values/strings.xml                       | 4 ++++
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index f93d8c455..5248f0773 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -230,7 +230,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
                     context,
                     R.drawable.mozac_ic_translate_24,
                 )!!,
-                contentDescription = "",
+                contentDescription = context.getString(R.string.browser_toolbar_translate),
                 contentDescriptionSelected = "",
                 visible = {
                     translationsAvailable || context.settings().enableTranslations
diff --git a/app/src/main/java/org/mozilla/fenix/translations/preferences/automatic/AutomaticTranslationPreference.kt b/app/src/main/java/org/mozilla/fenix/translations/preferences/automatic/AutomaticTranslationPreference.kt
index a267d249b..0cc3ffa2e 100644
--- a/app/src/main/java/org/mozilla/fenix/translations/preferences/automatic/AutomaticTranslationPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/translations/preferences/automatic/AutomaticTranslationPreference.kt
@@ -78,25 +78,25 @@ internal fun getAutomaticTranslationListPreferences(): List<AutomaticTranslation
     return mutableListOf<AutomaticTranslationItemPreference>().apply {
         add(
             AutomaticTranslationItemPreference(
-                displayName = Locale.CANADA.displayName,
+                displayName = Locale.CANADA.displayLanguage,
                 automaticTranslationOptionPreference = AutomaticTranslationOptionPreference.AlwaysTranslate(),
             ),
         )
         add(
             AutomaticTranslationItemPreference(
-                displayName = Locale.FRANCE.displayName,
+                displayName = Locale.FRANCE.displayLanguage,
                 automaticTranslationOptionPreference = AutomaticTranslationOptionPreference.OfferToTranslate(),
             ),
         )
         add(
             AutomaticTranslationItemPreference(
-                displayName = Locale.GERMANY.displayName,
+                displayName = Locale.GERMANY.displayLanguage,
                 automaticTranslationOptionPreference = AutomaticTranslationOptionPreference.NeverTranslate(),
             ),
         )
         add(
             AutomaticTranslationItemPreference(
-                displayName = Locale.CHINA.displayName,
+                displayName = Locale.CHINA.displayLanguage,
                 automaticTranslationOptionPreference = AutomaticTranslationOptionPreference.AlwaysTranslate(),
             ),
         )
diff --git a/app/src/main/java/org/mozilla/fenix/translations/preferences/nevertranslatesite/NeverTranslateSitePreference.kt b/app/src/main/java/org/mozilla/fenix/translations/preferences/nevertranslatesite/NeverTranslateSitePreference.kt
index 76f521c5c..e8cf6c1a4 100644
--- a/app/src/main/java/org/mozilla/fenix/translations/preferences/nevertranslatesite/NeverTranslateSitePreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/translations/preferences/nevertranslatesite/NeverTranslateSitePreference.kt
@@ -82,12 +82,7 @@ internal fun getNeverTranslateListItemsPreference(): List<NeverTranslateSiteList
     return mutableListOf<NeverTranslateSiteListItemPreference>().apply {
         add(
             NeverTranslateSiteListItemPreference(
-                websiteUrl = "expedia.ca",
-            ),
-        )
-        add(
-            NeverTranslateSiteListItemPreference(
-                websiteUrl = "wikipedia.com",
+                websiteUrl = "mozilla.org",
             ),
         )
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b217ab037..081bf9eb9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -233,12 +233,16 @@
     <string name="browser_menu_edit">Edit</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Customize homepage</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Home screen</string>
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Erase browsing history</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Translate page</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Selected language</string>

From 2b48fa54b30765bbf46301f3553821bf05654151 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Fri, 5 Jan 2024 17:56:03 -0500
Subject: [PATCH 050/222] Bug 1870335 - Merge content descriptions in the
 Add-ons details screen.

---
 .../fenix/addons/AddonDetailsBindingDelegate.kt | 15 +++++++++++++--
 .../main/res/layout/fragment_add_on_details.xml |  4 ++++
 .../addons/AddonDetailsBindingDelegateTest.kt   | 17 ++++++++++++++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
index 8ad012fe8..3ff2f85f6 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
@@ -10,6 +10,8 @@ import android.text.method.LinkMovementMethod
 import android.text.style.ClickableSpan
 import android.text.style.URLSpan
 import android.view.View
+import android.widget.TextView
+import androidx.annotation.VisibleForTesting
 import androidx.core.net.toUri
 import androidx.core.text.HtmlCompat
 import androidx.core.text.getSpans
@@ -62,7 +64,6 @@ class AddonDetailsBindingDelegate(
         addon.rating?.let { rating ->
             val resources = binding.root.resources
             val ratingContentDescription = resources.getString(R.string.mozac_feature_addons_rating_content_description)
-            binding.ratingView.contentDescription = String.format(ratingContentDescription, rating.average)
             binding.ratingView.rating = rating.average
 
             binding.reviewCount.text = numberFormatter.format(rating.reviews)
@@ -73,6 +74,7 @@ class AddonDetailsBindingDelegate(
                     interactor.openWebsite(addon.ratingUrl.toUri())
                 }
             }
+            binding.ratingLabel.joinContextDescriptions(String.format(ratingContentDescription, rating.average))
         }
     }
 
@@ -96,7 +98,9 @@ class AddonDetailsBindingDelegate(
             return
         }
 
-        binding.lastUpdatedText.text = dateFormatter.format(addon.updatedAtDate)
+        val formattedDate = dateFormatter.format(addon.updatedAtDate)
+        binding.lastUpdatedText.text = formattedDate
+        binding.lastUpdatedLabel.joinContextDescriptions(formattedDate)
     }
 
     private fun bindVersion(addon: Addon) {
@@ -114,6 +118,7 @@ class AddonDetailsBindingDelegate(
         } else {
             binding.versionText.setOnLongClickListener(null)
         }
+        binding.versionLabel.joinContextDescriptions(version)
     }
 
     private fun bindAuthor(addon: Addon) {
@@ -133,6 +138,7 @@ class AddonDetailsBindingDelegate(
                 interactor.openWebsite(author.url.toUri())
             }
         }
+        binding.authorLabel.joinContextDescriptions(author.name)
     }
 
     private fun bindDetails(addon: Addon) {
@@ -179,4 +185,9 @@ class AddonDetailsBindingDelegate(
             interactor.openWebsite(addon.detailUrl.toUri())
         }
     }
+
+    @VisibleForTesting
+    internal fun TextView.joinContextDescriptions(text: String) {
+        this.contentDescription = "${this.text} $text"
+    }
 }
diff --git a/app/src/main/res/layout/fragment_add_on_details.xml b/app/src/main/res/layout/fragment_add_on_details.xml
index 457ae4689..61bff2fcd 100644
--- a/app/src/main/res/layout/fragment_add_on_details.xml
+++ b/app/src/main/res/layout/fragment_add_on_details.xml
@@ -49,6 +49,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/author_label"
             app:layout_constraintTop_toBottomOf="@+id/details"
+            android:importantForAccessibility="no"
             tools:text="@tools:sample/full_names" />
 
         <View
@@ -83,6 +84,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/version_label"
             app:layout_constraintTop_toBottomOf="@+id/author_divider"
+            android:importantForAccessibility="no"
             tools:text="1.2.3" />
 
         <View
@@ -116,6 +118,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/last_updated_label"
             app:layout_constraintTop_toBottomOf="@+id/version_divider"
+            android:importantForAccessibility="no"
             tools:text="Oct 16, 2019" />
 
         <View
@@ -178,6 +181,7 @@
                 app:layout_constraintHorizontal_bias="1"
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintStart_toEndOf="@+id/rating_label"
+                android:importantForAccessibility="no"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
diff --git a/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt b/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
index f364a2b4b..8df9a2a29 100644
--- a/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
@@ -8,6 +8,7 @@ import android.net.Uri
 import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
+import android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO
 import androidx.core.view.isVisible
 import io.mockk.mockk
 import io.mockk.verify
@@ -66,9 +67,14 @@ class AddonDetailsBindingDelegateTest {
                 ),
             ),
         )
-        assertEquals("4.30/5", binding.ratingView.contentDescription)
         assertEquals(4.5f, binding.ratingView.rating)
         assertEquals("100", binding.reviewCount.text)
+        val ratingContentDescription = testContext.getString(R.string.mozac_feature_addons_rating_content_description)
+
+        val formattedRatting = String.format(ratingContentDescription, 4.3f)
+        val expectedContentDescription = binding.ratingLabel.text.toString() + " " + formattedRatting
+        assertEquals(expectedContentDescription, binding.ratingLabel.contentDescription)
+        assertEquals(IMPORTANT_FOR_ACCESSIBILITY_NO, binding.ratingView.importantForAccessibility)
     }
 
     @Test
@@ -104,6 +110,9 @@ class AddonDetailsBindingDelegateTest {
         detailsBindingDelegate.bind(baseAddon)
 
         assertEquals("Nov 23, 2020", binding.lastUpdatedText.text)
+        val expectedContentDescription = binding.lastUpdatedLabel.text.toString() + " " + "Nov 23, 2020"
+        assertEquals(expectedContentDescription, binding.lastUpdatedLabel.contentDescription)
+        assertEquals(IMPORTANT_FOR_ACCESSIBILITY_NO, binding.lastUpdatedText.importantForAccessibility)
     }
 
     @Test
@@ -130,6 +139,9 @@ class AddonDetailsBindingDelegateTest {
         assertEquals("2.0.0", binding.versionText.text)
         binding.versionText.performLongClick()
         verify { interactor.showUpdaterDialog(addon2) }
+        val expectedContentDescription = binding.versionLabel.text.toString() + " 2.0.0"
+        assertEquals(expectedContentDescription, binding.versionLabel.contentDescription)
+        assertEquals(IMPORTANT_FOR_ACCESSIBILITY_NO, binding.versionText.importantForAccessibility)
     }
 
     @Test
@@ -140,6 +152,9 @@ class AddonDetailsBindingDelegateTest {
 
         assertEquals("Sarah Jane", binding.authorText.text)
         assertNotEquals(testContext.getColorFromAttr(R.attr.textAccent), binding.authorText.currentTextColor)
+        val expectedContentDescription = binding.authorLabel.text.toString() + " Sarah Jane"
+        assertEquals(expectedContentDescription, binding.authorLabel.contentDescription)
+        assertEquals(IMPORTANT_FOR_ACCESSIBILITY_NO, binding.authorText.importantForAccessibility)
     }
 
     @Test

From 851afc87450dd050bf7bdfb504b3783284e2ddf3 Mon Sep 17 00:00:00 2001
From: ohall-m <ohall@mozilla.com>
Date: Thu, 25 Jan 2024 15:15:28 -0500
Subject: [PATCH 051/222] Bug 1873983 - Translations Secret Settings Option in
 Nightly

This patch enables translations to be turned on via the secret settings
flag in Nightly.
---
 app/src/main/java/org/mozilla/fenix/FeatureFlags.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index d20272d6a..f7da4b110 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -67,7 +67,7 @@ object FeatureFlags {
      * Allows users to enable translations.
      * Preference to fully enable translations is pref_key_enable_translations.
      */
-    val translations = Config.channel.isDebug
+    val translations = Config.channel.isNightlyOrDebug
 
     /**
      * Allows users to enable Firefox Suggest.

From 5fc19e67558d657f6682ecbfe6c1e63e2edaf25b Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Tue, 19 Dec 2023 16:10:09 -0500
Subject: [PATCH 052/222] Bug 1867717 - Add DownloadsFeature to
 AddonPopupBaseFragment.

---
 .../addons/AddonInternalSettingsFragment.kt   |  18 +-
 .../fenix/addons/AddonPopupBaseFragment.kt    | 124 ++++++++++++-
 .../addons/WebExtensionActionPopupFragment.kt |  19 +-
 .../fenix/browser/BaseBrowserFragment.kt      |  85 +++++----
 .../fenix/browser/DownloadDialogUtils.kt      |  62 +++++++
 .../mozilla/fenix/browser/DownloadUtils.kt    |  53 ------
 .../mozilla/fenix/components/Components.kt    |  11 ++
 .../fenix/components/DownloadStyling.kt       |  36 ++++
 .../fragment_add_on_internal_settings.xml     |  14 ++
 .../addons/AddonPopupBaseFragmentTest.kt      |  53 ++++++
 .../fenix/browser/BaseBrowserFragmentTest.kt  |  73 +-------
 .../fenix/browser/DownloadDialogUtilsTest.kt  | 173 ++++++++++++++++++
 12 files changed, 557 insertions(+), 164 deletions(-)
 create mode 100644 app/src/main/java/org/mozilla/fenix/browser/DownloadDialogUtils.kt
 delete mode 100644 app/src/main/java/org/mozilla/fenix/browser/DownloadUtils.kt
 create mode 100644 app/src/main/java/org/mozilla/fenix/components/DownloadStyling.kt
 create mode 100644 app/src/test/java/org/mozilla/fenix/addons/AddonPopupBaseFragmentTest.kt
 create mode 100644 app/src/test/java/org/mozilla/fenix/browser/DownloadDialogUtilsTest.kt

diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonInternalSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonInternalSettingsFragment.kt
index 8c08a95fd..7155c90ee 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonInternalSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonInternalSettingsFragment.kt
@@ -12,6 +12,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import mozilla.components.feature.addons.ui.translateName
 import org.mozilla.fenix.R
+import org.mozilla.fenix.databinding.DownloadDialogLayoutBinding
 import org.mozilla.fenix.databinding.FragmentAddOnInternalSettingsBinding
 import org.mozilla.fenix.ext.showToolbar
 
@@ -21,6 +22,8 @@ import org.mozilla.fenix.ext.showToolbar
 class AddonInternalSettingsFragment : AddonPopupBaseFragment() {
 
     private val args by navArgs<AddonInternalSettingsFragmentArgs>()
+    private var _binding: FragmentAddOnInternalSettingsBinding? = null
+    internal val binding get() = _binding!!
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -31,9 +34,17 @@ class AddonInternalSettingsFragment : AddonPopupBaseFragment() {
         return inflater.inflate(R.layout.fragment_add_on_internal_settings, container, false)
     }
 
+    override fun getSnackBarContainer(): ViewGroup {
+        return binding.dynamicSnackbarContainer
+    }
+
+    override fun getDownloadDialogLayoutBinding(): DownloadDialogLayoutBinding {
+        return binding.viewDynamicDownloadDialog
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val binding = FragmentAddOnInternalSettingsBinding.bind(view)
+        _binding = FragmentAddOnInternalSettingsBinding.bind(view)
         args.addon.installedState?.optionsPageUrl?.let {
             engineSession?.let { engineSession ->
                 binding.addonSettingsEngineView.render(engineSession)
@@ -48,4 +59,9 @@ class AddonInternalSettingsFragment : AddonPopupBaseFragment() {
             showToolbar(title = args.addon.translateName(it))
         }
     }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt
index b1c54ee1f..05eeb740b 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt
@@ -5,21 +5,33 @@
 package org.mozilla.fenix.addons
 
 import android.os.Bundle
+import android.os.Environment
 import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.VisibleForTesting
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
+import com.google.android.material.snackbar.Snackbar
 import mozilla.components.browser.state.action.ContentAction
 import mozilla.components.browser.state.action.CustomTabListAction
 import mozilla.components.browser.state.state.CustomTabSessionState
 import mozilla.components.browser.state.state.EngineState
 import mozilla.components.browser.state.state.SessionState
+import mozilla.components.browser.state.state.content.DownloadState
 import mozilla.components.browser.state.state.createCustomTab
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.prompt.PromptRequest
 import mozilla.components.concept.engine.window.WindowRequest
+import mozilla.components.concept.fetch.Response
+import mozilla.components.feature.downloads.DownloadsFeature
 import mozilla.components.feature.prompts.PromptFeature
 import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
+import org.mozilla.fenix.browser.DownloadDialogUtils
+import org.mozilla.fenix.components.DownloadStyling
+import org.mozilla.fenix.components.FenixSnackbar
+import org.mozilla.fenix.databinding.DownloadDialogLayoutBinding
+import org.mozilla.fenix.downloads.DynamicDownloadDialog
 import org.mozilla.fenix.ext.requireComponents
 
 /**
@@ -28,19 +40,22 @@ import org.mozilla.fenix.ext.requireComponents
  */
 abstract class AddonPopupBaseFragment : Fragment(), EngineSession.Observer, UserInteractionHandler {
     private val promptsFeature = ViewBoundFeatureWrapper<PromptFeature>()
+    private val downloadsFeature = ViewBoundFeatureWrapper<DownloadsFeature>()
 
-    protected var session: SessionState? = null
+    internal var session: SessionState? = null
     protected var engineSession: EngineSession? = null
     private var canGoBack: Boolean = false
 
     @Suppress("DEPRECATION")
     // https://github.com/mozilla-mobile/fenix/issues/19920
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        val store = requireComponents.core.store
+        val safeContext = requireContext()
         session?.let {
             promptsFeature.set(
                 feature = PromptFeature(
                     fragment = this,
-                    store = requireComponents.core.store,
+                    store = store,
                     customTabId = it.id,
                     fragmentManager = parentFragmentManager,
                     fileUploadsDirCleaner = requireComponents.core.fileUploadsDirCleaner,
@@ -52,6 +67,52 @@ abstract class AddonPopupBaseFragment : Fragment(), EngineSession.Observer, User
                 owner = this,
                 view = view,
             )
+
+            downloadsFeature.set(
+                DownloadsFeature(
+                    safeContext,
+                    store = store,
+                    useCases = requireComponents.useCases.downloadUseCases,
+                    fragmentManager = parentFragmentManager,
+                    tabId = it.id,
+                    downloadManager = requireComponents.downloadManager,
+                    promptsStyling = DownloadStyling.createPrompt(safeContext),
+                    onNeedToRequestPermissions = { permissions ->
+                        requestPermissions(permissions, REQUEST_CODE_DOWNLOAD_PERMISSIONS)
+                    },
+                ),
+                owner = this,
+                view = view,
+            )
+
+            downloadsFeature.get()?.onDownloadStopped = { downloadState, _, downloadJobStatus ->
+                val onCannotOpenFile: (DownloadState) -> Unit = {
+                    FenixSnackbar.make(
+                        view = getSnackBarContainer(),
+                        duration = Snackbar.LENGTH_SHORT,
+                        isDisplayedWithBrowserToolbar = true,
+                    ).setText(DynamicDownloadDialog.getCannotOpenFileErrorMessage(requireContext(), it))
+                        .show()
+                }
+                DownloadDialogUtils.handleOnDownloadFinished(
+                    context = requireContext(),
+                    downloadState = downloadState,
+                    downloadJobStatus = downloadJobStatus,
+                    currentTab = it,
+                    onCannotOpenFile = onCannotOpenFile,
+                    onFinishedDialogShown = {
+                        DynamicDownloadDialog(
+                            context = requireContext(),
+                            downloadState = downloadState,
+                            didFail = downloadJobStatus == DownloadState.Status.FAILED,
+                            tryAgain = downloadsFeature.get()!!::tryAgain,
+                            onCannotOpenFile = onCannotOpenFile,
+                            binding = getDownloadDialogLayoutBinding(),
+                            toolbarHeight = 0,
+                        ) {}.show()
+                    },
+                )
+            }
         }
     }
 
@@ -73,6 +134,44 @@ abstract class AddonPopupBaseFragment : Fragment(), EngineSession.Observer, User
         engineSession?.unregister(this)
     }
 
+    override fun onExternalResource(
+        url: String,
+        fileName: String?,
+        contentLength: Long?,
+        contentType: String?,
+        cookie: String?,
+        userAgent: String?,
+        isPrivate: Boolean,
+        skipConfirmation: Boolean,
+        openInApp: Boolean,
+        response: Response?,
+    ) {
+        session?.let { session ->
+            val fileSize = if (contentLength != null && contentLength < 0) null else contentLength
+            val download = DownloadState(
+                url,
+                fileName,
+                contentType,
+                fileSize,
+                0,
+                DownloadState.Status.INITIATED,
+                userAgent,
+                Environment.DIRECTORY_DOWNLOADS,
+                private = isPrivate,
+                skipConfirmation = skipConfirmation,
+                openInApp = openInApp,
+                response = response,
+            )
+
+            provideBrowserStore().dispatch(
+                ContentAction.UpdateDownloadAction(
+                    session.id,
+                    download,
+                ),
+            )
+        }
+    }
+
     override fun onPromptRequest(promptRequest: PromptRequest) {
         session?.let { session ->
             requireComponents.core.store.dispatch(
@@ -114,17 +213,34 @@ abstract class AddonPopupBaseFragment : Fragment(), EngineSession.Observer, User
         requireComponents.core.store.dispatch(CustomTabListAction.AddCustomTabAction(session as CustomTabSessionState))
     }
 
+    @VisibleForTesting
+    internal fun provideBrowserStore() = requireComponents.core.store
+
     final override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<String>,
         grantResults: IntArray,
     ) {
-        when (requestCode) {
-            REQUEST_CODE_PROMPT_PERMISSIONS -> promptsFeature.get()?.onPermissionsResult(permissions, grantResults)
+        val feature = when (requestCode) {
+            REQUEST_CODE_PROMPT_PERMISSIONS -> promptsFeature.get()
+            REQUEST_CODE_DOWNLOAD_PERMISSIONS -> downloadsFeature.get()
+            else -> null
         }
+        feature?.onPermissionsResult(permissions, grantResults)
     }
 
+    /**
+     * Returns a [ViewGroup] where a SnackBar message should be anchored.
+     */
+    abstract fun getSnackBarContainer(): ViewGroup
+
+    /**
+     * Returns a [DownloadDialogLayoutBinding] to access the download dialog items.
+     */
+    abstract fun getDownloadDialogLayoutBinding(): DownloadDialogLayoutBinding
+
     companion object {
         private const val REQUEST_CODE_PROMPT_PERMISSIONS = 1
+        private const val REQUEST_CODE_DOWNLOAD_PERMISSIONS = 2
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/addons/WebExtensionActionPopupFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/WebExtensionActionPopupFragment.kt
index 95b2246c5..12fa3597a 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/WebExtensionActionPopupFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/WebExtensionActionPopupFragment.kt
@@ -15,6 +15,7 @@ import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.EngineView
 import mozilla.components.lib.state.ext.consumeFrom
 import org.mozilla.fenix.R
+import org.mozilla.fenix.databinding.DownloadDialogLayoutBinding
 import org.mozilla.fenix.databinding.FragmentAddOnInternalSettingsBinding
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.showToolbar
@@ -33,6 +34,9 @@ class WebExtensionActionPopupFragment : AddonPopupBaseFragment(), EngineSession.
             safeArguments.putBoolean("isSessionConsumed", value)
         }
 
+    private var _binding: FragmentAddOnInternalSettingsBinding? = null
+    internal val binding get() = _binding!!
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -46,6 +50,14 @@ class WebExtensionActionPopupFragment : AddonPopupBaseFragment(), EngineSession.
         return inflater.inflate(R.layout.fragment_add_on_internal_settings, container, false)
     }
 
+    override fun getSnackBarContainer(): ViewGroup {
+        return binding.dynamicSnackbarContainer
+    }
+
+    override fun getDownloadDialogLayoutBinding(): DownloadDialogLayoutBinding {
+        return binding.viewDynamicDownloadDialog
+    }
+
     override fun onResume() {
         super.onResume()
         val title = args.webExtensionTitle ?: args.webExtensionId
@@ -55,7 +67,7 @@ class WebExtensionActionPopupFragment : AddonPopupBaseFragment(), EngineSession.
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val binding = FragmentAddOnInternalSettingsBinding.bind(view)
+        _binding = FragmentAddOnInternalSettingsBinding.bind(view)
 
         val session = engineSession
         // If we have the session, render it otherwise consume it from the store.
@@ -82,6 +94,11 @@ class WebExtensionActionPopupFragment : AddonPopupBaseFragment(), EngineSession.
         }
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
     private fun consumePopupSession() {
         coreComponents.store.dispatch(
             WebExtensionAction.UpdatePopupSessionAction(args.webExtensionId, popupSession = null),
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index cf237221d..db23b580b 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -69,7 +69,6 @@ import mozilla.components.feature.app.links.AppLinksFeature
 import mozilla.components.feature.contextmenu.ContextMenuCandidate
 import mozilla.components.feature.contextmenu.ContextMenuFeature
 import mozilla.components.feature.downloads.DownloadsFeature
-import mozilla.components.feature.downloads.manager.FetchDownloadManager
 import mozilla.components.feature.downloads.temporary.CopyDownloadFeature
 import mozilla.components.feature.downloads.temporary.ShareDownloadFeature
 import mozilla.components.feature.intent.ext.EXTRA_SESSION_ID
@@ -125,6 +124,7 @@ import org.mozilla.fenix.OnBackLongPressedListener
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.readermode.DefaultReaderModeController
+import org.mozilla.fenix.components.DownloadStyling
 import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.components.FindInPageIntegration
 import org.mozilla.fenix.components.StoreProvider
@@ -139,7 +139,6 @@ import org.mozilla.fenix.components.toolbar.interactor.BrowserToolbarInteractor
 import org.mozilla.fenix.components.toolbar.interactor.DefaultBrowserToolbarInteractor
 import org.mozilla.fenix.crashes.CrashContentIntegration
 import org.mozilla.fenix.databinding.FragmentBrowserBinding
-import org.mozilla.fenix.downloads.DownloadService
 import org.mozilla.fenix.downloads.DynamicDownloadDialog
 import org.mozilla.fenix.downloads.FirstPartyDownloadDialog
 import org.mozilla.fenix.downloads.StartDownloadDialog
@@ -531,31 +530,14 @@ abstract class BaseBrowserFragment :
             useCases = context.components.useCases.downloadUseCases,
             fragmentManager = childFragmentManager,
             tabId = customTabSessionId,
-            downloadManager = FetchDownloadManager(
-                context.applicationContext,
-                store,
-                DownloadService::class,
-                notificationsDelegate = context.components.notificationsDelegate,
-            ),
+            downloadManager = context.components.downloadManager,
             shouldForwardToThirdParties = {
                 PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
                     context.getPreferenceKey(R.string.pref_key_external_download_manager),
                     false,
                 )
             },
-            promptsStyling = DownloadsFeature.PromptsStyling(
-                gravity = Gravity.BOTTOM,
-                shouldWidthMatchParent = true,
-                positiveButtonBackgroundColor = ThemeManager.resolveAttribute(
-                    R.attr.accent,
-                    context,
-                ),
-                positiveButtonTextColor = ThemeManager.resolveAttribute(
-                    R.attr.textOnColorPrimary,
-                    context,
-                ),
-                positiveButtonRadius = (resources.getDimensionPixelSize(R.dimen.tab_corner_radius)).toFloat(),
-            ),
+            promptsStyling = DownloadStyling.createPrompt(context),
             onNeedToRequestPermissions = { permissions ->
                 requestPermissions(permissions, REQUEST_CODE_DOWNLOAD_PERMISSIONS)
             },
@@ -608,7 +590,46 @@ abstract class BaseBrowserFragment :
         )
 
         downloadFeature.onDownloadStopped = { downloadState, _, downloadJobStatus ->
-            handleOnDownloadFinished(downloadState, downloadJobStatus, downloadFeature::tryAgain)
+            val onCannotOpenFile: (DownloadState) -> Unit = {
+                FenixSnackbar.make(
+                    view = binding.dynamicSnackbarContainer,
+                    duration = Snackbar.LENGTH_SHORT,
+                    isDisplayedWithBrowserToolbar = true,
+                ).setText(
+                    DynamicDownloadDialog.getCannotOpenFileErrorMessage(
+                        context,
+                        downloadState,
+                    ),
+                ).show()
+            }
+
+            DownloadDialogUtils.handleOnDownloadFinished(
+                context = requireContext(),
+                downloadState = downloadState,
+                downloadJobStatus = downloadJobStatus,
+                currentTab = getCurrentTab(),
+                onFinishedDialogShown = {
+                    saveDownloadDialogState(
+                        downloadState.sessionId,
+                        downloadState,
+                        downloadJobStatus,
+                    )
+                    browserToolbarView.expand()
+
+                    DynamicDownloadDialog(
+                        context = context,
+                        downloadState = downloadState,
+                        didFail = downloadJobStatus == DownloadState.Status.FAILED,
+                        tryAgain = downloadFeature::tryAgain,
+                        onCannotOpenFile = onCannotOpenFile,
+                        binding = binding.viewDynamicDownloadDialog,
+                        toolbarHeight = toolbarHeight,
+                    ) {
+                        sharedViewModel.downloadDialogState.remove(downloadState.sessionId)
+                    }.show()
+                },
+                onCannotOpenFile = onCannotOpenFile,
+            )
         }
 
         resumeDownloadDialogState(
@@ -1098,7 +1119,12 @@ abstract class BaseBrowserFragment :
             didFail = savedDownloadState.second,
             tryAgain = onTryAgain,
             onCannotOpenFile = {
-                showCannotOpenFileError(binding.dynamicSnackbarContainer, context, it)
+                FenixSnackbar.make(
+                    view = binding.dynamicSnackbarContainer,
+                    duration = Snackbar.LENGTH_SHORT,
+                    isDisplayedWithBrowserToolbar = true,
+                ).setText(DynamicDownloadDialog.getCannotOpenFileErrorMessage(context, it))
+                    .show()
             },
             binding = binding.viewDynamicDownloadDialog,
             toolbarHeight = toolbarHeight,
@@ -1599,19 +1625,6 @@ abstract class BaseBrowserFragment :
         )
     }
 
-    internal fun showCannotOpenFileError(
-        container: ViewGroup,
-        context: Context,
-        downloadState: DownloadState,
-    ) {
-        FenixSnackbar.make(
-            view = container,
-            duration = Snackbar.LENGTH_SHORT,
-            isDisplayedWithBrowserToolbar = true,
-        ).setText(DynamicDownloadDialog.getCannotOpenFileErrorMessage(context, downloadState))
-            .show()
-    }
-
     companion object {
         private const val KEY_CUSTOM_TAB_SESSION_ID = "custom_tab_session_id"
         private const val REQUEST_CODE_DOWNLOAD_PERMISSIONS = 1
diff --git a/app/src/main/java/org/mozilla/fenix/browser/DownloadDialogUtils.kt b/app/src/main/java/org/mozilla/fenix/browser/DownloadDialogUtils.kt
new file mode 100644
index 000000000..ee5926b5b
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/browser/DownloadDialogUtils.kt
@@ -0,0 +1,62 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.browser
+
+import android.content.Context
+import androidx.annotation.VisibleForTesting
+import mozilla.components.browser.state.state.SessionState
+import mozilla.components.browser.state.state.content.DownloadState
+import mozilla.components.browser.state.state.content.DownloadState.Status
+import mozilla.components.feature.downloads.AbstractFetchDownloadService
+
+/**
+ * Utilities for handling download dialogs.
+ */
+object DownloadDialogUtils {
+
+    internal fun handleOnDownloadFinished(
+        context: Context,
+        downloadState: DownloadState,
+        downloadJobStatus: Status,
+        currentTab: SessionState?,
+        onFinishedDialogShown: () -> Unit = {},
+        onCannotOpenFile: (DownloadState) -> Unit,
+    ) {
+        // If the download is just paused, don't show any in-app notification
+        if (shouldShowCompletedDownloadDialog(downloadState, downloadJobStatus, currentTab)) {
+            if (downloadState.openInApp && downloadJobStatus == Status.COMPLETED) {
+                val fileWasOpened = openFile(context, downloadState)
+                if (!fileWasOpened) {
+                    onCannotOpenFile(downloadState)
+                }
+            } else {
+                onFinishedDialogShown()
+            }
+        }
+    }
+
+    @VisibleForTesting
+    internal var openFile: (Context, DownloadState) -> (Boolean) = { context, downloadState ->
+        AbstractFetchDownloadService.openFile(
+            applicationContext = context.applicationContext,
+            download = downloadState,
+        )
+    }
+
+    /**
+     * Indicates whether or not a completed download dialog should be shown.
+     */
+    fun shouldShowCompletedDownloadDialog(
+        downloadState: DownloadState,
+        status: Status,
+        currentTab: SessionState?,
+    ): Boolean {
+        val isValidStatus =
+            status in listOf(Status.COMPLETED, Status.FAILED)
+        val isSameTab = downloadState.sessionId == (currentTab?.id ?: false)
+
+        return isValidStatus && isSameTab
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/browser/DownloadUtils.kt b/app/src/main/java/org/mozilla/fenix/browser/DownloadUtils.kt
deleted file mode 100644
index ed0930f76..000000000
--- a/app/src/main/java/org/mozilla/fenix/browser/DownloadUtils.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.browser
-
-import mozilla.components.browser.state.state.content.DownloadState
-import mozilla.components.browser.state.state.content.DownloadState.Status
-import mozilla.components.feature.downloads.AbstractFetchDownloadService
-import org.mozilla.fenix.R
-import org.mozilla.fenix.downloads.DynamicDownloadDialog
-
-internal fun BaseBrowserFragment.handleOnDownloadFinished(
-    downloadState: DownloadState,
-    downloadJobStatus: Status,
-    tryAgain: (String) -> Unit,
-) {
-    // If the download is just paused, don't show any in-app notification
-    if (shouldShowCompletedDownloadDialog(downloadState, downloadJobStatus)) {
-        val safeContext = context ?: return
-        val onCannotOpenFile: (DownloadState) -> Unit = {
-            showCannotOpenFileError(binding.dynamicSnackbarContainer, safeContext, it)
-        }
-        if (downloadState.openInApp && downloadJobStatus == Status.COMPLETED) {
-            val fileWasOpened = AbstractFetchDownloadService.openFile(
-                applicationContext = safeContext.applicationContext,
-                download = downloadState,
-            )
-            if (!fileWasOpened) {
-                onCannotOpenFile(downloadState)
-            }
-        } else {
-            saveDownloadDialogState(
-                downloadState.sessionId,
-                downloadState,
-                downloadJobStatus,
-            )
-
-            val dynamicDownloadDialog = DynamicDownloadDialog(
-                context = safeContext,
-                downloadState = downloadState,
-                didFail = downloadJobStatus == Status.FAILED,
-                tryAgain = tryAgain,
-                onCannotOpenFile = onCannotOpenFile,
-                binding = binding.viewDynamicDownloadDialog,
-                toolbarHeight = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height),
-            ) { sharedViewModel.downloadDialogState.remove(downloadState.sessionId) }
-
-            dynamicDownloadDialog.show()
-            browserToolbarView.expand()
-        }
-    }
-}
diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt
index 0346f0b4f..40d316b8a 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Components.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt
@@ -16,6 +16,7 @@ import mozilla.components.feature.addons.amo.AMOAddonsProvider
 import mozilla.components.feature.addons.migration.DefaultSupportedAddonsChecker
 import mozilla.components.feature.addons.update.DefaultAddonUpdater
 import mozilla.components.feature.autofill.AutofillConfiguration
+import mozilla.components.feature.downloads.manager.FetchDownloadManager
 import mozilla.components.lib.publicsuffixlist.PublicSuffixList
 import mozilla.components.support.base.android.NotificationsDelegate
 import mozilla.components.support.base.worker.Frequency
@@ -29,6 +30,7 @@ import org.mozilla.fenix.autofill.AutofillUnlockActivity
 import org.mozilla.fenix.components.appstate.AppState
 import org.mozilla.fenix.components.metrics.MetricsMiddleware
 import org.mozilla.fenix.datastore.pocketStoriesSelectedCategoriesDataStore
+import org.mozilla.fenix.downloads.DownloadService
 import org.mozilla.fenix.ext.asRecentTabs
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.filterState
@@ -99,6 +101,15 @@ class Components(private val context: Context) {
         )
     }
 
+    val downloadManager by lazyMonitored {
+        FetchDownloadManager(
+            context.applicationContext,
+            core.store,
+            DownloadService::class,
+            notificationsDelegate = notificationsDelegate,
+        )
+    }
+
     val intentProcessors by lazyMonitored {
         IntentProcessors(
             context,
diff --git a/app/src/main/java/org/mozilla/fenix/components/DownloadStyling.kt b/app/src/main/java/org/mozilla/fenix/components/DownloadStyling.kt
new file mode 100644
index 000000000..199f2312b
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/components/DownloadStyling.kt
@@ -0,0 +1,36 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.components
+
+import android.content.Context
+import android.view.Gravity
+import mozilla.components.feature.downloads.DownloadsFeature
+import org.mozilla.fenix.R
+import org.mozilla.fenix.theme.ThemeManager
+
+/**
+ * Provides access to all Fenix download styling.
+ */
+object DownloadStyling {
+
+    /**
+     * creates [DownloadsFeature.PromptsStyling].
+     */
+    fun createPrompt(context: Context): DownloadsFeature.PromptsStyling {
+        return DownloadsFeature.PromptsStyling(
+            gravity = Gravity.BOTTOM,
+            shouldWidthMatchParent = true,
+            positiveButtonBackgroundColor = ThemeManager.resolveAttribute(
+                R.attr.accent,
+                context,
+            ),
+            positiveButtonTextColor = ThemeManager.resolveAttribute(
+                R.attr.textOnColorPrimary,
+                context,
+            ),
+            positiveButtonRadius = (context.resources.getDimensionPixelSize(R.dimen.tab_corner_radius)).toFloat(),
+        )
+    }
+}
diff --git a/app/src/main/res/layout/fragment_add_on_internal_settings.xml b/app/src/main/res/layout/fragment_add_on_internal_settings.xml
index 282f5bd3b..0b3fa0573 100644
--- a/app/src/main/res/layout/fragment_add_on_internal_settings.xml
+++ b/app/src/main/res/layout/fragment_add_on_internal_settings.xml
@@ -13,4 +13,18 @@
         android:id="@+id/addonSettingsEngineView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+
+    <include
+        android:id="@+id/viewDynamicDownloadDialog"
+        layout="@layout/download_dialog_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:visibility="gone" />
+
+    <FrameLayout
+        android:id="@+id/dynamicSnackbarContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="@dimen/browser_fragment_toolbar_elevation"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/test/java/org/mozilla/fenix/addons/AddonPopupBaseFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/addons/AddonPopupBaseFragmentTest.kt
new file mode 100644
index 000000000..28fc9e261
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/addons/AddonPopupBaseFragmentTest.kt
@@ -0,0 +1,53 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.addons
+
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
+import mozilla.components.browser.state.action.ContentAction
+import mozilla.components.browser.state.state.SessionState
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.concept.fetch.Response
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+
+@RunWith(FenixRobolectricTestRunner::class)
+class AddonPopupBaseFragmentTest {
+
+    private lateinit var fragment: AddonPopupBaseFragment
+
+    @Before
+    fun setup() {
+        fragment = spyk()
+    }
+
+    @Test
+    fun `WHEN onExternalResource is call THEN  dispatch an UpdateDownloadAction`() {
+        val store = mockk<BrowserStore>(relaxed = true)
+        val session = mockk<SessionState>(relaxed = true)
+        val response = mockk<Response>(relaxed = true)
+        every { fragment.provideBrowserStore() } returns store
+
+        fragment.session = session
+
+        fragment.onExternalResource(
+            url = "url",
+            fileName = "fileName",
+            contentLength = 1,
+            contentType = "contentType",
+            userAgent = "userAgent",
+            isPrivate = true,
+            skipConfirmation = false,
+            openInApp = false,
+            response = response,
+        )
+
+        verify { store.dispatch(any<ContentAction.UpdateDownloadAction>()) }
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt
index 4670b824b..9db600442 100644
--- a/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt
@@ -12,11 +12,7 @@ import io.mockk.mockk
 import io.mockk.slot
 import io.mockk.spyk
 import io.mockk.verify
-import junit.framework.TestCase.assertFalse
-import junit.framework.TestCase.assertTrue
 import mozilla.components.browser.state.state.SessionState
-import mozilla.components.browser.state.state.content.DownloadState
-import mozilla.components.browser.state.state.createTab
 import mozilla.components.concept.engine.EngineView
 import mozilla.components.concept.engine.permission.SitePermissions
 import mozilla.components.feature.contextmenu.ContextMenuCandidate
@@ -108,6 +104,7 @@ class BaseBrowserFragmentTest {
     }
 
     @Test
+    @Suppress("ktlint:standard:max-line-length")
     fun `initializeEngineView should set toolbar height as EngineView parent's bottom margin when using bottom toolbar`() {
         every { settings.isDynamicToolbarEnabled } returns false
         every { settings.shouldUseBottomToolbar } returns true
@@ -118,7 +115,7 @@ class BaseBrowserFragmentTest {
     }
 
     @Test
-    fun `initializeEngineView should set toolbar height as EngineView parent's bottom margin if top toolbar is forced for a11y`() {
+    fun `initializeEngineView set toolbar height as EngineView parent's bottom margin if top toolbar`() {
         every { settings.shouldUseBottomToolbar } returns false
         every { settings.shouldUseFixedTopToolbar } returns true
 
@@ -128,7 +125,8 @@ class BaseBrowserFragmentTest {
     }
 
     @Test
-    fun `initializeEngineView should set toolbar height as EngineView parent's bottom margin if bottom toolbar is forced for a11y`() {
+    @Suppress("MaxLineLength")
+    fun `initializeEngineView set toolbar height as EngineView parent's bottom margin if bottom toolbar`() {
         every { settings.shouldUseBottomToolbar } returns true
         every { settings.shouldUseFixedTopToolbar } returns true
 
@@ -136,69 +134,6 @@ class BaseBrowserFragmentTest {
 
         verify { (swipeRefreshLayout.layoutParams as CoordinatorLayout.LayoutParams).bottomMargin = 13 }
     }
-
-    @Test
-    fun `WHEN status is equals to FAILED or COMPLETED and it is the same tab then shouldShowCompletedDownloadDialog will be true`() {
-        every { fragment.getCurrentTab() } returns createTab(id = "1", url = "")
-
-        val download = DownloadState(
-            url = "",
-            sessionId = "1",
-            destinationDirectory = "/",
-        )
-
-        val status = DownloadState.Status.values()
-            .filter { it == DownloadState.Status.COMPLETED && it == DownloadState.Status.FAILED }
-
-        status.forEach {
-            val result =
-                fragment.shouldShowCompletedDownloadDialog(download, it)
-
-            assertTrue(result)
-        }
-    }
-
-    @Test
-    fun `WHEN status is different from FAILED or COMPLETED then shouldShowCompletedDownloadDialog will be false`() {
-        every { fragment.getCurrentTab() } returns createTab(id = "1", url = "")
-
-        val download = DownloadState(
-            url = "",
-            sessionId = "1",
-            destinationDirectory = "/",
-        )
-
-        val status = DownloadState.Status.values()
-            .filter { it != DownloadState.Status.COMPLETED && it != DownloadState.Status.FAILED }
-
-        status.forEach {
-            val result =
-                fragment.shouldShowCompletedDownloadDialog(download, it)
-
-            assertFalse(result)
-        }
-    }
-
-    @Test
-    fun `WHEN the tab is different from the initial one then shouldShowCompletedDownloadDialog will be false`() {
-        every { fragment.getCurrentTab() } returns createTab(id = "1", url = "")
-
-        val download = DownloadState(
-            url = "",
-            sessionId = "2",
-            destinationDirectory = "/",
-        )
-
-        val status = DownloadState.Status.values()
-            .filter { it != DownloadState.Status.COMPLETED && it != DownloadState.Status.FAILED }
-
-        status.forEach {
-            val result =
-                fragment.shouldShowCompletedDownloadDialog(download, it)
-
-            assertFalse(result)
-        }
-    }
 }
 
 private class TestBaseBrowserFragment : BaseBrowserFragment() {
diff --git a/app/src/test/java/org/mozilla/fenix/browser/DownloadDialogUtilsTest.kt b/app/src/test/java/org/mozilla/fenix/browser/DownloadDialogUtilsTest.kt
new file mode 100644
index 000000000..fbd3d013e
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/browser/DownloadDialogUtilsTest.kt
@@ -0,0 +1,173 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.browser
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import mozilla.components.browser.state.state.content.DownloadState
+import mozilla.components.browser.state.state.content.DownloadState.Status.COMPLETED
+import mozilla.components.browser.state.state.content.DownloadState.Status.FAILED
+import mozilla.components.browser.state.state.createTab
+import mozilla.components.support.test.robolectric.testContext
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class DownloadDialogUtilsTest {
+
+    @Test
+    @Suppress("MaxLineLength")
+    fun `GIVEN final status WHEN handleOnDownloadFinished try to open the file fails THEN show error message`() {
+        val downloadUtils = DownloadDialogUtils
+        val currentTab = createTab(id = "1", url = "")
+        val download = DownloadState(
+            url = "",
+            sessionId = currentTab.id,
+            destinationDirectory = "/",
+            openInApp = true,
+        )
+        var dialogWasShown = false
+        var onCannotOpenFileWasCalled = false
+
+        downloadUtils.openFile = { _, _ -> false }
+
+        downloadUtils.handleOnDownloadFinished(
+            context = testContext,
+            downloadState = download,
+            downloadJobStatus = COMPLETED,
+            currentTab = currentTab,
+            onFinishedDialogShown = { dialogWasShown = true },
+            onCannotOpenFile = {
+                onCannotOpenFileWasCalled = true
+            },
+        )
+
+        assertTrue(onCannotOpenFileWasCalled)
+        assertFalse(dialogWasShown)
+    }
+
+    @Test
+    fun `GIVEN final status and openInApp WHEN calling handleOnDownloadFinished THEN try to open the file`() {
+        val downloadUtils = DownloadDialogUtils
+        val download = DownloadState(
+            url = "",
+            sessionId = "1",
+            destinationDirectory = "/",
+            openInApp = true,
+        )
+        val currentTab = createTab(id = "1", url = "")
+        var dialogWasShown = false
+        var onCannotOpenFileWasCalled = false
+
+        downloadUtils.openFile = { _, _ -> true }
+
+        downloadUtils.handleOnDownloadFinished(
+            context = testContext,
+            downloadState = download,
+            downloadJobStatus = COMPLETED,
+            currentTab = currentTab,
+            onFinishedDialogShown = { dialogWasShown = true },
+            onCannotOpenFile = {
+                onCannotOpenFileWasCalled = true
+            },
+        )
+
+        assertFalse(onCannotOpenFileWasCalled)
+        assertFalse(dialogWasShown)
+    }
+
+    @Test
+    fun `GIVEN final status WHEN calling handleOnDownloadFinished THEN show a finished download dialog`() {
+        val downloadUtils = DownloadDialogUtils
+        val download = DownloadState(
+            url = "",
+            sessionId = "1",
+            destinationDirectory = "/",
+        )
+        val currentTab = createTab(id = "1", url = "")
+        var dialogWasShown = false
+
+        downloadUtils.handleOnDownloadFinished(
+            context = testContext,
+            downloadState = download,
+            downloadJobStatus = COMPLETED,
+            currentTab = currentTab,
+            onFinishedDialogShown = { dialogWasShown = true },
+            onCannotOpenFile = {},
+        )
+
+        assertTrue(dialogWasShown)
+    }
+
+    @Test
+    fun `WHEN status is final and is same tab THEN shouldShowCompletedDownloadDialog will be true`() {
+        val currentTab = createTab(id = "1", url = "")
+
+        val download = DownloadState(
+            url = "",
+            sessionId = "1",
+            destinationDirectory = "/",
+        )
+
+        val status = DownloadState.Status.values().filter { it == COMPLETED || it == FAILED }
+
+        status.forEach {
+            val result = DownloadDialogUtils.shouldShowCompletedDownloadDialog(
+                downloadState = download,
+                status = it,
+                currentTab = currentTab,
+            )
+
+            assertTrue(result)
+        }
+    }
+
+    @Test
+    fun `WHEN status is different from FAILED or COMPLETED then shouldShowCompletedDownloadDialog will be false`() {
+        val currentTab = createTab(id = "1", url = "")
+
+        val download = DownloadState(
+            url = "",
+            sessionId = "1",
+            destinationDirectory = "/",
+        )
+
+        val completedStatus = listOf(COMPLETED, FAILED)
+        val status = DownloadState.Status.values().filter { it !in completedStatus }
+
+        status.forEach {
+            val result = DownloadDialogUtils.shouldShowCompletedDownloadDialog(
+                downloadState = download,
+                status = it,
+                currentTab = currentTab,
+            )
+
+            assertFalse(result)
+        }
+    }
+
+    @Test
+    fun `WHEN the tab is different from the initial one then shouldShowCompletedDownloadDialog will be false`() {
+        val currentTab = createTab(id = "1", url = "")
+
+        val download = DownloadState(
+            url = "",
+            sessionId = "2",
+            destinationDirectory = "/",
+        )
+        val completedStatus = listOf(COMPLETED, FAILED)
+        val status = DownloadState.Status.values().filter { it !in completedStatus }
+        status.forEach {
+            val result =
+                DownloadDialogUtils.shouldShowCompletedDownloadDialog(
+                    downloadState = download,
+                    status = it,
+                    currentTab = currentTab,
+                )
+            assertFalse(result)
+        }
+    }
+}

From 03e0894b086df628a7dfa6950b56c65e49bb71dd Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Mon, 29 Jan 2024 17:23:02 -0500
Subject: [PATCH 053/222] Revert "Bug 1876419 - Update ktlint-baseline for all
 projects"

This reverts commit 1c653a5f9703565ef03e1d5beb0d43ff575228f3.
---
 ktlint-baseline.xml | 2623 +------------------------------------------
 1 file changed, 3 insertions(+), 2620 deletions(-)

diff --git a/ktlint-baseline.xml b/ktlint-baseline.xml
index 2905d3cc8..b033ff3cc 100644
--- a/ktlint-baseline.xml
+++ b/ktlint-baseline.xml
@@ -2,2626 +2,9 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <baseline version="1.0">
-    <file name="app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt">
-        <error line="65" column="1" source="standard:max-line-length" />
-        <error line="84" column="1" source="standard:max-line-length" />
-        <error line="190" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/helpers/DataGenerationHelper.kt">
-        <error line="61" column="1" source="standard:max-line-length" />
-        <error line="61" column="119" source="standard:argument-list-wrapping" />
-        <error line="61" column="123" source="standard:argument-list-wrapping" />
-        <error line="61" column="131" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/helpers/RecyclerViewIdlingResource.kt">
-        <error line="10" column="1" source="standard:max-line-length" />
-        <error line="10" column="46" source="standard:parameter-list-wrapping" />
-        <error line="10" column="111" source="standard:parameter-list-wrapping" />
-        <error line="10" column="136" source="standard:parameter-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt">
-        <error line="47" column="1" source="standard:max-line-length" />
-        <error line="63" column="1" source="standard:max-line-length" />
-        <error line="126" column="1" source="standard:max-line-length" />
-        <error line="142" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt">
-        <error line="118" column="1" source="standard:max-line-length" />
-        <error line="118" column="20" source="standard:argument-list-wrapping" />
-        <error line="118" column="74" source="standard:argument-list-wrapping" />
-        <error line="118" column="121" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt">
-        <error line="686" column="1" source="standard:max-line-length" />
-        <error line="686" column="49" source="standard:argument-list-wrapping" />
-        <error line="686" column="67" source="standard:argument-list-wrapping" />
-        <error line="686" column="96" source="standard:argument-list-wrapping" />
-        <error line="686" column="127" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/ComposeBookmarksTest.kt">
-        <error line="669" column="1" source="standard:max-line-length" />
-        <error line="669" column="49" source="standard:argument-list-wrapping" />
-        <error line="669" column="67" source="standard:argument-list-wrapping" />
-        <error line="669" column="96" source="standard:argument-list-wrapping" />
-        <error line="669" column="127" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHistoryTest.kt">
-        <error line="381" column="1" source="standard:max-line-length" />
-        <error line="381" column="49" source="standard:argument-list-wrapping" />
-        <error line="381" column="67" source="standard:argument-list-wrapping" />
-        <error line="381" column="96" source="standard:argument-list-wrapping" />
-        <error line="381" column="127" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSearchTest.kt">
-        <error line="396" column="1" source="standard:max-line-length" />
-        <error line="396" column="55" source="standard:argument-list-wrapping" />
-        <error line="396" column="82" source="standard:argument-list-wrapping" />
-        <error line="396" column="108" source="standard:argument-list-wrapping" />
-        <error line="396" column="121" source="standard:argument-list-wrapping" />
-        <error line="442" column="1" source="standard:max-line-length" />
-        <error line="442" column="55" source="standard:argument-list-wrapping" />
-        <error line="442" column="82" source="standard:argument-list-wrapping" />
-        <error line="442" column="108" source="standard:argument-list-wrapping" />
-        <error line="442" column="121" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/FirefoxSuggestTest.kt">
-        <error line="44" column="1" source="standard:max-line-length" />
-        <error line="53" column="1" source="standard:max-line-length" />
-        <error line="57" column="1" source="standard:max-line-length" />
-        <error line="61" column="1" source="standard:max-line-length" />
-        <error line="65" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt">
-        <error line="411" column="1" source="standard:max-line-length" />
-        <error line="411" column="55" source="standard:argument-list-wrapping" />
-        <error line="411" column="82" source="standard:argument-list-wrapping" />
-        <error line="411" column="108" source="standard:argument-list-wrapping" />
-        <error line="411" column="121" source="standard:argument-list-wrapping" />
-        <error line="457" column="1" source="standard:max-line-length" />
-        <error line="457" column="55" source="standard:argument-list-wrapping" />
-        <error line="457" column="82" source="standard:argument-list-wrapping" />
-        <error line="457" column="108" source="standard:argument-list-wrapping" />
-        <error line="457" column="121" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHTTPSOnlyModeTest.kt">
-        <error line="26" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt">
-        <error line="281" column="1" source="standard:max-line-length" />
-        <error line="290" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/AccountSettingsRobot.kt">
-        <error line="66" column="1" source="standard:max-line-length" />
-        <error line="66" column="59" source="standard:argument-list-wrapping" />
-        <error line="66" column="82" source="standard:argument-list-wrapping" />
-        <error line="66" column="119" source="standard:argument-list-wrapping" />
-        <error line="66" column="150" source="standard:argument-list-wrapping" />
-        <error line="66" column="151" source="standard:argument-list-wrapping" />
-        <error line="66" column="152" source="standard:argument-list-wrapping" />
-        <error line="67" column="1" source="standard:max-line-length" />
-        <error line="67" column="53" source="standard:argument-list-wrapping" />
-        <error line="67" column="76" source="standard:argument-list-wrapping" />
-        <error line="67" column="113" source="standard:argument-list-wrapping" />
-        <error line="67" column="144" source="standard:argument-list-wrapping" />
-        <error line="67" column="145" source="standard:argument-list-wrapping" />
-        <error line="67" column="146" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt">
-        <error line="34" column="1" source="standard:max-line-length" />
-        <error line="34" column="15" source="standard:argument-list-wrapping" />
-        <error line="34" column="20" source="standard:argument-list-wrapping" />
-        <error line="34" column="146" source="standard:argument-list-wrapping" />
-        <error line="39" column="1" source="standard:max-line-length" />
-        <error line="39" column="15" source="standard:argument-list-wrapping" />
-        <error line="39" column="20" source="standard:argument-list-wrapping" />
-        <error line="39" column="142" source="standard:argument-list-wrapping" />
-        <error line="44" column="1" source="standard:max-line-length" />
-        <error line="44" column="15" source="standard:argument-list-wrapping" />
-        <error line="44" column="20" source="standard:argument-list-wrapping" />
-        <error line="44" column="131" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt">
-        <error line="213" column="1" source="standard:max-line-length" />
-        <error line="213" column="15" source="standard:argument-list-wrapping" />
-        <error line="213" column="20" source="standard:argument-list-wrapping" />
-        <error line="213" column="147" source="standard:argument-list-wrapping" />
-        <error line="266" column="1" source="standard:max-line-length" />
-        <error line="266" column="15" source="standard:argument-list-wrapping" />
-        <error line="266" column="20" source="standard:argument-list-wrapping" />
-        <error line="266" column="129" source="standard:argument-list-wrapping" />
-        <error line="309" column="1" source="standard:max-line-length" />
-        <error line="309" column="111" source="standard:argument-list-wrapping" />
-        <error line="309" column="122" source="standard:argument-list-wrapping" />
-        <error line="357" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt">
-        <error line="481" column="1" source="standard:max-line-length" />
-        <error line="481" column="38" source="standard:argument-list-wrapping" />
-        <error line="481" column="65" source="standard:argument-list-wrapping" />
-        <error line="481" column="90" source="standard:argument-list-wrapping" />
-        <error line="481" column="123" source="standard:argument-list-wrapping" />
-        <error line="483" column="1" source="standard:max-line-length" />
-        <error line="483" column="38" source="standard:argument-list-wrapping" />
-        <error line="483" column="65" source="standard:argument-list-wrapping" />
-        <error line="483" column="90" source="standard:argument-list-wrapping" />
-        <error line="483" column="123" source="standard:argument-list-wrapping" />
-        <error line="559" column="1" source="standard:max-line-length" />
-        <error line="559" column="19" source="standard:argument-list-wrapping" />
-        <error line="559" column="24" source="standard:argument-list-wrapping" />
-        <error line="559" column="127" source="standard:argument-list-wrapping" />
-        <error line="561" column="1" source="standard:max-line-length" />
-        <error line="561" column="19" source="standard:argument-list-wrapping" />
-        <error line="561" column="24" source="standard:argument-list-wrapping" />
-        <error line="561" column="126" source="standard:argument-list-wrapping" />
-        <error line="564" column="1" source="standard:max-line-length" />
-        <error line="564" column="19" source="standard:argument-list-wrapping" />
-        <error line="564" column="24" source="standard:argument-list-wrapping" />
-        <error line="564" column="121" source="standard:argument-list-wrapping" />
-        <error line="566" column="1" source="standard:max-line-length" />
-        <error line="566" column="19" source="standard:argument-list-wrapping" />
-        <error line="566" column="24" source="standard:argument-list-wrapping" />
-        <error line="566" column="129" source="standard:argument-list-wrapping" />
-        <error line="568" column="1" source="standard:max-line-length" />
-        <error line="568" column="19" source="standard:argument-list-wrapping" />
-        <error line="568" column="24" source="standard:argument-list-wrapping" />
-        <error line="568" column="128" source="standard:argument-list-wrapping" />
-        <error line="760" column="1" source="standard:max-line-length" />
-        <error line="760" column="23" source="standard:argument-list-wrapping" />
-        <error line="760" column="28" source="standard:argument-list-wrapping" />
-        <error line="760" column="128" source="standard:argument-list-wrapping" />
-        <error line="834" column="1" source="standard:max-line-length" />
-        <error line="834" column="53" source="standard:argument-list-wrapping" />
-        <error line="834" column="72" source="standard:argument-list-wrapping" />
-        <error line="834" column="90" source="standard:argument-list-wrapping" />
-        <error line="834" column="122" source="standard:argument-list-wrapping" />
-        <error line="834" column="123" source="standard:argument-list-wrapping" />
-        <error line="834" column="124" source="standard:argument-list-wrapping" />
-        <error line="897" column="1" source="standard:max-line-length" />
-        <error line="1002" column="1" source="standard:max-line-length" />
-        <error line="1002" column="34" source="standard:parameter-list-wrapping" />
-        <error line="1002" column="80" source="standard:parameter-list-wrapping" />
-        <error line="1002" column="122" source="standard:parameter-list-wrapping" />
-        <error line="1063" column="1" source="standard:max-line-length" />
-        <error line="1063" column="47" source="standard:parameter-list-wrapping" />
-        <error line="1063" column="93" source="standard:parameter-list-wrapping" />
-        <error line="1063" column="134" source="standard:parameter-list-wrapping" />
-        <error line="1066" column="1" source="standard:max-line-length" />
-        <error line="1066" column="19" source="standard:argument-list-wrapping" />
-        <error line="1066" column="24" source="standard:argument-list-wrapping" />
-        <error line="1066" column="123" source="standard:argument-list-wrapping" />
-        <error line="1150" column="1" source="standard:max-line-length" />
-        <error line="1158" column="1" source="standard:max-line-length" />
-        <error line="1166" column="1" source="standard:max-line-length" />
-        <error line="1184" column="1" source="standard:max-line-length" />
-        <error line="1193" column="1" source="standard:max-line-length" />
-        <error line="1207" column="1" source="standard:max-line-length" />
-        <error line="1207" column="19" source="standard:argument-list-wrapping" />
-        <error line="1207" column="24" source="standard:argument-list-wrapping" />
-        <error line="1207" column="125" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt">
-        <error line="168" column="1" source="standard:max-line-length" />
-        <error line="168" column="34" source="standard:argument-list-wrapping" />
-        <error line="168" column="111" source="standard:argument-list-wrapping" />
-        <error line="168" column="125" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt">
-        <error line="462" column="1" source="standard:max-line-length" />
-        <error line="470" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt">
-        <error line="233" column="1" source="standard:max-line-length" />
-        <error line="233" column="19" source="standard:argument-list-wrapping" />
-        <error line="233" column="24" source="standard:argument-list-wrapping" />
-        <error line="233" column="134" source="standard:argument-list-wrapping" />
-        <error line="241" column="1" source="standard:max-line-length" />
-        <error line="241" column="19" source="standard:argument-list-wrapping" />
-        <error line="241" column="24" source="standard:argument-list-wrapping" />
-        <error line="241" column="138" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt">
-        <error line="181" column="1" source="standard:max-line-length" />
-        <error line="188" column="1" source="standard:max-line-length" />
-        <error line="207" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt">
-        <error line="47" column="1" source="standard:max-line-length" />
-        <error line="47" column="29" source="standard:argument-list-wrapping" />
-        <error line="47" column="110" source="standard:argument-list-wrapping" />
-        <error line="47" column="121" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt">
-        <error line="305" column="1" source="standard:max-line-length" />
-        <error line="305" column="34" source="standard:argument-list-wrapping" />
-        <error line="305" column="107" source="standard:argument-list-wrapping" />
-        <error line="305" column="121" source="standard:argument-list-wrapping" />
-        <error line="350" column="1" source="standard:max-line-length" />
-        <error line="350" column="34" source="standard:argument-list-wrapping" />
-        <error line="350" column="116" source="standard:argument-list-wrapping" />
-        <error line="350" column="130" source="standard:argument-list-wrapping" />
-        <error line="453" column="1" source="standard:max-line-length" />
-        <error line="453" column="34" source="standard:parameter-list-wrapping" />
-        <error line="453" column="80" source="standard:parameter-list-wrapping" />
-        <error line="453" column="122" source="standard:parameter-list-wrapping" />
-        <error line="518" column="1" source="standard:max-line-length" />
-        <error line="561" column="1" source="standard:max-line-length" />
-        <error line="563" column="1" source="standard:max-line-length" />
-        <error line="563" column="19" source="standard:argument-list-wrapping" />
-        <error line="563" column="24" source="standard:argument-list-wrapping" />
-        <error line="563" column="142" source="standard:argument-list-wrapping" />
-        <error line="581" column="1" source="standard:max-line-length" />
-        <error line="636" column="1" source="standard:max-line-length" />
-        <error line="637" column="1" source="standard:max-line-length" />
-        <error line="637" column="19" source="standard:argument-list-wrapping" />
-        <error line="637" column="24" source="standard:argument-list-wrapping" />
-        <error line="637" column="122" source="standard:argument-list-wrapping" />
-        <error line="640" column="1" source="standard:max-line-length" />
-        <error line="640" column="19" source="standard:argument-list-wrapping" />
-        <error line="640" column="24" source="standard:argument-list-wrapping" />
-        <error line="640" column="163" source="standard:argument-list-wrapping" />
-        <error line="666" column="1" source="standard:max-line-length" />
-        <error line="666" column="45" source="standard:parameter-list-wrapping" />
-        <error line="666" column="91" source="standard:parameter-list-wrapping" />
-        <error line="666" column="133" source="standard:parameter-list-wrapping" />
-        <error line="683" column="1" source="standard:max-line-length" />
-        <error line="693" column="1" source="standard:max-line-length" />
-        <error line="717" column="1" source="standard:max-line-length" />
-        <error line="717" column="42" source="standard:parameter-list-wrapping" />
-        <error line="717" column="88" source="standard:parameter-list-wrapping" />
-        <error line="717" column="130" source="standard:parameter-list-wrapping" />
-        <error line="728" column="1" source="standard:max-line-length" />
-        <error line="740" column="1" source="standard:max-line-length" />
-        <error line="769" column="1" source="standard:max-line-length" />
-        <error line="807" column="1" source="standard:max-line-length" />
-        <error line="807" column="35" source="standard:parameter-list-wrapping" />
-        <error line="807" column="81" source="standard:parameter-list-wrapping" />
-        <error line="807" column="122" source="standard:parameter-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt">
-        <error line="116" column="1" source="standard:max-line-length" />
-        <error line="135" column="1" source="standard:max-line-length" />
-        <error line="135" column="33" source="standard:parameter-list-wrapping" />
-        <error line="135" column="79" source="standard:parameter-list-wrapping" />
-        <error line="135" column="121" source="standard:parameter-list-wrapping" />
-        <error line="144" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt">
-        <error line="211" column="1" source="standard:max-line-length" />
-        <error line="211" column="34" source="standard:parameter-list-wrapping" />
-        <error line="211" column="80" source="standard:parameter-list-wrapping" />
-        <error line="211" column="122" source="standard:parameter-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt">
-        <error line="69" column="1" source="standard:max-line-length" />
-        <error line="69" column="15" source="standard:argument-list-wrapping" />
-        <error line="69" column="20" source="standard:argument-list-wrapping" />
-        <error line="69" column="122" source="standard:argument-list-wrapping" />
-        <error line="88" column="1" source="standard:max-line-length" />
-        <error line="88" column="23" source="standard:argument-list-wrapping" />
-        <error line="88" column="28" source="standard:argument-list-wrapping" />
-        <error line="88" column="161" source="standard:argument-list-wrapping" />
-        <error line="200" column="1" source="standard:max-line-length" />
-        <error line="200" column="15" source="standard:argument-list-wrapping" />
-        <error line="200" column="20" source="standard:argument-list-wrapping" />
-        <error line="200" column="136" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt">
-        <error line="89" column="1" source="standard:max-line-length" />
-        <error line="96" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt">
-        <error line="348" column="1" source="standard:max-line-length" />
-        <error line="355" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt">
-        <error line="247" column="1" source="standard:max-line-length" />
-        <error line="264" column="1" source="standard:max-line-length" />
-        <error line="283" column="1" source="standard:max-line-length" />
-        <error line="291" column="1" source="standard:max-line-length" />
-        <error line="304" column="1" source="standard:max-line-length" />
-        <error line="334" column="1" source="standard:max-line-length" />
-        <error line="343" column="1" source="standard:max-line-length" />
-        <error line="353" column="1" source="standard:max-line-length" />
-        <error line="370" column="1" source="standard:max-line-length" />
-        <error line="379" column="1" source="standard:max-line-length" />
-        <error line="388" column="1" source="standard:max-line-length" />
-        <error line="397" column="1" source="standard:max-line-length" />
-        <error line="397" column="57" source="standard:parameter-list-wrapping" />
-        <error line="397" column="122" source="standard:parameter-list-wrapping" />
-        <error line="415" column="1" source="standard:max-line-length" />
-        <error line="424" column="1" source="standard:max-line-length" />
-        <error line="431" column="1" source="standard:max-line-length" />
-        <error line="438" column="1" source="standard:max-line-length" />
-        <error line="450" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt">
-        <error line="215" column="1" source="standard:max-line-length" />
-        <error line="215" column="50" source="standard:argument-list-wrapping" />
-        <error line="215" column="58" source="standard:argument-list-wrapping" />
-        <error line="215" column="72" source="standard:argument-list-wrapping" />
-        <error line="215" column="81" source="standard:argument-list-wrapping" />
-        <error line="215" column="96" source="standard:argument-list-wrapping" />
-        <error line="215" column="122" source="standard:argument-list-wrapping" />
-        <error line="215" column="123" source="standard:argument-list-wrapping" />
-        <error line="215" column="124" source="standard:argument-list-wrapping" />
-        <error line="215" column="125" source="standard:argument-list-wrapping" />
-        <error line="215" column="126" source="standard:argument-list-wrapping" />
-        <error line="261" column="1" source="standard:max-line-length" />
-        <error line="261" column="42" source="standard:argument-list-wrapping" />
-        <error line="261" column="189" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAccessibilityRobot.kt">
-        <error line="108" column="1" source="standard:max-line-length" />
-        <error line="108" column="16" source="standard:argument-list-wrapping" />
-        <error line="108" column="24" source="standard:argument-list-wrapping" />
-        <error line="108" column="33" source="standard:argument-list-wrapping" />
-        <error line="108" column="153" source="standard:argument-list-wrapping" />
-        <error line="108" column="154" source="standard:argument-list-wrapping" />
-        <error line="108" column="155" source="standard:argument-list-wrapping" />
-        <error line="179" column="1" source="standard:max-line-length" />
-        <error line="179" column="83" source="standard:argument-list-wrapping" />
-        <error line="179" column="194" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerAddonDetailedMenuRobot.kt">
-        <error line="30" column="1" source="standard:max-line-length" />
-        <error line="38" column="1" source="standard:max-line-length" />
-        <error line="38" column="25" source="standard:parameter-list-wrapping" />
-        <error line="38" column="75" source="standard:parameter-list-wrapping" />
-        <error line="38" column="129" source="standard:parameter-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt">
-        <error line="261" column="1" source="standard:max-line-length" />
-        <error line="261" column="39" source="standard:argument-list-wrapping" />
-        <error line="261" column="48" source="standard:argument-list-wrapping" />
-        <error line="261" column="126" source="standard:argument-list-wrapping" />
-        <error line="261" column="127" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt">
-        <error line="444" column="1" source="standard:max-line-length" />
-        <error line="444" column="30" source="standard:argument-list-wrapping" />
-        <error line="444" column="49" source="standard:argument-list-wrapping" />
-        <error line="444" column="121" source="standard:argument-list-wrapping" />
-        <error line="444" column="122" source="standard:argument-list-wrapping" />
-        <error line="447" column="1" source="standard:max-line-length" />
-        <error line="447" column="30" source="standard:argument-list-wrapping" />
-        <error line="447" column="49" source="standard:argument-list-wrapping" />
-        <error line="447" column="67" source="standard:argument-list-wrapping" />
-        <error line="447" column="126" source="standard:argument-list-wrapping" />
-        <error line="447" column="127" source="standard:argument-list-wrapping" />
-        <error line="447" column="128" source="standard:argument-list-wrapping" />
-        <error line="457" column="1" source="standard:max-line-length" />
-        <error line="465" column="1" source="standard:max-line-length" />
-        <error line="496" column="1" source="standard:max-line-length" />
-        <error line="496" column="45" source="standard:property-wrapping" />
-        <error line="496" column="65" source="standard:argument-list-wrapping" />
-        <error line="496" column="83" source="standard:argument-list-wrapping" />
-        <error line="496" column="141" source="standard:argument-list-wrapping" />
-        <error line="496" column="142" source="standard:argument-list-wrapping" />
-        <error line="497" column="1" source="standard:max-line-length" />
-        <error line="497" column="46" source="standard:property-wrapping" />
-        <error line="497" column="66" source="standard:argument-list-wrapping" />
-        <error line="497" column="84" source="standard:argument-list-wrapping" />
-        <error line="497" column="150" source="standard:argument-list-wrapping" />
-        <error line="497" column="151" source="standard:argument-list-wrapping" />
-        <error line="527" column="1" source="standard:max-line-length" />
-        <error line="527" column="47" source="standard:property-wrapping" />
-        <error line="527" column="67" source="standard:argument-list-wrapping" />
-        <error line="527" column="85" source="standard:argument-list-wrapping" />
-        <error line="527" column="142" source="standard:argument-list-wrapping" />
-        <error line="527" column="143" source="standard:argument-list-wrapping" />
-        <error line="528" column="1" source="standard:max-line-length" />
-        <error line="528" column="48" source="standard:property-wrapping" />
-        <error line="528" column="68" source="standard:argument-list-wrapping" />
-        <error line="528" column="86" source="standard:argument-list-wrapping" />
-        <error line="528" column="151" source="standard:argument-list-wrapping" />
-        <error line="528" column="152" source="standard:argument-list-wrapping" />
-        <error line="529" column="1" source="standard:max-line-length" />
-        <error line="529" column="49" source="standard:property-wrapping" />
-        <error line="529" column="69" source="standard:argument-list-wrapping" />
-        <error line="529" column="87" source="standard:argument-list-wrapping" />
-        <error line="529" column="146" source="standard:argument-list-wrapping" />
-        <error line="529" column="147" source="standard:argument-list-wrapping" />
-        <error line="530" column="1" source="standard:max-line-length" />
-        <error line="530" column="54" source="standard:argument-list-wrapping" />
-        <error line="530" column="80" source="standard:argument-list-wrapping" />
-        <error line="530" column="98" source="standard:argument-list-wrapping" />
-        <error line="530" column="147" source="standard:argument-list-wrapping" />
-        <error line="530" column="148" source="standard:argument-list-wrapping" />
-        <error line="530" column="149" source="standard:argument-list-wrapping" />
-        <error line="533" column="1" source="standard:max-line-length" />
-        <error line="533" column="63" source="standard:argument-list-wrapping" />
-        <error line="533" column="89" source="standard:argument-list-wrapping" />
-        <error line="533" column="107" source="standard:argument-list-wrapping" />
-        <error line="533" column="159" source="standard:argument-list-wrapping" />
-        <error line="533" column="160" source="standard:argument-list-wrapping" />
-        <error line="533" column="161" source="standard:argument-list-wrapping" />
-        <error line="535" column="1" source="standard:max-line-length" />
-        <error line="535" column="60" source="standard:argument-list-wrapping" />
-        <error line="535" column="121" source="standard:argument-list-wrapping" />
-        <error line="539" column="1" source="standard:max-line-length" />
-        <error line="539" column="64" source="standard:argument-list-wrapping" />
-        <error line="539" column="88" source="standard:argument-list-wrapping" />
-        <error line="539" column="131" source="standard:argument-list-wrapping" />
-        <error line="539" column="132" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt">
-        <error line="113" column="1" source="standard:max-line-length" />
-        <error line="113" column="41" source="standard:property-wrapping" />
-        <error line="113" column="49" source="standard:argument-list-wrapping" />
-        <error line="113" column="58" source="standard:argument-list-wrapping" />
-        <error line="113" column="121" source="standard:argument-list-wrapping" />
-        <error line="113" column="122" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt">
-        <error line="161" column="1" source="standard:max-line-length" />
-        <error line="161" column="80" source="standard:argument-list-wrapping" />
-        <error line="161" column="106" source="standard:argument-list-wrapping" />
-        <error line="161" column="128" source="standard:argument-list-wrapping" />
-        <error line="161" column="129" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionExceptionsRobot.kt">
-        <error line="55" column="1" source="standard:max-line-length" />
-        <error line="62" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt">
-        <error line="138" column="1" source="standard:max-line-length" />
-        <error line="138" column="16" source="standard:argument-list-wrapping" />
-        <error line="138" column="25" source="standard:argument-list-wrapping" />
-        <error line="138" column="152" source="standard:argument-list-wrapping" />
-        <error line="138" column="153" source="standard:argument-list-wrapping" />
-        <error line="138" column="161" source="standard:argument-list-wrapping" />
-        <error line="138" column="169" source="standard:argument-list-wrapping" />
-        <error line="138" column="182" source="standard:argument-list-wrapping" />
-        <error line="138" column="183" source="standard:argument-list-wrapping" />
-        <error line="146" column="1" source="standard:max-line-length" />
-        <error line="146" column="16" source="standard:argument-list-wrapping" />
-        <error line="146" column="25" source="standard:argument-list-wrapping" />
-        <error line="146" column="152" source="standard:argument-list-wrapping" />
-        <error line="146" column="153" source="standard:argument-list-wrapping" />
-        <error line="146" column="161" source="standard:argument-list-wrapping" />
-        <error line="146" column="169" source="standard:argument-list-wrapping" />
-        <error line="146" column="182" source="standard:argument-list-wrapping" />
-        <error line="146" column="183" source="standard:argument-list-wrapping" />
-        <error line="244" column="1" source="standard:max-line-length" />
-        <error line="271" column="1" source="standard:max-line-length" />
-        <error line="271" column="117" source="standard:argument-list-wrapping" />
-        <error line="271" column="125" source="standard:argument-list-wrapping" />
-        <error line="271" column="138" source="standard:argument-list-wrapping" />
-        <error line="271" column="139" source="standard:argument-list-wrapping" />
-        <error line="273" column="1" source="standard:max-line-length" />
-        <error line="273" column="12" source="standard:argument-list-wrapping" />
-        <error line="273" column="21" source="standard:argument-list-wrapping" />
-        <error line="273" column="157" source="standard:argument-list-wrapping" />
-        <error line="273" column="158" source="standard:argument-list-wrapping" />
-        <error line="273" column="166" source="standard:argument-list-wrapping" />
-        <error line="273" column="174" source="standard:argument-list-wrapping" />
-        <error line="273" column="187" source="standard:argument-list-wrapping" />
-        <error line="273" column="188" source="standard:argument-list-wrapping" />
-        <error line="275" column="1" source="standard:max-line-length" />
-        <error line="275" column="114" source="standard:argument-list-wrapping" />
-        <error line="275" column="122" source="standard:argument-list-wrapping" />
-        <error line="275" column="135" source="standard:argument-list-wrapping" />
-        <error line="275" column="136" source="standard:argument-list-wrapping" />
-        <error line="277" column="1" source="standard:max-line-length" />
-        <error line="277" column="12" source="standard:argument-list-wrapping" />
-        <error line="277" column="21" source="standard:argument-list-wrapping" />
-        <error line="277" column="134" source="standard:argument-list-wrapping" />
-        <error line="277" column="135" source="standard:argument-list-wrapping" />
-        <error line="277" column="143" source="standard:argument-list-wrapping" />
-        <error line="277" column="151" source="standard:argument-list-wrapping" />
-        <error line="277" column="164" source="standard:argument-list-wrapping" />
-        <error line="277" column="165" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuHttpsOnlyModeRobot.kt">
-        <error line="38" column="1" source="standard:max-line-length" />
-        <error line="38" column="20" source="standard:argument-list-wrapping" />
-        <error line="38" column="28" source="standard:argument-list-wrapping" />
-        <error line="38" column="37" source="standard:argument-list-wrapping" />
-        <error line="38" column="148" source="standard:argument-list-wrapping" />
-        <error line="38" column="149" source="standard:argument-list-wrapping" />
-        <error line="38" column="150" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordOptionsToSaveRobot.kt">
-        <error line="76" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordRobot.kt">
-        <error line="104" column="1" source="standard:max-line-length" />
-        <error line="111" column="1" source="standard:max-line-length" />
-        <error line="125" column="1" source="standard:max-line-length" />
-        <error line="134" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordsSavedLoginsRobot.kt">
-        <error line="194" column="1" source="standard:max-line-length" />
-        <error line="201" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSitePermissionsCommonRobot.kt">
-        <error line="37" column="1" source="standard:max-line-length" />
-        <error line="184" column="1" source="standard:max-line-length" />
-        <error line="241" column="1" source="standard:max-line-length" />
-        <error line="241" column="26" source="standard:argument-list-wrapping" />
-        <error line="241" column="108" source="standard:argument-list-wrapping" />
-        <error line="241" column="122" source="standard:argument-list-wrapping" />
-        <error line="244" column="1" source="standard:max-line-length" />
-        <error line="244" column="62" source="standard:argument-list-wrapping" />
-        <error line="244" column="86" source="standard:argument-list-wrapping" />
-        <error line="244" column="133" source="standard:argument-list-wrapping" />
-        <error line="244" column="134" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSitePermissionsExceptionsRobot.kt">
-        <error line="111" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SitePermissionsRobot.kt">
-        <error line="140" column="1" source="standard:max-line-length" />
-        <error line="140" column="102" source="standard:argument-list-wrapping" />
-        <error line="140" column="110" source="standard:argument-list-wrapping" />
-        <error line="140" column="123" source="standard:argument-list-wrapping" />
-        <error line="140" column="124" source="standard:argument-list-wrapping" />
-        <error line="141" column="1" source="standard:max-line-length" />
-        <error line="141" column="128" source="standard:argument-list-wrapping" />
-        <error line="141" column="136" source="standard:argument-list-wrapping" />
-        <error line="141" column="149" source="standard:argument-list-wrapping" />
-        <error line="141" column="150" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/SiteSecurityRobot.kt">
-        <error line="29" column="1" source="standard:max-line-length" />
-        <error line="29" column="104" source="standard:argument-list-wrapping" />
-        <error line="29" column="109" source="standard:argument-list-wrapping" />
-        <error line="29" column="127" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuBookmarksRobot.kt">
-        <error line="49" column="1" source="standard:max-line-length" />
-        <error line="63" column="1" source="standard:max-line-length" />
-        <error line="63" column="35" source="standard:parameter-list-wrapping" />
-        <error line="63" column="81" source="standard:parameter-list-wrapping" />
-        <error line="63" column="123" source="standard:parameter-list-wrapping" />
-        <error line="77" column="1" source="standard:max-line-length" />
-        <error line="91" column="1" source="standard:max-line-length" />
-        <error line="91" column="39" source="standard:parameter-list-wrapping" />
-        <error line="91" column="85" source="standard:parameter-list-wrapping" />
-        <error line="91" column="127" source="standard:parameter-list-wrapping" />
-    </file>
-    <file name="app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt">
-        <error line="273" column="1" source="standard:max-line-length" />
-        <error line="446" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/main/java/org/mozilla/fenix/components/TrackingProtectionPolicyFactory.kt">
-        <error line="112" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/main/java/org/mozilla/fenix/debugsettings/store/DebugDrawerStore.kt">
-        <error line="26" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt">
-        <error line="771" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt">
-        <error line="62" column="1" source="standard:max-line-length" />
-        <error line="76" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/ServiceWorkerSupportTest.kt">
-        <error line="41" column="1" source="standard:max-line-length" />
-        <error line="48" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/addons/ExtensionsProcessDisabledBackgroundControllerTest.kt">
-        <error line="26" column="1" source="standard:max-line-length" />
-        <error line="49" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/addons/ExtensionsProcessDisabledForegroundControllerTest.kt">
-        <error line="38" column="1" source="standard:max-line-length" />
-        <error line="79" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragmentTest.kt">
-        <error line="56" column="1" source="standard:max-line-length" />
-        <error line="191" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt">
-        <error line="111" column="1" source="standard:max-line-length" />
-        <error line="121" column="1" source="standard:max-line-length" />
-        <error line="131" column="1" source="standard:max-line-length" />
-        <error line="141" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt">
-        <error line="220" column="1" source="standard:max-line-length" />
-        <error line="232" column="1" source="standard:max-line-length" />
-        <error line="256" column="1" source="standard:max-line-length" />
-        <error line="352" column="1" source="standard:max-line-length" />
-        <error line="401" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/browser/StandardSnackbarErrorBindingTest.kt">
-        <error line="112" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerTest.kt">
-        <error line="36" column="1" source="standard:max-line-length" />
-        <error line="36" column="20" source="standard:argument-list-wrapping" />
-        <error line="36" column="126" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt">
-        <error line="221" column="1" source="standard:max-line-length" />
-        <error line="227" column="1" source="standard:max-line-length" />
-        <error line="234" column="1" source="standard:max-line-length" />
-        <error line="243" column="1" source="standard:max-line-length" />
-        <error line="250" column="1" source="standard:max-line-length" />
-        <error line="259" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/AppStoreTest.kt">
-        <error line="258" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/FenixSnackbarBehaviorTest.kt">
-        <error line="52" column="1" source="standard:max-line-length" />
-        <error line="72" column="1" source="standard:max-line-length" />
-        <error line="84" column="1" source="standard:max-line-length" />
-        <error line="96" column="1" source="standard:max-line-length" />
-        <error line="122" column="1" source="standard:max-line-length" />
-        <error line="148" column="1" source="standard:max-line-length" />
-        <error line="174" column="1" source="standard:max-line-length" />
-        <error line="197" column="1" source="standard:max-line-length" />
-        <error line="223" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/FindInPageIntegrationTest.kt">
-        <error line="26" column="1" source="standard:max-line-length" />
-        <error line="52" column="1" source="standard:max-line-length" />
-        <error line="78" column="1" source="standard:max-line-length" />
-        <error line="104" column="1" source="standard:max-line-length" />
-        <error line="130" column="1" source="standard:max-line-length" />
-        <error line="156" column="1" source="standard:max-line-length" />
-        <error line="182" column="1" source="standard:max-line-length" />
-        <error line="208" column="1" source="standard:max-line-length" />
-        <error line="245" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/PrivateShortcutCreateManagerTest.kt">
-        <error line="45" column="1" source="standard:max-line-length" />
-        <error line="63" column="1" source="standard:max-line-length" />
-        <error line="63" column="17" source="standard:wrapping" />
-        <error line="63" column="44" source="standard:argument-list-wrapping" />
-        <error line="63" column="57" source="standard:argument-list-wrapping" />
-        <error line="63" column="60" source="standard:argument-list-wrapping" />
-        <error line="63" column="77" source="standard:argument-list-wrapping" />
-        <error line="63" column="151" source="standard:argument-list-wrapping" />
-        <error line="70" column="1" source="standard:max-line-length" />
-        <error line="70" column="22" source="standard:argument-list-wrapping" />
-        <error line="70" column="116" source="standard:argument-list-wrapping" />
-        <error line="70" column="145" source="standard:argument-list-wrapping" />
-        <error line="71" column="1" source="standard:max-line-length" />
-        <error line="71" column="22" source="standard:argument-list-wrapping" />
-        <error line="71" column="116" source="standard:argument-list-wrapping" />
-        <error line="71" column="144" source="standard:argument-list-wrapping" />
-        <error line="81" column="1" source="standard:max-line-length" />
-        <error line="81" column="22" source="standard:argument-list-wrapping" />
-        <error line="81" column="83" source="standard:argument-list-wrapping" />
-        <error line="81" column="108" source="standard:argument-list-wrapping" />
-        <error line="81" column="135" source="standard:argument-list-wrapping" />
-        <error line="81" column="136" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/TrackingProtectionPolicyFactoryTest.kt">
-        <error line="183" column="1" source="standard:max-line-length" />
-        <error line="210" column="1" source="standard:max-line-length" />
-        <error line="237" column="1" source="standard:max-line-length" />
-        <error line="253" column="1" source="standard:max-line-length" />
-        <error line="269" column="1" source="standard:max-line-length" />
-        <error line="296" column="1" source="standard:max-line-length" />
-        <error line="323" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt">
-        <error line="33" column="1" source="standard:max-line-length" />
-        <error line="46" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/accounts/FenixAccountManagerTest.kt">
-        <error line="48" column="1" source="standard:max-line-length" />
-        <error line="62" column="1" source="standard:max-line-length" />
-        <error line="94" column="1" source="standard:max-line-length" />
-        <error line="106" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/appstate/AppStoreReducerTest.kt">
-        <error line="19" column="1" source="standard:max-line-length" />
-        <error line="63" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/history/PagedHistoryProviderTest.kt">
-        <error line="342" column="1" source="standard:max-line-length" />
-        <error line="342" column="34" source="standard:property-wrapping" />
-        <error line="342" column="54" source="standard:argument-list-wrapping" />
-        <error line="342" column="111" source="standard:argument-list-wrapping" />
-        <error line="342" column="122" source="standard:argument-list-wrapping" />
-        <error line="342" column="126" source="standard:argument-list-wrapping" />
-        <error line="393" column="1" source="standard:max-line-length" />
-        <error line="393" column="18" source="standard:wrapping" />
-        <error line="393" column="75" source="standard:argument-list-wrapping" />
-        <error line="393" column="90" source="standard:argument-list-wrapping" />
-        <error line="393" column="105" source="standard:argument-list-wrapping" />
-        <error line="393" column="120" source="standard:argument-list-wrapping" />
-        <error line="393" column="133" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/metrics/DefaultMetricsStorageTest.kt">
-        <error line="57" column="1" source="standard:max-line-length" />
-        <error line="57" column="41" source="standard:argument-list-wrapping" />
-        <error line="57" column="50" source="standard:argument-list-wrapping" />
-        <error line="57" column="60" source="standard:argument-list-wrapping" />
-        <error line="57" column="83" source="standard:argument-list-wrapping" />
-        <error line="57" column="106" source="standard:argument-list-wrapping" />
-        <error line="57" column="124" source="standard:argument-list-wrapping" />
-        <error line="57" column="134" source="standard:argument-list-wrapping" />
-        <error line="61" column="1" source="standard:max-line-length" />
-        <error line="61" column="113" source="standard:argument-list-wrapping" />
-        <error line="61" column="123" source="standard:argument-list-wrapping" />
-        <error line="72" column="1" source="standard:max-line-length" />
-        <error line="72" column="132" source="standard:argument-list-wrapping" />
-        <error line="72" column="142" source="standard:argument-list-wrapping" />
-        <error line="82" column="1" source="standard:max-line-length" />
-        <error line="82" column="124" source="standard:argument-list-wrapping" />
-        <error line="82" column="134" source="standard:argument-list-wrapping" />
-        <error line="92" column="1" source="standard:max-line-length" />
-        <error line="92" column="124" source="standard:argument-list-wrapping" />
-        <error line="92" column="134" source="standard:argument-list-wrapping" />
-        <error line="112" column="1" source="standard:max-line-length" />
-        <error line="112" column="147" source="standard:argument-list-wrapping" />
-        <error line="112" column="157" source="standard:argument-list-wrapping" />
-        <error line="124" column="1" source="standard:max-line-length" />
-        <error line="124" column="138" source="standard:argument-list-wrapping" />
-        <error line="124" column="148" source="standard:argument-list-wrapping" />
-        <error line="136" column="1" source="standard:max-line-length" />
-        <error line="136" column="150" source="standard:argument-list-wrapping" />
-        <error line="136" column="160" source="standard:argument-list-wrapping" />
-        <error line="140" column="1" source="standard:max-line-length" />
-        <error line="149" column="1" source="standard:max-line-length" />
-        <error line="149" column="168" source="standard:argument-list-wrapping" />
-        <error line="149" column="178" source="standard:argument-list-wrapping" />
-        <error line="163" column="1" source="standard:max-line-length" />
-        <error line="163" column="141" source="standard:argument-list-wrapping" />
-        <error line="163" column="151" source="standard:argument-list-wrapping" />
-        <error line="175" column="1" source="standard:max-line-length" />
-        <error line="175" column="129" source="standard:argument-list-wrapping" />
-        <error line="175" column="139" source="standard:argument-list-wrapping" />
-        <error line="199" column="1" source="standard:max-line-length" />
-        <error line="199" column="111" source="standard:argument-list-wrapping" />
-        <error line="199" column="121" source="standard:argument-list-wrapping" />
-        <error line="211" column="1" source="standard:max-line-length" />
-        <error line="211" column="117" source="standard:argument-list-wrapping" />
-        <error line="211" column="127" source="standard:argument-list-wrapping" />
-        <error line="223" column="1" source="standard:max-line-length" />
-        <error line="223" column="131" source="standard:argument-list-wrapping" />
-        <error line="223" column="141" source="standard:argument-list-wrapping" />
-        <error line="232" column="1" source="standard:max-line-length" />
-        <error line="232" column="123" source="standard:argument-list-wrapping" />
-        <error line="232" column="133" source="standard:argument-list-wrapping" />
-        <error line="241" column="1" source="standard:max-line-length" />
-        <error line="241" column="138" source="standard:argument-list-wrapping" />
-        <error line="241" column="148" source="standard:argument-list-wrapping" />
-        <error line="251" column="1" source="standard:max-line-length" />
-        <error line="251" column="130" source="standard:argument-list-wrapping" />
-        <error line="251" column="140" source="standard:argument-list-wrapping" />
-        <error line="261" column="1" source="standard:max-line-length" />
-        <error line="272" column="1" source="standard:max-line-length" />
-        <error line="324" column="1" source="standard:max-line-length" />
-        <error line="324" column="136" source="standard:argument-list-wrapping" />
-        <error line="324" column="146" source="standard:argument-list-wrapping" />
-        <error line="334" column="1" source="standard:max-line-length" />
-        <error line="334" column="132" source="standard:argument-list-wrapping" />
-        <error line="334" column="142" source="standard:argument-list-wrapping" />
-        <error line="356" column="1" source="standard:max-line-length" />
-        <error line="356" column="132" source="standard:argument-list-wrapping" />
-        <error line="356" column="142" source="standard:argument-list-wrapping" />
-        <error line="366" column="1" source="standard:max-line-length" />
-        <error line="366" column="128" source="standard:argument-list-wrapping" />
-        <error line="366" column="138" source="standard:argument-list-wrapping" />
-        <error line="388" column="1" source="standard:max-line-length" />
-        <error line="388" column="114" source="standard:argument-list-wrapping" />
-        <error line="388" column="124" source="standard:argument-list-wrapping" />
-        <error line="427" column="1" source="standard:max-line-length" />
-        <error line="427" column="137" source="standard:argument-list-wrapping" />
-        <error line="427" column="147" source="standard:argument-list-wrapping" />
-        <error line="440" column="1" source="standard:max-line-length" />
-        <error line="440" column="129" source="standard:argument-list-wrapping" />
-        <error line="440" column="139" source="standard:argument-list-wrapping" />
-        <error line="455" column="1" source="standard:max-line-length" />
-        <error line="455" column="131" source="standard:argument-list-wrapping" />
-        <error line="455" column="141" source="standard:argument-list-wrapping" />
-        <error line="470" column="1" source="standard:max-line-length" />
-        <error line="470" column="122" source="standard:argument-list-wrapping" />
-        <error line="470" column="132" source="standard:argument-list-wrapping" />
-        <error line="483" column="1" source="standard:max-line-length" />
-        <error line="483" column="125" source="standard:argument-list-wrapping" />
-        <error line="483" column="135" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsServiceTest.kt">
-        <error line="42" column="1" source="standard:max-line-length" />
-        <error line="42" column="23" source="standard:property-wrapping" />
-        <error line="42" column="34" source="standard:argument-list-wrapping" />
-        <error line="42" column="53" source="standard:argument-list-wrapping" />
-        <error line="42" column="72" source="standard:argument-list-wrapping" />
-        <error line="42" column="95" source="standard:argument-list-wrapping" />
-        <error line="42" column="116" source="standard:argument-list-wrapping" />
-        <error line="42" column="129" source="standard:argument-list-wrapping" />
-        <error line="54" column="1" source="standard:max-line-length" />
-        <error line="73" column="1" source="standard:max-line-length" />
-        <error line="92" column="1" source="standard:max-line-length" />
-        <error line="94" column="1" source="standard:max-line-length" />
-        <error line="94" column="51" source="standard:argument-list-wrapping" />
-        <error line="94" column="144" source="standard:argument-list-wrapping" />
-        <error line="97" column="1" source="standard:max-line-length" />
-        <error line="97" column="23" source="standard:property-wrapping" />
-        <error line="97" column="34" source="standard:argument-list-wrapping" />
-        <error line="97" column="53" source="standard:argument-list-wrapping" />
-        <error line="97" column="72" source="standard:argument-list-wrapping" />
-        <error line="97" column="95" source="standard:argument-list-wrapping" />
-        <error line="97" column="116" source="standard:argument-list-wrapping" />
-        <error line="97" column="129" source="standard:argument-list-wrapping" />
-        <error line="124" column="1" source="standard:max-line-length" />
-        <error line="124" column="60" source="standard:argument-list-wrapping" />
-        <error line="124" column="136" source="standard:argument-list-wrapping" />
-        <error line="132" column="1" source="standard:max-line-length" />
-        <error line="132" column="60" source="standard:argument-list-wrapping" />
-        <error line="132" column="183" source="standard:argument-list-wrapping" />
-        <error line="140" column="1" source="standard:max-line-length" />
-        <error line="140" column="60" source="standard:argument-list-wrapping" />
-        <error line="140" column="183" source="standard:argument-list-wrapping" />
-        <error line="147" column="1" source="standard:max-line-length" />
-        <error line="147" column="54" source="standard:argument-list-wrapping" />
-        <error line="147" column="142" source="standard:argument-list-wrapping" />
-        <error line="148" column="1" source="standard:max-line-length" />
-        <error line="148" column="32" source="standard:property-wrapping" />
-        <error line="148" column="43" source="standard:argument-list-wrapping" />
-        <error line="148" column="56" source="standard:argument-list-wrapping" />
-        <error line="148" column="69" source="standard:argument-list-wrapping" />
-        <error line="148" column="84" source="standard:argument-list-wrapping" />
-        <error line="148" column="172" source="standard:argument-list-wrapping" />
-        <error line="148" column="181" source="standard:argument-list-wrapping" />
-        <error line="164" column="1" source="standard:max-line-length" />
-        <error line="176" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/metrics/MetricControllerTest.kt">
-        <error line="590" column="1" source="standard:max-line-length" />
-        <error line="591" column="1" source="standard:max-line-length" />
-        <error line="648" column="1" source="standard:max-line-length" />
-        <error line="648" column="19" source="standard:property-wrapping" />
-        <error line="648" column="25" source="standard:argument-list-wrapping" />
-        <error line="648" column="55" source="standard:argument-list-wrapping" />
-        <error line="648" column="70" source="standard:argument-list-wrapping" />
-        <error line="648" column="122" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTest.kt">
-        <error line="96" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTestRobolectric.kt">
-        <error line="214" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenterTest.kt">
-        <error line="52" column="1" source="standard:max-line-length" />
-        <error line="75" column="1" source="standard:max-line-length" />
-        <error line="175" column="1" source="standard:max-line-length" />
-        <error line="231" column="1" source="standard:max-line-length" />
-        <error line="294" column="1" source="standard:max-line-length" />
-        <error line="325" column="1" source="standard:max-line-length" />
-        <error line="338" column="1" source="standard:max-line-length" />
-        <error line="362" column="1" source="standard:max-line-length" />
-        <error line="378" column="1" source="standard:max-line-length" />
-        <error line="397" column="1" source="standard:max-line-length" />
-        <error line="412" column="1" source="standard:max-line-length" />
-        <error line="424" column="1" source="standard:max-line-length" />
-        <error line="440" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt">
-        <error line="58" column="1" source="standard:max-line-length" />
-        <error line="84" column="1" source="standard:max-line-length" />
-        <error line="97" column="1" source="standard:max-line-length" />
-        <error line="110" column="1" source="standard:max-line-length" />
-        <error line="138" column="1" source="standard:max-line-length" />
-        <error line="151" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt">
-        <error line="151" column="1" source="standard:max-line-length" />
-        <error line="151" column="16" source="standard:wrapping" />
-        <error line="151" column="107" source="standard:wrapping" />
-        <error line="151" column="135" source="standard:argument-list-wrapping" />
-        <error line="151" column="139" source="standard:argument-list-wrapping" />
-        <error line="304" column="1" source="standard:max-line-length" />
-        <error line="339" column="1" source="standard:max-line-length" />
-        <error line="687" column="1" source="standard:max-line-length" />
-        <error line="722" column="1" source="standard:max-line-length" />
-        <error line="790" column="1" source="standard:max-line-length" />
-        <error line="801" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/compose/LinkTextTest.kt">
-        <error line="60" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/crashes/CrashContentViewTest.kt">
-        <error line="92" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/crashes/CrashReporterControllerTest.kt">
-        <error line="58" column="1" source="standard:max-line-length" />
-        <error line="69" column="1" source="standard:max-line-length" />
-        <error line="80" column="1" source="standard:max-line-length" />
-        <error line="85" column="1" source="standard:max-line-length" />
-        <error line="85" column="46" source="standard:argument-list-wrapping" />
-        <error line="85" column="57" source="standard:argument-list-wrapping" />
-        <error line="85" column="60" source="standard:argument-list-wrapping" />
-        <error line="85" column="72" source="standard:argument-list-wrapping" />
-        <error line="85" column="102" source="standard:argument-list-wrapping" />
-        <error line="85" column="117" source="standard:argument-list-wrapping" />
-        <error line="85" column="125" source="standard:argument-list-wrapping" />
-        <error line="94" column="1" source="standard:max-line-length" />
-        <error line="99" column="1" source="standard:max-line-length" />
-        <error line="99" column="46" source="standard:argument-list-wrapping" />
-        <error line="99" column="57" source="standard:argument-list-wrapping" />
-        <error line="99" column="60" source="standard:argument-list-wrapping" />
-        <error line="99" column="72" source="standard:argument-list-wrapping" />
-        <error line="99" column="103" source="standard:argument-list-wrapping" />
-        <error line="99" column="118" source="standard:argument-list-wrapping" />
-        <error line="99" column="126" source="standard:argument-list-wrapping" />
-        <error line="108" column="1" source="standard:max-line-length" />
-        <error line="113" column="1" source="standard:max-line-length" />
-        <error line="113" column="46" source="standard:argument-list-wrapping" />
-        <error line="113" column="57" source="standard:argument-list-wrapping" />
-        <error line="113" column="60" source="standard:argument-list-wrapping" />
-        <error line="113" column="72" source="standard:argument-list-wrapping" />
-        <error line="113" column="103" source="standard:argument-list-wrapping" />
-        <error line="113" column="118" source="standard:argument-list-wrapping" />
-        <error line="113" column="126" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivityTest.kt">
-        <error line="117" column="1" source="standard:max-line-length" />
-        <error line="145" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessorTest.kt">
-        <error line="32" column="1" source="standard:max-line-length" />
-        <error line="32" column="19" source="standard:property-wrapping" />
-        <error line="32" column="25" source="standard:argument-list-wrapping" />
-        <error line="32" column="140" source="standard:argument-list-wrapping" />
-        <error line="40" column="1" source="standard:max-line-length" />
-        <error line="40" column="19" source="standard:property-wrapping" />
-        <error line="40" column="25" source="standard:argument-list-wrapping" />
-        <error line="40" column="134" source="standard:argument-list-wrapping" />
-        <error line="56" column="1" source="standard:max-line-length" />
-        <error line="56" column="19" source="standard:property-wrapping" />
-        <error line="56" column="25" source="standard:argument-list-wrapping" />
-        <error line="56" column="125" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/debugsettings/DefaultDebugSettingsRepositoryTest.kt">
-        <error line="18" column="1" source="standard:max-line-length" />
-        <error line="18" column="83" source="standard:argument-list-wrapping" />
-        <error line="18" column="126" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/downloads/DynamicDownloadDialogBehaviorTest.kt">
-        <error line="232" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/downloads/FirstPartyDownloadDialogTest.kt">
-        <error line="38" column="1" source="standard:max-line-length" />
-        <error line="79" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/downloads/StartDownloadDialogTest.kt">
-        <error line="84" column="1" source="standard:max-line-length" />
-        <error line="176" column="1" source="standard:max-line-length" />
-        <error line="176" column="26" source="standard:argument-list-wrapping" />
-        <error line="176" column="51" source="standard:argument-list-wrapping" />
-        <error line="176" column="123" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/ext/ActivityTest.kt">
-        <error line="29" column="1" source="standard:max-line-length" />
-        <error line="29" column="105" source="standard:argument-list-wrapping" />
-        <error line="29" column="151" source="standard:argument-list-wrapping" />
-        <error line="32" column="1" source="standard:max-line-length" />
-        <error line="32" column="20" source="standard:property-wrapping" />
-        <error line="32" column="29" source="standard:argument-list-wrapping" />
-        <error line="32" column="73" source="standard:argument-list-wrapping" />
-        <error line="32" column="112" source="standard:argument-list-wrapping" />
-        <error line="32" column="149" source="standard:argument-list-wrapping" />
-        <error line="32" column="181" source="standard:argument-list-wrapping" />
-        <error line="32" column="217" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/ext/AppStateTest.kt">
-        <error line="39" column="1" source="standard:max-line-length" />
-        <error line="58" column="1" source="standard:max-line-length" />
-        <error line="77" column="1" source="standard:max-line-length" />
-        <error line="105" column="1" source="standard:max-line-length" />
-        <error line="149" column="1" source="standard:max-line-length" />
-        <error line="170" column="1" source="standard:max-line-length" />
-        <error line="222" column="1" source="standard:max-line-length" />
-        <error line="226" column="1" source="standard:max-line-length" />
-        <error line="226" column="56" source="standard:argument-list-wrapping" />
-        <error line="226" column="97" source="standard:argument-list-wrapping" />
-        <error line="226" column="122" source="standard:argument-list-wrapping" />
-        <error line="226" column="123" source="standard:argument-list-wrapping" />
-        <error line="244" column="1" source="standard:max-line-length" />
-        <error line="278" column="1" source="standard:max-line-length" />
-        <error line="314" column="1" source="standard:max-line-length" />
-        <error line="333" column="1" source="standard:max-line-length" />
-        <error line="361" column="1" source="standard:max-line-length" />
-        <error line="374" column="1" source="standard:max-line-length" />
-        <error line="382" column="1" source="standard:max-line-length" />
-        <error line="411" column="1" source="standard:max-line-length" />
-        <error line="427" column="1" source="standard:max-line-length" />
-        <error line="443" column="1" source="standard:max-line-length" />
-        <error line="497" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/ext/BrowserStateTest.kt">
-        <error line="46" column="1" source="standard:max-line-length" />
-        <error line="60" column="1" source="standard:max-line-length" />
-        <error line="79" column="1" source="standard:max-line-length" />
-        <error line="98" column="1" source="standard:max-line-length" />
-        <error line="124" column="1" source="standard:max-line-length" />
-        <error line="167" column="1" source="standard:max-line-length" />
-        <error line="211" column="1" source="standard:max-line-length" />
-        <error line="253" column="1" source="standard:max-line-length" />
-        <error line="263" column="1" source="standard:max-line-length" />
-        <error line="275" column="1" source="standard:max-line-length" />
-        <error line="347" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/ext/ContextTest.kt">
-        <error line="95" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/ext/DownloadItemKtTest.kt">
-        <error line="31" column="1" source="standard:max-line-length" />
-        <error line="31" column="22" source="standard:argument-list-wrapping" />
-        <error line="31" column="51" source="standard:argument-list-wrapping" />
-        <error line="31" column="122" source="standard:argument-list-wrapping" />
-        <error line="32" column="1" source="standard:max-line-length" />
-        <error line="32" column="22" source="standard:argument-list-wrapping" />
-        <error line="32" column="51" source="standard:argument-list-wrapping" />
-        <error line="32" column="122" source="standard:argument-list-wrapping" />
-        <error line="33" column="1" source="standard:max-line-length" />
-        <error line="33" column="22" source="standard:argument-list-wrapping" />
-        <error line="33" column="56" source="standard:argument-list-wrapping" />
-        <error line="33" column="127" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/ext/TopSiteTest.kt">
-        <error line="58" column="1" source="standard:max-line-length" />
-        <error line="72" column="1" source="standard:max-line-length" />
-        <error line="94" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/ext/UriTest.kt">
-        <error line="18" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/extension/WebExtensionPromptFeatureTest.kt">
-        <error line="91" column="1" source="standard:max-line-length" />
-        <error line="146" column="1" source="standard:max-line-length" />
-        <error line="163" column="1" source="standard:max-line-length" />
-        <error line="197" column="1" source="standard:max-line-length" />
-        <error line="242" column="1" source="standard:max-line-length" />
-        <error line="273" column="1" source="standard:max-line-length" />
-        <error line="312" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt">
-        <error line="1064" column="1" source="standard:max-line-length" />
-        <error line="1075" column="1" source="standard:max-line-length" />
-        <error line="1086" column="1" source="standard:max-line-length" />
-        <error line="1097" column="1" source="standard:max-line-length" />
-        <error line="1108" column="1" source="standard:max-line-length" />
-        <error line="1168" column="1" source="standard:max-line-length" />
-        <error line="1178" column="1" source="standard:max-line-length" />
-        <error line="1190" column="1" source="standard:max-line-length" />
-        <error line="1202" column="1" source="standard:max-line-length" />
-        <error line="1215" column="1" source="standard:max-line-length" />
-        <error line="1267" column="1" source="standard:max-line-length" />
-        <error line="1285" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/HomeFragmentTest.kt">
-        <error line="77" column="1" source="standard:max-line-length" />
-        <error line="87" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/HomeMenuViewTest.kt">
-        <error line="115" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/PocketUpdatesMiddlewareTest.kt">
-        <error line="88" column="1" source="standard:max-line-length" />
-        <error line="188" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/RecentTabsListFeatureTest.kt">
-        <error line="59" column="1" source="standard:max-line-length" />
-        <error line="75" column="1" source="standard:max-line-length" />
-        <error line="123" column="1" source="standard:max-line-length" />
-        <error line="153" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/blocklist/BlocklistHandlerTest.kt">
-        <error line="159" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/blocklist/BlocklistMiddlewareTest.kt">
-        <error line="88" column="1" source="standard:max-line-length" />
-        <error line="91" column="1" source="standard:max-line-length" />
-        <error line="91" column="66" source="standard:argument-list-wrapping" />
-        <error line="91" column="122" source="standard:argument-list-wrapping" />
-        <error line="142" column="1" source="standard:max-line-length" />
-        <error line="361" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/intent/HomeDeepLinkIntentProcessorTest.kt">
-        <error line="239" column="1" source="standard:max-line-length" />
-        <error line="239" column="20" source="standard:argument-list-wrapping" />
-        <error line="239" column="45" source="standard:argument-list-wrapping" />
-        <error line="239" column="111" source="standard:argument-list-wrapping" />
-        <error line="239" column="126" source="standard:argument-list-wrapping" />
-        <error line="239" column="129" source="standard:argument-list-wrapping" />
-        <error line="239" column="130" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/intent/OpenSpecificTabIntentProcessorTest.kt">
-        <error line="72" column="1" source="standard:max-line-length" />
-        <error line="72" column="20" source="standard:property-wrapping" />
-        <error line="72" column="34" source="standard:argument-list-wrapping" />
-        <error line="72" column="121" source="standard:argument-list-wrapping" />
-        <error line="85" column="1" source="standard:max-line-length" />
-        <error line="90" column="1" source="standard:max-line-length" />
-        <error line="90" column="20" source="standard:property-wrapping" />
-        <error line="90" column="34" source="standard:argument-list-wrapping" />
-        <error line="90" column="121" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/pocket/DefaultPocketStoriesControllerTest.kt">
-        <error line="73" column="1" source="standard:max-line-length" />
-        <error line="77" column="1" source="standard:max-line-length" />
-        <error line="77" column="37" source="standard:property-wrapping" />
-        <error line="77" column="79" source="standard:argument-list-wrapping" />
-        <error line="77" column="112" source="standard:argument-list-wrapping" />
-        <error line="77" column="134" source="standard:argument-list-wrapping" />
-        <error line="82" column="1" source="standard:max-line-length" />
-        <error line="82" column="34" source="standard:property-wrapping" />
-        <error line="82" column="76" source="standard:argument-list-wrapping" />
-        <error line="82" column="106" source="standard:argument-list-wrapping" />
-        <error line="82" column="133" source="standard:argument-list-wrapping" />
-        <error line="119" column="1" source="standard:max-line-length" />
-        <error line="123" column="1" source="standard:max-line-length" />
-        <error line="123" column="37" source="standard:property-wrapping" />
-        <error line="123" column="79" source="standard:argument-list-wrapping" />
-        <error line="123" column="112" source="standard:argument-list-wrapping" />
-        <error line="123" column="134" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/privatebrowsing/DefaultPrivateBrowsingControllerTest.kt">
-        <error line="62" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt">
-        <error line="89" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/recentsyncedtabs/RecentSyncedTabFeatureTest.kt">
-        <error line="131" column="1" source="standard:max-line-length" />
-        <error line="144" column="1" source="standard:max-line-length" />
-        <error line="144" column="19" source="standard:wrapping" />
-        <error line="144" column="43" source="standard:argument-list-wrapping" />
-        <error line="144" column="69" source="standard:argument-list-wrapping" />
-        <error line="144" column="86" source="standard:argument-list-wrapping" />
-        <error line="144" column="114" source="standard:argument-list-wrapping" />
-        <error line="144" column="129" source="standard:argument-list-wrapping" />
-        <error line="144" column="130" source="standard:argument-list-wrapping" />
-        <error line="148" column="1" source="standard:max-line-length" />
-        <error line="187" column="1" source="standard:max-line-length" />
-        <error line="221" column="1" source="standard:max-line-length" />
-        <error line="249" column="1" source="standard:max-line-length" />
-        <error line="276" column="1" source="standard:max-line-length" />
-        <error line="412" column="1" source="standard:max-line-length" />
-        <error line="462" column="1" source="standard:max-line-length" />
-        <error line="487" column="1" source="standard:max-line-length" />
-        <error line="515" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddlewareTest.kt">
-        <error line="92" column="1" source="standard:max-line-length" />
-        <error line="105" column="1" source="standard:max-line-length" />
-        <error line="120" column="1" source="standard:max-line-length" />
-        <error line="135" column="1" source="standard:max-line-length" />
-        <error line="135" column="24" source="standard:argument-list-wrapping" />
-        <error line="135" column="63" source="standard:argument-list-wrapping" />
-        <error line="135" column="71" source="standard:argument-list-wrapping" />
-        <error line="135" column="118" source="standard:argument-list-wrapping" />
-        <error line="135" column="134" source="standard:argument-list-wrapping" />
-        <error line="135" column="135" source="standard:argument-list-wrapping" />
-        <error line="145" column="1" source="standard:max-line-length" />
-        <error line="159" column="1" source="standard:max-line-length" />
-        <error line="159" column="24" source="standard:argument-list-wrapping" />
-        <error line="159" column="63" source="standard:argument-list-wrapping" />
-        <error line="159" column="71" source="standard:argument-list-wrapping" />
-        <error line="159" column="78" source="standard:argument-list-wrapping" />
-        <error line="159" column="90" source="standard:argument-list-wrapping" />
-        <error line="159" column="107" source="standard:argument-list-wrapping" />
-        <error line="159" column="127" source="standard:argument-list-wrapping" />
-        <error line="159" column="130" source="standard:argument-list-wrapping" />
-        <error line="159" column="142" source="standard:argument-list-wrapping" />
-        <error line="159" column="159" source="standard:argument-list-wrapping" />
-        <error line="159" column="166" source="standard:argument-list-wrapping" />
-        <error line="159" column="167" source="standard:argument-list-wrapping" />
-        <error line="159" column="170" source="standard:argument-list-wrapping" />
-        <error line="159" column="186" source="standard:argument-list-wrapping" />
-        <error line="159" column="187" source="standard:argument-list-wrapping" />
-        <error line="169" column="1" source="standard:max-line-length" />
-        <error line="195" column="1" source="standard:max-line-length" />
-        <error line="195" column="24" source="standard:argument-list-wrapping" />
-        <error line="195" column="63" source="standard:argument-list-wrapping" />
-        <error line="195" column="77" source="standard:argument-list-wrapping" />
-        <error line="195" column="84" source="standard:argument-list-wrapping" />
-        <error line="195" column="96" source="standard:argument-list-wrapping" />
-        <error line="195" column="124" source="standard:argument-list-wrapping" />
-        <error line="195" column="162" source="standard:argument-list-wrapping" />
-        <error line="195" column="163" source="standard:argument-list-wrapping" />
-        <error line="195" column="166" source="standard:argument-list-wrapping" />
-        <error line="195" column="167" source="standard:argument-list-wrapping" />
-        <error line="195" column="168" source="standard:argument-list-wrapping" />
-        <error line="196" column="1" source="standard:max-line-length" />
-        <error line="196" column="24" source="standard:argument-list-wrapping" />
-        <error line="196" column="63" source="standard:argument-list-wrapping" />
-        <error line="196" column="71" source="standard:argument-list-wrapping" />
-        <error line="196" column="78" source="standard:argument-list-wrapping" />
-        <error line="196" column="90" source="standard:argument-list-wrapping" />
-        <error line="196" column="94" source="standard:argument-list-wrapping" />
-        <error line="196" column="134" source="standard:argument-list-wrapping" />
-        <error line="196" column="135" source="standard:argument-list-wrapping" />
-        <error line="196" column="138" source="standard:argument-list-wrapping" />
-        <error line="196" column="154" source="standard:argument-list-wrapping" />
-        <error line="196" column="155" source="standard:argument-list-wrapping" />
-        <error line="204" column="1" source="standard:max-line-length" />
-        <error line="204" column="24" source="standard:argument-list-wrapping" />
-        <error line="204" column="63" source="standard:argument-list-wrapping" />
-        <error line="204" column="77" source="standard:argument-list-wrapping" />
-        <error line="204" column="84" source="standard:argument-list-wrapping" />
-        <error line="204" column="96" source="standard:argument-list-wrapping" />
-        <error line="204" column="124" source="standard:argument-list-wrapping" />
-        <error line="204" column="162" source="standard:argument-list-wrapping" />
-        <error line="204" column="165" source="standard:argument-list-wrapping" />
-        <error line="204" column="177" source="standard:argument-list-wrapping" />
-        <error line="204" column="188" source="standard:argument-list-wrapping" />
-        <error line="204" column="209" source="standard:argument-list-wrapping" />
-        <error line="204" column="210" source="standard:argument-list-wrapping" />
-        <error line="204" column="213" source="standard:argument-list-wrapping" />
-        <error line="204" column="214" source="standard:argument-list-wrapping" />
-        <error line="204" column="215" source="standard:argument-list-wrapping" />
-        <error line="214" column="1" source="standard:max-line-length" />
-        <error line="214" column="24" source="standard:argument-list-wrapping" />
-        <error line="214" column="63" source="standard:argument-list-wrapping" />
-        <error line="214" column="71" source="standard:argument-list-wrapping" />
-        <error line="214" column="78" source="standard:argument-list-wrapping" />
-        <error line="214" column="90" source="standard:argument-list-wrapping" />
-        <error line="214" column="101" source="standard:argument-list-wrapping" />
-        <error line="214" column="122" source="standard:argument-list-wrapping" />
-        <error line="214" column="123" source="standard:argument-list-wrapping" />
-        <error line="214" column="126" source="standard:argument-list-wrapping" />
-        <error line="214" column="142" source="standard:argument-list-wrapping" />
-        <error line="214" column="143" source="standard:argument-list-wrapping" />
-        <error line="226" column="1" source="standard:max-line-length" />
-        <error line="226" column="24" source="standard:argument-list-wrapping" />
-        <error line="226" column="63" source="standard:argument-list-wrapping" />
-        <error line="226" column="71" source="standard:argument-list-wrapping" />
-        <error line="226" column="78" source="standard:argument-list-wrapping" />
-        <error line="226" column="90" source="standard:argument-list-wrapping" />
-        <error line="226" column="101" source="standard:argument-list-wrapping" />
-        <error line="226" column="122" source="standard:argument-list-wrapping" />
-        <error line="226" column="125" source="standard:argument-list-wrapping" />
-        <error line="226" column="137" source="standard:argument-list-wrapping" />
-        <error line="226" column="158" source="standard:argument-list-wrapping" />
-        <error line="226" column="189" source="standard:argument-list-wrapping" />
-        <error line="226" column="190" source="standard:argument-list-wrapping" />
-        <error line="226" column="193" source="standard:argument-list-wrapping" />
-        <error line="226" column="209" source="standard:argument-list-wrapping" />
-        <error line="226" column="210" source="standard:argument-list-wrapping" />
-        <error line="239" column="1" source="standard:max-line-length" />
-        <error line="265" column="1" source="standard:max-line-length" />
-        <error line="265" column="24" source="standard:argument-list-wrapping" />
-        <error line="265" column="63" source="standard:argument-list-wrapping" />
-        <error line="265" column="77" source="standard:argument-list-wrapping" />
-        <error line="265" column="84" source="standard:argument-list-wrapping" />
-        <error line="265" column="96" source="standard:argument-list-wrapping" />
-        <error line="265" column="124" source="standard:argument-list-wrapping" />
-        <error line="265" column="162" source="standard:argument-list-wrapping" />
-        <error line="265" column="163" source="standard:argument-list-wrapping" />
-        <error line="265" column="166" source="standard:argument-list-wrapping" />
-        <error line="265" column="167" source="standard:argument-list-wrapping" />
-        <error line="265" column="168" source="standard:argument-list-wrapping" />
-        <error line="271" column="1" source="standard:max-line-length" />
-        <error line="271" column="24" source="standard:argument-list-wrapping" />
-        <error line="271" column="74" source="standard:argument-list-wrapping" />
-        <error line="271" column="82" source="standard:argument-list-wrapping" />
-        <error line="271" column="101" source="standard:argument-list-wrapping" />
-        <error line="271" column="147" source="standard:argument-list-wrapping" />
-        <error line="271" column="153" source="standard:argument-list-wrapping" />
-        <error line="271" column="157" source="standard:argument-list-wrapping" />
-        <error line="271" column="158" source="standard:argument-list-wrapping" />
-        <error line="271" column="159" source="standard:argument-list-wrapping" />
-        <error line="277" column="1" source="standard:max-line-length" />
-        <error line="277" column="24" source="standard:argument-list-wrapping" />
-        <error line="277" column="63" source="standard:argument-list-wrapping" />
-        <error line="277" column="71" source="standard:argument-list-wrapping" />
-        <error line="277" column="78" source="standard:argument-list-wrapping" />
-        <error line="277" column="90" source="standard:argument-list-wrapping" />
-        <error line="277" column="94" source="standard:argument-list-wrapping" />
-        <error line="277" column="138" source="standard:argument-list-wrapping" />
-        <error line="277" column="139" source="standard:argument-list-wrapping" />
-        <error line="277" column="142" source="standard:argument-list-wrapping" />
-        <error line="277" column="158" source="standard:argument-list-wrapping" />
-        <error line="277" column="159" source="standard:argument-list-wrapping" />
-        <error line="279" column="1" source="standard:max-line-length" />
-        <error line="279" column="24" source="standard:argument-list-wrapping" />
-        <error line="279" column="63" source="standard:argument-list-wrapping" />
-        <error line="279" column="71" source="standard:argument-list-wrapping" />
-        <error line="279" column="78" source="standard:argument-list-wrapping" />
-        <error line="279" column="90" source="standard:argument-list-wrapping" />
-        <error line="279" column="101" source="standard:argument-list-wrapping" />
-        <error line="279" column="122" source="standard:argument-list-wrapping" />
-        <error line="279" column="123" source="standard:argument-list-wrapping" />
-        <error line="279" column="126" source="standard:argument-list-wrapping" />
-        <error line="279" column="142" source="standard:argument-list-wrapping" />
-        <error line="279" column="143" source="standard:argument-list-wrapping" />
-        <error line="280" column="1" source="standard:max-line-length" />
-        <error line="280" column="24" source="standard:argument-list-wrapping" />
-        <error line="280" column="63" source="standard:argument-list-wrapping" />
-        <error line="280" column="77" source="standard:argument-list-wrapping" />
-        <error line="280" column="84" source="standard:argument-list-wrapping" />
-        <error line="280" column="96" source="standard:argument-list-wrapping" />
-        <error line="280" column="124" source="standard:argument-list-wrapping" />
-        <error line="280" column="162" source="standard:argument-list-wrapping" />
-        <error line="280" column="165" source="standard:argument-list-wrapping" />
-        <error line="280" column="177" source="standard:argument-list-wrapping" />
-        <error line="280" column="188" source="standard:argument-list-wrapping" />
-        <error line="280" column="209" source="standard:argument-list-wrapping" />
-        <error line="280" column="210" source="standard:argument-list-wrapping" />
-        <error line="280" column="213" source="standard:argument-list-wrapping" />
-        <error line="280" column="214" source="standard:argument-list-wrapping" />
-        <error line="280" column="215" source="standard:argument-list-wrapping" />
-        <error line="327" column="1" source="standard:max-line-length" />
-        <error line="327" column="24" source="standard:argument-list-wrapping" />
-        <error line="327" column="63" source="standard:argument-list-wrapping" />
-        <error line="327" column="77" source="standard:argument-list-wrapping" />
-        <error line="327" column="84" source="standard:argument-list-wrapping" />
-        <error line="327" column="96" source="standard:argument-list-wrapping" />
-        <error line="327" column="124" source="standard:argument-list-wrapping" />
-        <error line="327" column="162" source="standard:argument-list-wrapping" />
-        <error line="327" column="163" source="standard:argument-list-wrapping" />
-        <error line="327" column="166" source="standard:argument-list-wrapping" />
-        <error line="327" column="167" source="standard:argument-list-wrapping" />
-        <error line="327" column="168" source="standard:argument-list-wrapping" />
-        <error line="328" column="1" source="standard:max-line-length" />
-        <error line="328" column="24" source="standard:argument-list-wrapping" />
-        <error line="328" column="63" source="standard:argument-list-wrapping" />
-        <error line="328" column="71" source="standard:argument-list-wrapping" />
-        <error line="328" column="78" source="standard:argument-list-wrapping" />
-        <error line="328" column="90" source="standard:argument-list-wrapping" />
-        <error line="328" column="94" source="standard:argument-list-wrapping" />
-        <error line="328" column="134" source="standard:argument-list-wrapping" />
-        <error line="328" column="135" source="standard:argument-list-wrapping" />
-        <error line="328" column="138" source="standard:argument-list-wrapping" />
-        <error line="328" column="154" source="standard:argument-list-wrapping" />
-        <error line="328" column="155" source="standard:argument-list-wrapping" />
-        <error line="336" column="1" source="standard:max-line-length" />
-        <error line="336" column="24" source="standard:argument-list-wrapping" />
-        <error line="336" column="63" source="standard:argument-list-wrapping" />
-        <error line="336" column="71" source="standard:argument-list-wrapping" />
-        <error line="336" column="78" source="standard:argument-list-wrapping" />
-        <error line="336" column="90" source="standard:argument-list-wrapping" />
-        <error line="336" column="94" source="standard:argument-list-wrapping" />
-        <error line="336" column="134" source="standard:argument-list-wrapping" />
-        <error line="336" column="137" source="standard:argument-list-wrapping" />
-        <error line="336" column="149" source="standard:argument-list-wrapping" />
-        <error line="336" column="160" source="standard:argument-list-wrapping" />
-        <error line="336" column="181" source="standard:argument-list-wrapping" />
-        <error line="336" column="182" source="standard:argument-list-wrapping" />
-        <error line="336" column="185" source="standard:argument-list-wrapping" />
-        <error line="336" column="186" source="standard:argument-list-wrapping" />
-        <error line="336" column="187" source="standard:argument-list-wrapping" />
-        <error line="348" column="1" source="standard:max-line-length" />
-        <error line="348" column="24" source="standard:argument-list-wrapping" />
-        <error line="348" column="63" source="standard:argument-list-wrapping" />
-        <error line="348" column="77" source="standard:argument-list-wrapping" />
-        <error line="348" column="84" source="standard:argument-list-wrapping" />
-        <error line="348" column="96" source="standard:argument-list-wrapping" />
-        <error line="348" column="124" source="standard:argument-list-wrapping" />
-        <error line="348" column="162" source="standard:argument-list-wrapping" />
-        <error line="348" column="165" source="standard:argument-list-wrapping" />
-        <error line="348" column="177" source="standard:argument-list-wrapping" />
-        <error line="348" column="188" source="standard:argument-list-wrapping" />
-        <error line="348" column="209" source="standard:argument-list-wrapping" />
-        <error line="348" column="210" source="standard:argument-list-wrapping" />
-        <error line="348" column="213" source="standard:argument-list-wrapping" />
-        <error line="348" column="214" source="standard:argument-list-wrapping" />
-        <error line="348" column="215" source="standard:argument-list-wrapping" />
-        <error line="358" column="1" source="standard:max-line-length" />
-        <error line="384" column="1" source="standard:max-line-length" />
-        <error line="384" column="24" source="standard:argument-list-wrapping" />
-        <error line="384" column="63" source="standard:argument-list-wrapping" />
-        <error line="384" column="77" source="standard:argument-list-wrapping" />
-        <error line="384" column="84" source="standard:argument-list-wrapping" />
-        <error line="384" column="96" source="standard:argument-list-wrapping" />
-        <error line="384" column="124" source="standard:argument-list-wrapping" />
-        <error line="384" column="162" source="standard:argument-list-wrapping" />
-        <error line="384" column="163" source="standard:argument-list-wrapping" />
-        <error line="384" column="166" source="standard:argument-list-wrapping" />
-        <error line="384" column="167" source="standard:argument-list-wrapping" />
-        <error line="384" column="168" source="standard:argument-list-wrapping" />
-        <error line="385" column="1" source="standard:max-line-length" />
-        <error line="385" column="24" source="standard:argument-list-wrapping" />
-        <error line="385" column="63" source="standard:argument-list-wrapping" />
-        <error line="385" column="71" source="standard:argument-list-wrapping" />
-        <error line="385" column="78" source="standard:argument-list-wrapping" />
-        <error line="385" column="90" source="standard:argument-list-wrapping" />
-        <error line="385" column="94" source="standard:argument-list-wrapping" />
-        <error line="385" column="134" source="standard:argument-list-wrapping" />
-        <error line="385" column="135" source="standard:argument-list-wrapping" />
-        <error line="385" column="138" source="standard:argument-list-wrapping" />
-        <error line="385" column="154" source="standard:argument-list-wrapping" />
-        <error line="385" column="155" source="standard:argument-list-wrapping" />
-        <error line="393" column="1" source="standard:max-line-length" />
-        <error line="393" column="24" source="standard:argument-list-wrapping" />
-        <error line="393" column="63" source="standard:argument-list-wrapping" />
-        <error line="393" column="71" source="standard:argument-list-wrapping" />
-        <error line="393" column="78" source="standard:argument-list-wrapping" />
-        <error line="393" column="90" source="standard:argument-list-wrapping" />
-        <error line="393" column="94" source="standard:argument-list-wrapping" />
-        <error line="393" column="134" source="standard:argument-list-wrapping" />
-        <error line="393" column="137" source="standard:argument-list-wrapping" />
-        <error line="393" column="149" source="standard:argument-list-wrapping" />
-        <error line="393" column="160" source="standard:argument-list-wrapping" />
-        <error line="393" column="181" source="standard:argument-list-wrapping" />
-        <error line="393" column="182" source="standard:argument-list-wrapping" />
-        <error line="393" column="185" source="standard:argument-list-wrapping" />
-        <error line="393" column="186" source="standard:argument-list-wrapping" />
-        <error line="393" column="187" source="standard:argument-list-wrapping" />
-        <error line="405" column="1" source="standard:max-line-length" />
-        <error line="405" column="24" source="standard:argument-list-wrapping" />
-        <error line="405" column="63" source="standard:argument-list-wrapping" />
-        <error line="405" column="77" source="standard:argument-list-wrapping" />
-        <error line="405" column="84" source="standard:argument-list-wrapping" />
-        <error line="405" column="96" source="standard:argument-list-wrapping" />
-        <error line="405" column="124" source="standard:argument-list-wrapping" />
-        <error line="405" column="162" source="standard:argument-list-wrapping" />
-        <error line="405" column="165" source="standard:argument-list-wrapping" />
-        <error line="405" column="177" source="standard:argument-list-wrapping" />
-        <error line="405" column="188" source="standard:argument-list-wrapping" />
-        <error line="405" column="209" source="standard:argument-list-wrapping" />
-        <error line="405" column="210" source="standard:argument-list-wrapping" />
-        <error line="405" column="213" source="standard:argument-list-wrapping" />
-        <error line="405" column="214" source="standard:argument-list-wrapping" />
-        <error line="405" column="215" source="standard:argument-list-wrapping" />
-        <error line="429" column="1" source="standard:max-line-length" />
-        <error line="446" column="1" source="standard:max-line-length" />
-        <error line="597" column="1" source="standard:max-line-length" />
-        <error line="616" column="1" source="standard:max-line-length" />
-        <error line="632" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataServiceTest.kt">
-        <error line="41" column="1" source="standard:max-line-length" />
-        <error line="47" column="1" source="standard:max-line-length" />
-        <error line="47" column="26" source="standard:property-wrapping" />
-        <error line="47" column="46" source="standard:argument-list-wrapping" />
-        <error line="47" column="69" source="standard:argument-list-wrapping" />
-        <error line="47" column="91" source="standard:argument-list-wrapping" />
-        <error line="47" column="123" source="standard:argument-list-wrapping" />
-        <error line="48" column="1" source="standard:max-line-length" />
-        <error line="48" column="86" source="standard:argument-list-wrapping" />
-        <error line="48" column="121" source="standard:argument-list-wrapping" />
-        <error line="53" column="1" source="standard:max-line-length" />
-        <error line="64" column="1" source="standard:max-line-length" />
-        <error line="71" column="1" source="standard:max-line-length" />
-        <error line="71" column="86" source="standard:argument-list-wrapping" />
-        <error line="71" column="121" source="standard:argument-list-wrapping" />
-        <error line="97" column="1" source="standard:max-line-length" />
-        <error line="107" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/recentvisits/RecentVisitsFeatureTest.kt">
-        <error line="118" column="1" source="standard:max-line-length" />
-        <error line="178" column="1" source="standard:max-line-length" />
-        <error line="237" column="1" source="standard:max-line-length" />
-        <error line="296" column="1" source="standard:max-line-length" />
-        <error line="317" column="1" source="standard:max-line-length" />
-        <error line="337" column="1" source="standard:max-line-length" />
-        <error line="349" column="1" source="standard:max-line-length" />
-        <error line="362" column="1" source="standard:max-line-length" />
-        <error line="409" column="1" source="standard:max-line-length" />
-        <error line="433" column="1" source="standard:max-line-length" />
-        <error line="452" column="1" source="standard:max-line-length" />
-        <error line="468" column="1" source="standard:max-line-length" />
-        <error line="484" column="1" source="standard:max-line-length" />
-        <error line="501" column="1" source="standard:max-line-length" />
-        <error line="522" column="1" source="standard:max-line-length" />
-        <error line="544" column="1" source="standard:max-line-length" />
-        <error line="554" column="1" source="standard:max-line-length" />
-        <error line="567" column="1" source="standard:max-line-length" />
-        <error line="586" column="1" source="standard:max-line-length" />
-        <error line="633" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapterTest.kt">
-        <error line="65" column="1" source="standard:max-line-length" />
-        <error line="78" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/sessioncontrol/SessionControlViewTest.kt">
-        <error line="223" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolderTest.kt">
-        <error line="114" column="1" source="standard:max-line-length" />
-        <error line="141" column="1" source="standard:max-line-length" />
-        <error line="141" column="112" source="standard:argument-list-wrapping" />
-        <error line="141" column="121" source="standard:argument-list-wrapping" />
-        <error line="141" column="129" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/home/topsites/TopSitesPagerAdapterTest.kt">
-        <error line="67" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt">
-        <error line="420" column="1" source="standard:max-line-length" />
-        <error line="529" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/library/bookmarks/DesktopFoldersTest.kt">
-        <error line="49" column="1" source="standard:max-line-length" />
-        <error line="49" column="22" source="standard:argument-list-wrapping" />
-        <error line="49" column="73" source="standard:argument-list-wrapping" />
-        <error line="49" column="91" source="standard:argument-list-wrapping" />
-        <error line="49" column="100" source="standard:argument-list-wrapping" />
-        <error line="49" column="118" source="standard:argument-list-wrapping" />
-        <error line="49" column="124" source="standard:argument-list-wrapping" />
-        <error line="49" column="125" source="standard:argument-list-wrapping" />
-        <error line="49" column="126" source="standard:argument-list-wrapping" />
-        <error line="50" column="1" source="standard:max-line-length" />
-        <error line="50" column="22" source="standard:argument-list-wrapping" />
-        <error line="50" column="73" source="standard:argument-list-wrapping" />
-        <error line="50" column="91" source="standard:argument-list-wrapping" />
-        <error line="50" column="100" source="standard:argument-list-wrapping" />
-        <error line="50" column="118" source="standard:argument-list-wrapping" />
-        <error line="50" column="126" source="standard:argument-list-wrapping" />
-        <error line="50" column="127" source="standard:argument-list-wrapping" />
-        <error line="50" column="128" source="standard:argument-list-wrapping" />
-        <error line="51" column="1" source="standard:max-line-length" />
-        <error line="51" column="22" source="standard:argument-list-wrapping" />
-        <error line="51" column="86" source="standard:argument-list-wrapping" />
-        <error line="51" column="104" source="standard:argument-list-wrapping" />
-        <error line="51" column="113" source="standard:argument-list-wrapping" />
-        <error line="51" column="131" source="standard:argument-list-wrapping" />
-        <error line="51" column="137" source="standard:argument-list-wrapping" />
-        <error line="51" column="138" source="standard:argument-list-wrapping" />
-        <error line="51" column="139" source="standard:argument-list-wrapping" />
-        <error line="52" column="1" source="standard:max-line-length" />
-        <error line="52" column="22" source="standard:argument-list-wrapping" />
-        <error line="52" column="89" source="standard:argument-list-wrapping" />
-        <error line="52" column="107" source="standard:argument-list-wrapping" />
-        <error line="52" column="116" source="standard:argument-list-wrapping" />
-        <error line="52" column="134" source="standard:argument-list-wrapping" />
-        <error line="52" column="143" source="standard:argument-list-wrapping" />
-        <error line="52" column="144" source="standard:argument-list-wrapping" />
-        <error line="52" column="145" source="standard:argument-list-wrapping" />
-        <error line="53" column="1" source="standard:max-line-length" />
-        <error line="53" column="22" source="standard:argument-list-wrapping" />
-        <error line="53" column="89" source="standard:argument-list-wrapping" />
-        <error line="53" column="107" source="standard:argument-list-wrapping" />
-        <error line="53" column="116" source="standard:argument-list-wrapping" />
-        <error line="53" column="134" source="standard:argument-list-wrapping" />
-        <error line="53" column="143" source="standard:argument-list-wrapping" />
-        <error line="53" column="144" source="standard:argument-list-wrapping" />
-        <error line="53" column="145" source="standard:argument-list-wrapping" />
-        <error line="58" column="1" source="standard:max-line-length" />
-        <error line="58" column="22" source="standard:argument-list-wrapping" />
-        <error line="58" column="86" source="standard:argument-list-wrapping" />
-        <error line="58" column="104" source="standard:argument-list-wrapping" />
-        <error line="58" column="113" source="standard:argument-list-wrapping" />
-        <error line="58" column="131" source="standard:argument-list-wrapping" />
-        <error line="58" column="137" source="standard:argument-list-wrapping" />
-        <error line="58" column="140" source="standard:argument-list-wrapping" />
-        <error line="58" column="145" source="standard:argument-list-wrapping" />
-        <error line="58" column="146" source="standard:argument-list-wrapping" />
-        <error line="60" column="1" source="standard:max-line-length" />
-        <error line="60" column="22" source="standard:argument-list-wrapping" />
-        <error line="60" column="86" source="standard:argument-list-wrapping" />
-        <error line="60" column="104" source="standard:argument-list-wrapping" />
-        <error line="60" column="113" source="standard:argument-list-wrapping" />
-        <error line="60" column="131" source="standard:argument-list-wrapping" />
-        <error line="60" column="137" source="standard:argument-list-wrapping" />
-        <error line="60" column="140" source="standard:argument-list-wrapping" />
-        <error line="60" column="145" source="standard:argument-list-wrapping" />
-        <error line="60" column="146" source="standard:argument-list-wrapping" />
-        <error line="61" column="1" source="standard:max-line-length" />
-        <error line="61" column="22" source="standard:argument-list-wrapping" />
-        <error line="61" column="89" source="standard:argument-list-wrapping" />
-        <error line="61" column="107" source="standard:argument-list-wrapping" />
-        <error line="61" column="116" source="standard:argument-list-wrapping" />
-        <error line="61" column="134" source="standard:argument-list-wrapping" />
-        <error line="61" column="143" source="standard:argument-list-wrapping" />
-        <error line="61" column="146" source="standard:argument-list-wrapping" />
-        <error line="61" column="151" source="standard:argument-list-wrapping" />
-        <error line="61" column="152" source="standard:argument-list-wrapping" />
-        <error line="62" column="1" source="standard:max-line-length" />
-        <error line="62" column="22" source="standard:argument-list-wrapping" />
-        <error line="62" column="89" source="standard:argument-list-wrapping" />
-        <error line="62" column="107" source="standard:argument-list-wrapping" />
-        <error line="62" column="116" source="standard:argument-list-wrapping" />
-        <error line="62" column="134" source="standard:argument-list-wrapping" />
-        <error line="62" column="143" source="standard:argument-list-wrapping" />
-        <error line="62" column="146" source="standard:argument-list-wrapping" />
-        <error line="62" column="151" source="standard:argument-list-wrapping" />
-        <error line="62" column="152" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt">
-        <error line="96" column="1" source="standard:max-line-length" />
-        <error line="96" column="25" source="standard:parameter-list-wrapping" />
-        <error line="96" column="39" source="standard:parameter-list-wrapping" />
-        <error line="96" column="60" source="standard:parameter-list-wrapping" />
-        <error line="96" column="91" source="standard:parameter-list-wrapping" />
-        <error line="96" column="122" source="standard:parameter-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/library/history/HistoryFragmentStoreTest.kt">
-        <error line="16" column="1" source="standard:max-line-length" />
-        <error line="16" column="47" source="standard:argument-list-wrapping" />
-        <error line="16" column="50" source="standard:argument-list-wrapping" />
-        <error line="16" column="59" source="standard:argument-list-wrapping" />
-        <error line="16" column="66" source="standard:argument-list-wrapping" />
-        <error line="16" column="78" source="standard:argument-list-wrapping" />
-        <error line="16" column="121" source="standard:argument-list-wrapping" />
-        <error line="16" column="122" source="standard:argument-list-wrapping" />
-        <error line="16" column="123" source="standard:argument-list-wrapping" />
-        <error line="17" column="1" source="standard:max-line-length" />
-        <error line="17" column="50" source="standard:argument-list-wrapping" />
-        <error line="17" column="53" source="standard:argument-list-wrapping" />
-        <error line="17" column="62" source="standard:argument-list-wrapping" />
-        <error line="17" column="69" source="standard:argument-list-wrapping" />
-        <error line="17" column="81" source="standard:argument-list-wrapping" />
-        <error line="17" column="124" source="standard:argument-list-wrapping" />
-        <error line="17" column="125" source="standard:argument-list-wrapping" />
-        <error line="17" column="126" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/library/history/state/HistoryNavigationMiddlewareTest.kt">
-        <error line="189" column="1" source="standard:max-line-length" />
-        <error line="189" column="44" source="standard:argument-list-wrapping" />
-        <error line="189" column="66" source="standard:argument-list-wrapping" />
-        <error line="189" column="117" source="standard:argument-list-wrapping" />
-        <error line="189" column="121" source="standard:argument-list-wrapping" />
-        <error line="189" column="122" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/library/history/state/HistoryStorageMiddlewareTest.kt">
-        <error line="60" column="1" source="standard:max-line-length" />
-        <error line="85" column="1" source="standard:max-line-length" />
-        <error line="142" column="1" source="standard:max-line-length" />
-        <error line="172" column="1" source="standard:max-line-length" />
-        <error line="201" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/library/history/state/HistorySyncMiddlewareTest.kt">
-        <error line="29" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolderTest.kt">
-        <error line="53" column="1" source="standard:max-line-length" />
-        <error line="53" column="92" source="standard:argument-list-wrapping" />
-        <error line="53" column="98" source="standard:argument-list-wrapping" />
-        <error line="53" column="123" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/messaging/state/MessagingMiddlewareTest.kt">
-        <error line="262" column="1" source="standard:max-line-length" />
-        <error line="293" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/messaging/state/MessagingReducerTest.kt">
-        <error line="49" column="1" source="standard:max-line-length" />
-        <error line="49" column="31" source="standard:parameter-list-wrapping" />
-        <error line="49" column="43" source="standard:parameter-list-wrapping" />
-        <error line="49" column="72" source="standard:parameter-list-wrapping" />
-        <error line="49" column="132" source="standard:parameter-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/nimbus/NimbusBranchesStoreTest.kt">
-        <error line="28" column="1" source="standard:max-line-length" />
-        <error line="43" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/nimbus/NimbusSystemTest.kt">
-        <error line="84" column="1" source="standard:max-line-length" />
-        <error line="95" column="1" source="standard:max-line-length" />
-        <error line="105" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt">
-        <error line="14" column="1" source="standard:max-line-length" />
-        <error line="82" column="1" source="standard:max-line-length" />
-        <error line="116" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/perf/ProfilerMarkerFactProcessorTest.kt">
-        <error line="40" column="1" source="standard:max-line-length" />
-        <error line="50" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/perf/StartupPathProviderTest.kt">
-        <error line="56" column="1" source="standard:max-line-length" />
-        <error line="61" column="1" source="standard:max-line-length" />
-        <error line="101" column="1" source="standard:max-line-length" />
-        <error line="120" column="1" source="standard:max-line-length" />
-        <error line="132" column="1" source="standard:max-line-length" />
-        <error line="142" column="1" source="standard:max-line-length" />
-        <error line="152" column="1" source="standard:max-line-length" />
-        <error line="162" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/perf/StartupStateProviderTest.kt">
-        <error line="110" column="1" source="standard:max-line-length" />
-        <error line="126" column="1" source="standard:max-line-length" />
-        <error line="144" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/perf/StartupTypeTelemetryTest.kt">
-        <error line="73" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/perf/StrictModeManagerTest.kt">
-        <error line="74" column="1" source="standard:max-line-length" />
-        <error line="113" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/perf/ThreadPenaltyDeathWithIgnoresListenerTest.kt">
-        <error line="83" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt">
-        <error line="448" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt">
-        <error line="59" column="1" source="standard:max-line-length" />
-        <error line="71" column="1" source="standard:max-line-length" />
-        <error line="85" column="1" source="standard:max-line-length" />
-        <error line="98" column="1" source="standard:max-line-length" />
-        <error line="123" column="1" source="standard:max-line-length" />
-        <error line="149" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt">
-        <error line="232" column="1" source="standard:max-line-length" />
-        <error line="262" column="1" source="standard:max-line-length" />
-        <error line="281" column="1" source="standard:max-line-length" />
-        <error line="300" column="1" source="standard:max-line-length" />
-        <error line="319" column="1" source="standard:max-line-length" />
-        <error line="340" column="1" source="standard:max-line-length" />
-        <error line="364" column="1" source="standard:max-line-length" />
-        <error line="388" column="1" source="standard:max-line-length" />
-        <error line="412" column="1" source="standard:max-line-length" />
-        <error line="436" column="1" source="standard:max-line-length" />
-        <error line="457" column="1" source="standard:max-line-length" />
-        <error line="478" column="1" source="standard:max-line-length" />
-        <error line="499" column="1" source="standard:max-line-length" />
-        <error line="520" column="1" source="standard:max-line-length" />
-        <error line="541" column="1" source="standard:max-line-length" />
-        <error line="563" column="1" source="standard:max-line-length" />
-        <error line="579" column="1" source="standard:max-line-length" />
-        <error line="595" column="1" source="standard:max-line-length" />
-        <error line="611" column="1" source="standard:max-line-length" />
-        <error line="654" column="1" source="standard:max-line-length" />
-        <error line="694" column="1" source="standard:max-line-length" />
-        <error line="766" column="1" source="standard:max-line-length" />
-        <error line="808" column="1" source="standard:max-line-length" />
-        <error line="847" column="1" source="standard:max-line-length" />
-        <error line="897" column="1" source="standard:max-line-length" />
-        <error line="1182" column="1" source="standard:max-line-length" />
-        <error line="1219" column="1" source="standard:max-line-length" />
-        <error line="1234" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt">
-        <error line="90" column="1" source="standard:max-line-length" />
-        <error line="111" column="1" source="standard:max-line-length" />
-        <error line="132" column="1" source="standard:max-line-length" />
-        <error line="153" column="1" source="standard:max-line-length" />
-        <error line="174" column="1" source="standard:max-line-length" />
-        <error line="195" column="1" source="standard:max-line-length" />
-        <error line="216" column="1" source="standard:max-line-length" />
-        <error line="237" column="1" source="standard:max-line-length" />
-        <error line="257" column="1" source="standard:max-line-length" />
-        <error line="282" column="1" source="standard:max-line-length" />
-        <error line="310" column="1" source="standard:max-line-length" />
-        <error line="326" column="1" source="standard:max-line-length" />
-        <error line="326" column="59" source="standard:wrapping" />
-        <error line="330" column="1" source="standard:max-line-length" />
-        <error line="330" column="52" source="standard:wrapping" />
-        <error line="336" column="1" source="standard:max-line-length" />
-        <error line="352" column="1" source="standard:max-line-length" />
-        <error line="352" column="58" source="standard:wrapping" />
-        <error line="356" column="1" source="standard:max-line-length" />
-        <error line="356" column="52" source="standard:wrapping" />
-        <error line="362" column="1" source="standard:max-line-length" />
-        <error line="394" column="1" source="standard:max-line-length" />
-        <error line="426" column="1" source="standard:max-line-length" />
-        <error line="446" column="1" source="standard:max-line-length" />
-        <error line="446" column="59" source="standard:wrapping" />
-        <error line="450" column="1" source="standard:max-line-length" />
-        <error line="450" column="52" source="standard:wrapping" />
-        <error line="456" column="1" source="standard:max-line-length" />
-        <error line="476" column="1" source="standard:max-line-length" />
-        <error line="476" column="58" source="standard:wrapping" />
-        <error line="480" column="1" source="standard:max-line-length" />
-        <error line="480" column="52" source="standard:wrapping" />
-        <error line="486" column="1" source="standard:max-line-length" />
-        <error line="507" column="1" source="standard:max-line-length" />
-        <error line="507" column="59" source="standard:wrapping" />
-        <error line="516" column="1" source="standard:max-line-length" />
-        <error line="537" column="1" source="standard:max-line-length" />
-        <error line="537" column="58" source="standard:wrapping" />
-        <error line="546" column="1" source="standard:max-line-length" />
-        <error line="574" column="1" source="standard:max-line-length" />
-        <error line="602" column="1" source="standard:max-line-length" />
-        <error line="626" column="1" source="standard:max-line-length" />
-        <error line="626" column="52" source="standard:wrapping" />
-        <error line="632" column="1" source="standard:max-line-length" />
-        <error line="656" column="1" source="standard:max-line-length" />
-        <error line="656" column="52" source="standard:wrapping" />
-        <error line="662" column="1" source="standard:max-line-length" />
-        <error line="687" column="1" source="standard:max-line-length" />
-        <error line="712" column="1" source="standard:max-line-length" />
-        <error line="727" column="1" source="standard:max-line-length" />
-        <error line="742" column="1" source="standard:max-line-length" />
-        <error line="768" column="1" source="standard:max-line-length" />
-        <error line="791" column="1" source="standard:max-line-length" />
-        <error line="814" column="1" source="standard:max-line-length" />
-        <error line="836" column="1" source="standard:max-line-length" />
-        <error line="850" column="1" source="standard:max-line-length" />
-        <error line="873" column="1" source="standard:max-line-length" />
-        <error line="896" column="1" source="standard:max-line-length" />
-        <error line="919" column="1" source="standard:max-line-length" />
-        <error line="942" column="1" source="standard:max-line-length" />
-        <error line="965" column="1" source="standard:max-line-length" />
-        <error line="987" column="1" source="standard:max-line-length" />
-        <error line="1000" column="1" source="standard:max-line-length" />
-        <error line="1016" column="1" source="standard:max-line-length" />
-        <error line="1020" column="1" source="standard:max-line-length" />
-        <error line="1026" column="1" source="standard:max-line-length" />
-        <error line="1038" column="1" source="standard:max-line-length" />
-        <error line="1054" column="1" source="standard:max-line-length" />
-        <error line="1058" column="1" source="standard:max-line-length" />
-        <error line="1064" column="1" source="standard:max-line-length" />
-        <error line="1076" column="1" source="standard:max-line-length" />
-        <error line="1106" column="1" source="standard:max-line-length" />
-        <error line="1127" column="1" source="standard:max-line-length" />
-        <error line="1148" column="1" source="standard:max-line-length" />
-        <error line="1169" column="1" source="standard:max-line-length" />
-        <error line="1190" column="1" source="standard:max-line-length" />
-        <error line="1209" column="1" source="standard:max-line-length" />
-        <error line="1248" column="1" source="standard:max-line-length" />
-        <error line="1268" column="1" source="standard:max-line-length" />
-        <error line="1291" column="1" source="standard:max-line-length" />
-        <error line="1312" column="1" source="standard:max-line-length" />
-        <error line="1324" column="1" source="standard:max-line-length" />
-        <error line="1336" column="1" source="standard:max-line-length" />
-        <error line="1350" column="1" source="standard:max-line-length" />
-        <error line="1364" column="1" source="standard:max-line-length" />
-        <error line="1386" column="1" source="standard:max-line-length" />
-        <error line="1410" column="1" source="standard:max-line-length" />
-        <error line="1432" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/search/toolbar/SearchSelectorToolbarActionTest.kt">
-        <error line="165" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt">
-        <error line="160" column="1" source="standard:max-line-length" />
-        <error line="237" column="1" source="standard:max-line-length" />
-        <error line="237" column="88" source="standard:argument-list-wrapping" />
-        <error line="237" column="123" source="standard:argument-list-wrapping" />
-        <error line="259" column="1" source="standard:max-line-length" />
-        <error line="259" column="94" source="standard:argument-list-wrapping" />
-        <error line="259" column="126" source="standard:argument-list-wrapping" />
-        <error line="303" column="1" source="standard:max-line-length" />
-        <error line="303" column="88" source="standard:argument-list-wrapping" />
-        <error line="303" column="123" source="standard:argument-list-wrapping" />
-        <error line="347" column="1" source="standard:max-line-length" />
-        <error line="347" column="87" source="standard:argument-list-wrapping" />
-        <error line="347" column="122" source="standard:argument-list-wrapping" />
-        <error line="428" column="1" source="standard:max-line-length" />
-        <error line="437" column="1" source="standard:max-line-length" />
-        <error line="446" column="1" source="standard:max-line-length" />
-        <error line="458" column="1" source="standard:max-line-length" />
-        <error line="470" column="1" source="standard:max-line-length" />
-        <error line="501" column="1" source="standard:max-line-length" />
-        <error line="532" column="1" source="standard:max-line-length" />
-        <error line="594" column="1" source="standard:max-line-length" />
-        <error line="625" column="1" source="standard:max-line-length" />
-        <error line="655" column="1" source="standard:max-line-length" />
-        <error line="684" column="1" source="standard:max-line-length" />
-        <error line="711" column="1" source="standard:max-line-length" />
-        <error line="738" column="1" source="standard:max-line-length" />
-        <error line="760" column="1" source="standard:max-line-length" />
-        <error line="782" column="1" source="standard:max-line-length" />
-        <error line="816" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/session/PrivateNotificationServiceTest.kt">
-        <error line="58" column="1" source="standard:max-line-length" />
-        <error line="58" column="52" source="standard:argument-list-wrapping" />
-        <error line="58" column="87" source="standard:argument-list-wrapping" />
-        <error line="58" column="124" source="standard:argument-list-wrapping" />
-        <error line="73" column="1" source="standard:max-line-length" />
-        <error line="73" column="52" source="standard:argument-list-wrapping" />
-        <error line="73" column="87" source="standard:argument-list-wrapping" />
-        <error line="73" column="124" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/CustomEtpCookiesOptionsDropDownListPreferenceTest.kt">
-        <error line="24" column="1" source="standard:max-line-length" />
-        <error line="44" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/DropDownListPreferenceTest.kt">
-        <error line="32" column="1" source="standard:max-line-length" />
-        <error line="41" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/HomeSettingsFragmentTest.kt">
-        <error line="74" column="1" source="standard:max-line-length" />
-        <error line="85" column="1" source="standard:max-line-length" />
-        <error line="96" column="1" source="standard:max-line-length" />
-        <error line="105" column="1" source="standard:max-line-length" />
-        <error line="114" column="1" source="standard:max-line-length" />
-        <error line="125" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/PhoneFeatureTest.kt">
-        <error line="78" column="1" source="standard:max-line-length" />
-        <error line="78" column="22" source="standard:argument-list-wrapping" />
-        <error line="78" column="77" source="standard:argument-list-wrapping" />
-        <error line="78" column="124" source="standard:argument-list-wrapping" />
-        <error line="79" column="1" source="standard:max-line-length" />
-        <error line="79" column="22" source="standard:argument-list-wrapping" />
-        <error line="79" column="79" source="standard:argument-list-wrapping" />
-        <error line="79" column="128" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/PreferenceBackedRadioButtonTest.kt">
-        <error line="67" column="1" source="standard:max-line-length" />
-        <error line="95" column="1" source="standard:max-line-length" />
-        <error line="118" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/SettingsFragmentTest.kt">
-        <error line="246" column="1" source="standard:max-line-length" />
-        <error line="263" column="1" source="standard:max-line-length" />
-        <error line="279" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt">
-        <error line="22" column="1" source="standard:max-line-length" />
-        <error line="22" column="45" source="standard:argument-list-wrapping" />
-        <error line="22" column="65" source="standard:argument-list-wrapping" />
-        <error line="22" column="112" source="standard:argument-list-wrapping" />
-        <error line="22" column="119" source="standard:argument-list-wrapping" />
-        <error line="22" column="125" source="standard:argument-list-wrapping" />
-        <error line="22" column="129" source="standard:argument-list-wrapping" />
-        <error line="22" column="130" source="standard:argument-list-wrapping" />
-        <error line="26" column="1" source="standard:max-line-length" />
-        <error line="26" column="45" source="standard:argument-list-wrapping" />
-        <error line="26" column="65" source="standard:argument-list-wrapping" />
-        <error line="26" column="109" source="standard:argument-list-wrapping" />
-        <error line="26" column="121" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsInteractorTest.kt">
-        <error line="78" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/address/AddressEditorViewTest.kt">
-        <error line="124" column="1" source="standard:max-line-length" />
-        <error line="162" column="1" source="standard:max-line-length" />
-        <error line="178" column="1" source="standard:max-line-length" />
-        <error line="192" column="1" source="standard:max-line-length" />
-        <error line="206" column="1" source="standard:max-line-length" />
-        <error line="230" column="1" source="standard:max-line-length" />
-        <error line="258" column="1" source="standard:max-line-length" />
-        <error line="269" column="1" source="standard:max-line-length" />
-        <error line="269" column="22" source="standard:argument-list-wrapping" />
-        <error line="269" column="77" source="standard:argument-list-wrapping" />
-        <error line="269" column="124" source="standard:argument-list-wrapping" />
-        <error line="273" column="1" source="standard:max-line-length" />
-        <error line="286" column="1" source="standard:max-line-length" />
-        <error line="295" column="1" source="standard:max-line-length" />
-        <error line="295" column="22" source="standard:argument-list-wrapping" />
-        <error line="295" column="77" source="standard:argument-list-wrapping" />
-        <error line="295" column="124" source="standard:argument-list-wrapping" />
-        <error line="308" column="1" source="standard:max-line-length" />
-        <error line="308" column="22" source="standard:argument-list-wrapping" />
-        <error line="308" column="77" source="standard:argument-list-wrapping" />
-        <error line="308" column="124" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/address/controller/DefaultAddressEditorControllerTest.kt">
-        <error line="54" column="1" source="standard:max-line-length" />
-        <error line="79" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/advanced/LocaleViewHoldersTest.kt">
-        <error line="74" column="1" source="standard:max-line-length" />
-        <error line="84" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/autofill/AutofillFragmentStoreTest.kt">
-        <error line="40" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragmentTest.kt">
-        <error line="63" column="1" source="standard:max-line-length" />
-        <error line="85" column="1" source="standard:max-line-length" />
-        <error line="113" column="1" source="standard:max-line-length" />
-        <error line="144" column="1" source="standard:max-line-length" />
-        <error line="173" column="1" source="standard:max-line-length" />
-        <error line="187" column="1" source="standard:max-line-length" />
-        <error line="215" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorViewTest.kt">
-        <error line="106" column="1" source="standard:max-line-length" />
-        <error line="214" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/logins/SavedLoginsInteractorTest.kt">
-        <error line="34" column="1" source="standard:max-line-length" />
-        <error line="44" column="1" source="standard:max-line-length" />
-        <error line="54" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/logins/SyncPreferenceViewTest.kt">
-        <error line="62" column="1" source="standard:max-line-length" />
-        <error line="62" column="20" source="standard:wrapping" />
-        <error line="63" column="1" source="standard:max-line-length" />
-        <error line="68" column="1" source="standard:max-line-length" />
-        <error line="102" column="1" source="standard:max-line-length" />
-        <error line="102" column="86" source="standard:argument-list-wrapping" />
-        <error line="102" column="129" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt">
-        <error line="149" column="1" source="standard:max-line-length" />
-        <error line="359" column="1" source="standard:max-line-length" />
-        <error line="385" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentStoreTest.kt">
-        <error line="309" column="1" source="standard:max-line-length" />
-        <error line="309" column="26" source="standard:argument-list-wrapping" />
-        <error line="309" column="47" source="standard:argument-list-wrapping" />
-        <error line="309" column="125" source="standard:argument-list-wrapping" />
-        <error line="311" column="1" source="standard:max-line-length" />
-        <error line="311" column="26" source="standard:argument-list-wrapping" />
-        <error line="311" column="51" source="standard:argument-list-wrapping" />
-        <error line="311" column="126" source="standard:argument-list-wrapping" />
-        <error line="312" column="1" source="standard:max-line-length" />
-        <error line="312" column="26" source="standard:argument-list-wrapping" />
-        <error line="312" column="48" source="standard:argument-list-wrapping" />
-        <error line="312" column="123" source="standard:argument-list-wrapping" />
-        <error line="313" column="1" source="standard:max-line-length" />
-        <error line="313" column="26" source="standard:argument-list-wrapping" />
-        <error line="313" column="57" source="standard:argument-list-wrapping" />
-        <error line="313" column="102" source="standard:argument-list-wrapping" />
-        <error line="313" column="121" source="standard:argument-list-wrapping" />
-        <error line="313" column="141" source="standard:argument-list-wrapping" />
-        <error line="316" column="1" source="standard:max-line-length" />
-        <error line="316" column="26" source="standard:argument-list-wrapping" />
-        <error line="316" column="51" source="standard:argument-list-wrapping" />
-        <error line="316" column="133" source="standard:argument-list-wrapping" />
-        <error line="319" column="1" source="standard:max-line-length" />
-        <error line="319" column="26" source="standard:argument-list-wrapping" />
-        <error line="319" column="51" source="standard:argument-list-wrapping" />
-        <error line="319" column="127" source="standard:argument-list-wrapping" />
-        <error line="320" column="1" source="standard:max-line-length" />
-        <error line="320" column="26" source="standard:argument-list-wrapping" />
-        <error line="320" column="58" source="standard:argument-list-wrapping" />
-        <error line="320" column="103" source="standard:argument-list-wrapping" />
-        <error line="320" column="126" source="standard:argument-list-wrapping" />
-        <error line="320" column="137" source="standard:argument-list-wrapping" />
-        <error line="322" column="1" source="standard:max-line-length" />
-        <error line="322" column="26" source="standard:argument-list-wrapping" />
-        <error line="322" column="51" source="standard:argument-list-wrapping" />
-        <error line="322" column="130" source="standard:argument-list-wrapping" />
-        <error line="323" column="1" source="standard:max-line-length" />
-        <error line="323" column="26" source="standard:argument-list-wrapping" />
-        <error line="323" column="57" source="standard:argument-list-wrapping" />
-        <error line="323" column="102" source="standard:argument-list-wrapping" />
-        <error line="323" column="125" source="standard:argument-list-wrapping" />
-        <error line="323" column="145" source="standard:argument-list-wrapping" />
-        <error line="326" column="1" source="standard:max-line-length" />
-        <error line="326" column="26" source="standard:argument-list-wrapping" />
-        <error line="326" column="53" source="standard:argument-list-wrapping" />
-        <error line="326" column="98" source="standard:argument-list-wrapping" />
-        <error line="326" column="123" source="standard:argument-list-wrapping" />
-        <error line="326" column="137" source="standard:argument-list-wrapping" />
-        <error line="327" column="1" source="standard:max-line-length" />
-        <error line="327" column="26" source="standard:argument-list-wrapping" />
-        <error line="327" column="53" source="standard:argument-list-wrapping" />
-        <error line="327" column="98" source="standard:argument-list-wrapping" />
-        <error line="327" column="123" source="standard:argument-list-wrapping" />
-        <error line="327" column="131" source="standard:argument-list-wrapping" />
-        <error line="328" column="1" source="standard:max-line-length" />
-        <error line="328" column="26" source="standard:argument-list-wrapping" />
-        <error line="328" column="51" source="standard:argument-list-wrapping" />
-        <error line="328" column="96" source="standard:argument-list-wrapping" />
-        <error line="328" column="121" source="standard:argument-list-wrapping" />
-        <error line="328" column="132" source="standard:argument-list-wrapping" />
-        <error line="329" column="1" source="standard:max-line-length" />
-        <error line="329" column="26" source="standard:argument-list-wrapping" />
-        <error line="329" column="48" source="standard:argument-list-wrapping" />
-        <error line="329" column="129" source="standard:argument-list-wrapping" />
-        <error line="330" column="1" source="standard:max-line-length" />
-        <error line="330" column="26" source="standard:argument-list-wrapping" />
-        <error line="330" column="57" source="standard:argument-list-wrapping" />
-        <error line="330" column="102" source="standard:argument-list-wrapping" />
-        <error line="330" column="127" source="standard:argument-list-wrapping" />
-        <error line="330" column="147" source="standard:argument-list-wrapping" />
-        <error line="333" column="1" source="standard:max-line-length" />
-        <error line="333" column="26" source="standard:argument-list-wrapping" />
-        <error line="333" column="49" source="standard:argument-list-wrapping" />
-        <error line="333" column="129" source="standard:argument-list-wrapping" />
-        <error line="334" column="1" source="standard:max-line-length" />
-        <error line="334" column="26" source="standard:argument-list-wrapping" />
-        <error line="334" column="49" source="standard:argument-list-wrapping" />
-        <error line="334" column="123" source="standard:argument-list-wrapping" />
-        <error line="335" column="1" source="standard:max-line-length" />
-        <error line="335" column="26" source="standard:argument-list-wrapping" />
-        <error line="335" column="51" source="standard:argument-list-wrapping" />
-        <error line="335" column="128" source="standard:argument-list-wrapping" />
-        <error line="336" column="1" source="standard:max-line-length" />
-        <error line="336" column="26" source="standard:argument-list-wrapping" />
-        <error line="336" column="48" source="standard:argument-list-wrapping" />
-        <error line="336" column="125" source="standard:argument-list-wrapping" />
-        <error line="337" column="1" source="standard:max-line-length" />
-        <error line="337" column="26" source="standard:argument-list-wrapping" />
-        <error line="337" column="57" source="standard:argument-list-wrapping" />
-        <error line="337" column="102" source="standard:argument-list-wrapping" />
-        <error line="337" column="123" source="standard:argument-list-wrapping" />
-        <error line="337" column="143" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/quicksettings/ext/PhoneFeatureExtKtTest.kt">
-        <error line="65" column="1" source="standard:max-line-length" />
-        <error line="65" column="21" source="standard:argument-list-wrapping" />
-        <error line="65" column="57" source="standard:argument-list-wrapping" />
-        <error line="65" column="90" source="standard:argument-list-wrapping" />
-        <error line="65" column="115" source="standard:argument-list-wrapping" />
-        <error line="65" column="122" source="standard:argument-list-wrapping" />
-        <error line="65" column="123" source="standard:argument-list-wrapping" />
-        <error line="66" column="1" source="standard:max-line-length" />
-        <error line="66" column="21" source="standard:argument-list-wrapping" />
-        <error line="66" column="121" source="standard:argument-list-wrapping" />
-        <error line="70" column="1" source="standard:max-line-length" />
-        <error line="70" column="21" source="standard:argument-list-wrapping" />
-        <error line="70" column="57" source="standard:argument-list-wrapping" />
-        <error line="70" column="89" source="standard:argument-list-wrapping" />
-        <error line="70" column="114" source="standard:argument-list-wrapping" />
-        <error line="70" column="121" source="standard:argument-list-wrapping" />
-        <error line="70" column="122" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsViewTest.kt">
-        <error line="90" column="1" source="standard:max-line-length" />
-        <error line="108" column="1" source="standard:max-line-length" />
-        <error line="125" column="1" source="standard:max-line-length" />
-        <error line="159" column="1" source="standard:max-line-length" />
-        <error line="172" column="1" source="standard:max-line-length" />
-        <error line="186" column="1" source="standard:max-line-length" />
-        <error line="201" column="1" source="standard:max-line-length" />
-        <error line="208" column="1" source="standard:max-line-length" />
-        <error line="215" column="1" source="standard:max-line-length" />
-        <error line="235" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/DefaultCookieBannerDetailsControllerTest.kt">
-        <error line="148" column="1" source="standard:max-line-length" />
-        <error line="176" column="1" source="standard:max-line-length" />
-        <error line="224" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/search/SearchEngineFragmentTest.kt">
-        <error line="33" column="1" source="standard:max-line-length" />
-        <error line="57" column="1" source="standard:max-line-length" />
-        <error line="57" column="59" source="standard:argument-list-wrapping" />
-        <error line="57" column="81" source="standard:argument-list-wrapping" />
-        <error line="57" column="122" source="standard:argument-list-wrapping" />
-        <error line="57" column="123" source="standard:argument-list-wrapping" />
-        <error line="62" column="1" source="standard:max-line-length" />
-        <error line="62" column="59" source="standard:argument-list-wrapping" />
-        <error line="62" column="81" source="standard:argument-list-wrapping" />
-        <error line="62" column="123" source="standard:argument-list-wrapping" />
-        <error line="62" column="124" source="standard:argument-list-wrapping" />
-        <error line="67" column="1" source="standard:max-line-length" />
-        <error line="67" column="61" source="standard:argument-list-wrapping" />
-        <error line="67" column="83" source="standard:argument-list-wrapping" />
-        <error line="67" column="135" source="standard:argument-list-wrapping" />
-        <error line="67" column="136" source="standard:argument-list-wrapping" />
-        <error line="72" column="1" source="standard:max-line-length" />
-        <error line="72" column="59" source="standard:argument-list-wrapping" />
-        <error line="72" column="81" source="standard:argument-list-wrapping" />
-        <error line="72" column="122" source="standard:argument-list-wrapping" />
-        <error line="72" column="123" source="standard:argument-list-wrapping" />
-        <error line="87" column="1" source="standard:max-line-length" />
-        <error line="87" column="59" source="standard:argument-list-wrapping" />
-        <error line="87" column="81" source="standard:argument-list-wrapping" />
-        <error line="87" column="125" source="standard:argument-list-wrapping" />
-        <error line="87" column="126" source="standard:argument-list-wrapping" />
-        <error line="92" column="1" source="standard:max-line-length" />
-        <error line="92" column="59" source="standard:argument-list-wrapping" />
-        <error line="92" column="81" source="standard:argument-list-wrapping" />
-        <error line="92" column="125" source="standard:argument-list-wrapping" />
-        <error line="92" column="126" source="standard:argument-list-wrapping" />
-        <error line="97" column="1" source="standard:max-line-length" />
-        <error line="97" column="59" source="standard:argument-list-wrapping" />
-        <error line="97" column="81" source="standard:argument-list-wrapping" />
-        <error line="97" column="128" source="standard:argument-list-wrapping" />
-        <error line="97" column="129" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/search/SearchStringValidatorTest.kt">
-        <error line="37" column="1" source="standard:max-line-length" />
-        <error line="37" column="64" source="standard:argument-list-wrapping" />
-        <error line="37" column="72" source="standard:argument-list-wrapping" />
-        <error line="37" column="121" source="standard:argument-list-wrapping" />
-        <error line="63" column="1" source="standard:max-line-length" />
-        <error line="63" column="64" source="standard:argument-list-wrapping" />
-        <error line="63" column="72" source="standard:argument-list-wrapping" />
-        <error line="63" column="121" source="standard:argument-list-wrapping" />
-        <error line="72" column="1" source="standard:max-line-length" />
-        <error line="72" column="64" source="standard:argument-list-wrapping" />
-        <error line="72" column="72" source="standard:argument-list-wrapping" />
-        <error line="72" column="121" source="standard:argument-list-wrapping" />
-        <error line="86" column="1" source="standard:max-line-length" />
-        <error line="86" column="64" source="standard:argument-list-wrapping" />
-        <error line="86" column="72" source="standard:argument-list-wrapping" />
-        <error line="86" column="121" source="standard:argument-list-wrapping" />
-        <error line="100" column="1" source="standard:max-line-length" />
-        <error line="100" column="64" source="standard:argument-list-wrapping" />
-        <error line="100" column="72" source="standard:argument-list-wrapping" />
-        <error line="100" column="121" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragmentTest.kt">
-        <error line="134" column="1" source="standard:max-line-length" />
-        <error line="150" column="1" source="standard:max-line-length" />
-        <error line="166" column="1" source="standard:max-line-length" />
-        <error line="187" column="1" source="standard:max-line-length" />
-        <error line="208" column="1" source="standard:max-line-length" />
-        <error line="224" column="1" source="standard:max-line-length" />
-        <error line="240" column="1" source="standard:max-line-length" />
-        <error line="261" column="1" source="standard:max-line-length" />
-        <error line="282" column="1" source="standard:max-line-length" />
-        <error line="298" column="1" source="standard:max-line-length" />
-        <error line="314" column="1" source="standard:max-line-length" />
-        <error line="335" column="1" source="standard:max-line-length" />
-        <error line="356" column="1" source="standard:max-line-length" />
-        <error line="384" column="1" source="standard:max-line-length" />
-        <error line="412" column="1" source="standard:max-line-length" />
-        <error line="440" column="1" source="standard:max-line-length" />
-        <error line="468" column="1" source="standard:max-line-length" />
-        <error line="496" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsWifiIntegrationTest.kt">
-        <error line="47" column="1" source="standard:max-line-length" />
-        <error line="78" column="1" source="standard:max-line-length" />
-        <error line="92" column="1" source="standard:max-line-length" />
-        <error line="107" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/settings/wallpaper/ExtensionsTest.kt">
-        <error line="16" column="1" source="standard:max-line-length" />
-        <error line="19" column="1" source="standard:max-line-length" />
-        <error line="19" column="46" source="standard:wrapping" />
-        <error line="19" column="83" source="standard:argument-list-wrapping" />
-        <error line="19" column="116" source="standard:argument-list-wrapping" />
-        <error line="19" column="139" source="standard:argument-list-wrapping" />
-        <error line="38" column="1" source="standard:max-line-length" />
-        <error line="41" column="1" source="standard:max-line-length" />
-        <error line="41" column="56" source="standard:wrapping" />
-        <error line="41" column="93" source="standard:argument-list-wrapping" />
-        <error line="41" column="126" source="standard:argument-list-wrapping" />
-        <error line="41" column="149" source="standard:argument-list-wrapping" />
-        <error line="49" column="1" source="standard:max-line-length" />
-        <error line="59" column="1" source="standard:max-line-length" />
-        <error line="77" column="1" source="standard:max-line-length" />
-        <error line="79" column="1" source="standard:max-line-length" />
-        <error line="79" column="46" source="standard:wrapping" />
-        <error line="79" column="83" source="standard:argument-list-wrapping" />
-        <error line="79" column="116" source="standard:argument-list-wrapping" />
-        <error line="79" column="139" source="standard:argument-list-wrapping" />
-        <error line="91" column="1" source="standard:max-line-length" />
-        <error line="93" column="1" source="standard:max-line-length" />
-        <error line="93" column="33" source="standard:property-wrapping" />
-        <error line="93" column="70" source="standard:argument-list-wrapping" />
-        <error line="93" column="103" source="standard:argument-list-wrapping" />
-        <error line="93" column="127" source="standard:argument-list-wrapping" />
-        <error line="95" column="1" source="standard:max-line-length" />
-        <error line="95" column="33" source="standard:property-wrapping" />
-        <error line="95" column="70" source="standard:argument-list-wrapping" />
-        <error line="95" column="103" source="standard:argument-list-wrapping" />
-        <error line="95" column="127" source="standard:argument-list-wrapping" />
-        <error line="97" column="1" source="standard:max-line-length" />
-        <error line="97" column="34" source="standard:property-wrapping" />
-        <error line="97" column="71" source="standard:argument-list-wrapping" />
-        <error line="97" column="104" source="standard:argument-list-wrapping" />
-        <error line="97" column="128" source="standard:argument-list-wrapping" />
-        <error line="99" column="1" source="standard:max-line-length" />
-        <error line="99" column="33" source="standard:property-wrapping" />
-        <error line="99" column="70" source="standard:argument-list-wrapping" />
-        <error line="99" column="103" source="standard:argument-list-wrapping" />
-        <error line="99" column="127" source="standard:argument-list-wrapping" />
-        <error line="101" column="1" source="standard:max-line-length" />
-        <error line="101" column="34" source="standard:property-wrapping" />
-        <error line="101" column="71" source="standard:argument-list-wrapping" />
-        <error line="101" column="104" source="standard:argument-list-wrapping" />
-        <error line="101" column="128" source="standard:argument-list-wrapping" />
-        <error line="115" column="1" source="standard:max-line-length" />
-        <error line="117" column="1" source="standard:max-line-length" />
-        <error line="117" column="33" source="standard:property-wrapping" />
-        <error line="117" column="70" source="standard:argument-list-wrapping" />
-        <error line="117" column="102" source="standard:argument-list-wrapping" />
-        <error line="117" column="125" source="standard:argument-list-wrapping" />
-        <error line="140" column="1" source="standard:max-line-length" />
-        <error line="151" column="1" source="standard:max-line-length" />
-        <error line="153" column="1" source="standard:max-line-length" />
-        <error line="153" column="46" source="standard:wrapping" />
-        <error line="153" column="83" source="standard:argument-list-wrapping" />
-        <error line="153" column="116" source="standard:argument-list-wrapping" />
-        <error line="153" column="139" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/share/SaveToPDFMiddlewareTest.kt">
-        <error line="58" column="1" source="standard:max-line-length" />
-        <error line="104" column="1" source="standard:max-line-length" />
-        <error line="148" column="1" source="standard:max-line-length" />
-        <error line="256" column="1" source="standard:max-line-length" />
-        <error line="277" column="1" source="standard:max-line-length" />
-        <error line="322" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/shopping/ReviewQualityCheckFeatureTest.kt">
-        <error line="242" column="1" source="standard:max-line-length" />
-        <error line="299" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/shopping/middleware/DefaultReviewQualityCheckServiceTest.kt">
-        <error line="41" column="1" source="standard:max-line-length" />
-        <error line="128" column="1" source="standard:max-line-length" />
-        <error line="159" column="1" source="standard:max-line-length" />
-        <error line="188" column="1" source="standard:max-line-length" />
-        <error line="245" column="1" source="standard:max-line-length" />
-        <error line="281" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt">
-        <error line="56" column="1" source="standard:max-line-length" />
-        <error line="174" column="1" source="standard:max-line-length" />
-        <error line="339" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckTelemetryMiddlewareTest.kt">
-        <error line="92" column="1" source="standard:max-line-length" />
-        <error line="100" column="1" source="standard:max-line-length" />
-        <error line="116" column="1" source="standard:max-line-length" />
-        <error line="132" column="1" source="standard:max-line-length" />
-        <error line="150" column="1" source="standard:max-line-length" />
-        <error line="236" column="1" source="standard:max-line-length" />
-        <error line="244" column="1" source="standard:max-line-length" />
-        <error line="252" column="1" source="standard:max-line-length" />
-        <error line="278" column="1" source="standard:max-line-length" />
-        <error line="303" column="1" source="standard:max-line-length" />
-        <error line="327" column="1" source="standard:max-line-length" />
-        <error line="358" column="1" source="standard:max-line-length" />
-        <error line="397" column="1" source="standard:max-line-length" />
-        <error line="459" column="1" source="standard:max-line-length" />
-        <error line="480" column="1" source="standard:max-line-length" />
-        <error line="501" column="1" source="standard:max-line-length" />
-        <error line="501" column="85" source="standard:parameter-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStateTest.kt">
-        <error line="19" column="1" source="standard:max-line-length" />
-        <error line="89" column="1" source="standard:max-line-length" />
-        <error line="122" column="1" source="standard:max-line-length" />
-        <error line="159" column="1" source="standard:max-line-length" />
-        <error line="172" column="1" source="standard:max-line-length" />
-        <error line="188" column="1" source="standard:max-line-length" />
-        <error line="205" column="1" source="standard:max-line-length" />
-        <error line="236" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStoreTest.kt">
-        <error line="55" column="1" source="standard:max-line-length" />
-        <error line="136" column="1" source="standard:max-line-length" />
-        <error line="164" column="1" source="standard:max-line-length" />
-        <error line="189" column="1" source="standard:max-line-length" />
-        <error line="224" column="1" source="standard:max-line-length" />
-        <error line="267" column="1" source="standard:max-line-length" />
-        <error line="310" column="1" source="standard:max-line-length" />
-        <error line="353" column="1" source="standard:max-line-length" />
-        <error line="555" column="1" source="standard:max-line-length" />
-        <error line="592" column="1" source="standard:max-line-length" />
-        <error line="636" column="1" source="standard:max-line-length" />
-        <error line="664" column="1" source="standard:max-line-length" />
-        <error line="690" column="1" source="standard:max-line-length" />
-        <error line="823" column="1" source="standard:max-line-length" />
-        <error line="863" column="1" source="standard:max-line-length" />
-        <error line="936" column="1" source="standard:max-line-length" />
-        <error line="1126" column="1" source="standard:max-line-length" />
-        <error line="1293" column="1" source="standard:max-line-length" />
-        <error line="1338" column="1" source="standard:max-line-length" />
-        <error line="1381" column="1" source="standard:max-line-length" />
-        <error line="1416" column="1" source="standard:max-line-length" />
-        <error line="1457" column="1" source="standard:max-line-length" />
-        <error line="1498" column="1" source="standard:max-line-length" />
-        <error line="1541" column="1" source="standard:max-line-length" />
-        <error line="1574" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/sync/ext/SyncedDeviceTabsTest.kt">
-        <error line="95" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt">
-        <error line="196" column="1" source="standard:max-line-length" />
-        <error line="223" column="1" source="standard:max-line-length" />
-        <error line="257" column="1" source="standard:max-line-length" />
-        <error line="271" column="1" source="standard:max-line-length" />
-        <error line="278" column="1" source="standard:max-line-length" />
-        <error line="300" column="1" source="standard:max-line-length" />
-        <error line="315" column="1" source="standard:max-line-length" />
-        <error line="328" column="1" source="standard:max-line-length" />
-        <error line="340" column="1" source="standard:max-line-length" />
-        <error line="367" column="1" source="standard:max-line-length" />
-        <error line="393" column="1" source="standard:max-line-length" />
-        <error line="422" column="1" source="standard:max-line-length" />
-        <error line="451" column="1" source="standard:max-line-length" />
-        <error line="472" column="1" source="standard:max-line-length" />
-        <error line="493" column="1" source="standard:max-line-length" />
-        <error line="510" column="1" source="standard:max-line-length" />
-        <error line="526" column="1" source="standard:max-line-length" />
-        <error line="572" column="1" source="standard:max-line-length" />
-        <error line="598" column="1" source="standard:max-line-length" />
-        <error line="626" column="1" source="standard:max-line-length" />
-        <error line="657" column="1" source="standard:max-line-length" />
-        <error line="688" column="1" source="standard:max-line-length" />
-        <error line="711" column="1" source="standard:max-line-length" />
-        <error line="739" column="1" source="standard:max-line-length" />
-        <error line="777" column="1" source="standard:max-line-length" />
-        <error line="789" column="1" source="standard:max-line-length" />
-        <error line="848" column="1" source="standard:max-line-length" />
-        <error line="904" column="1" source="standard:max-line-length" />
-        <error line="930" column="1" source="standard:max-line-length" />
-        <error line="974" column="1" source="standard:max-line-length" />
-        <error line="975" column="1" source="standard:max-line-length" />
-        <error line="975" column="25" source="standard:property-wrapping" />
-        <error line="975" column="42" source="standard:argument-list-wrapping" />
-        <error line="975" column="113" source="standard:argument-list-wrapping" />
-        <error line="975" column="130" source="standard:argument-list-wrapping" />
-        <error line="976" column="1" source="standard:max-line-length" />
-        <error line="976" column="25" source="standard:property-wrapping" />
-        <error line="976" column="42" source="standard:argument-list-wrapping" />
-        <error line="976" column="111" source="standard:argument-list-wrapping" />
-        <error line="976" column="128" source="standard:argument-list-wrapping" />
-        <error line="1005" column="1" source="standard:max-line-length" />
-        <error line="1066" column="1" source="standard:max-line-length" />
-        <error line="1084" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayInteractorTest.kt">
-        <error line="144" column="1" source="standard:max-line-length" />
-        <error line="151" column="1" source="standard:max-line-length" />
-        <error line="158" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt">
-        <error line="126" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/tabstray/SecureTabsTrayBindingTest.kt">
-        <error line="68" column="1" source="standard:max-line-length" />
-        <error line="87" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/tabstray/TabSheetBehaviorManagerTest.kt">
-        <error line="71" column="1" source="standard:max-line-length" />
-        <error line="134" column="1" source="standard:max-line-length" />
-        <error line="160" column="1" source="standard:max-line-length" />
-        <error line="192" column="1" source="standard:max-line-length" />
-        <error line="225" column="1" source="standard:max-line-length" />
-        <error line="256" column="1" source="standard:max-line-length" />
-        <error line="280" column="1" source="standard:max-line-length" />
-        <error line="312" column="1" source="standard:max-line-length" />
-        <error line="342" column="1" source="standard:max-line-length" />
-        <error line="372" column="1" source="standard:max-line-length" />
-        <error line="385" column="1" source="standard:max-line-length" />
-        <error line="428" column="1" source="standard:max-line-length" />
-        <error line="443" column="1" source="standard:max-line-length" />
-        <error line="458" column="1" source="standard:max-line-length" />
-        <error line="473" column="1" source="standard:max-line-length" />
-        <error line="488" column="1" source="standard:max-line-length" />
-        <error line="503" column="1" source="standard:max-line-length" />
-        <error line="518" column="1" source="standard:max-line-length" />
-        <error line="533" column="1" source="standard:max-line-length" />
-        <error line="548" column="1" source="standard:max-line-length" />
-        <error line="563" column="1" source="standard:max-line-length" />
-        <error line="579" column="1" source="standard:max-line-length" />
-        <error line="595" column="1" source="standard:max-line-length" />
-        <error line="611" column="1" source="standard:max-line-length" />
-        <error line="627" column="1" source="standard:max-line-length" />
-        <error line="643" column="1" source="standard:max-line-length" />
-        <error line="659" column="1" source="standard:max-line-length" />
-        <error line="678" column="1" source="standard:max-line-length" />
-        <error line="746" column="1" source="standard:max-line-length" />
-        <error line="771" column="1" source="standard:max-line-length" />
-        <error line="796" column="1" source="standard:max-line-length" />
-        <error line="821" column="1" source="standard:max-line-length" />
-        <error line="847" column="1" source="standard:max-line-length" />
-        <error line="873" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt">
-        <error line="93" column="1" source="standard:max-line-length" />
-        <error line="126" column="1" source="standard:max-line-length" />
-        <error line="158" column="1" source="standard:max-line-length" />
-        <error line="191" column="1" source="standard:max-line-length" />
-        <error line="291" column="1" source="standard:max-line-length" />
-        <error line="306" column="1" source="standard:max-line-length" />
-        <error line="317" column="1" source="standard:max-line-length" />
-        <error line="339" column="1" source="standard:max-line-length" />
-        <error line="350" column="1" source="standard:max-line-length" />
-        <error line="351" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayStateTest.kt">
-        <error line="46" column="1" source="standard:max-line-length" />
-        <error line="67" column="1" source="standard:max-line-length" />
-        <error line="83" column="1" source="standard:max-line-length" />
-        <error line="99" column="1" source="standard:max-line-length" />
-        <error line="128" column="1" source="standard:max-line-length" />
-        <error line="145" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolderTest.kt">
-        <error line="89" column="1" source="standard:max-line-length" />
-        <error line="126" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsViewErrorTypeTest.kt">
-        <error line="23" column="1" source="standard:max-line-length" />
-        <error line="26" column="1" source="standard:max-line-length" />
-        <error line="26" column="117" source="standard:argument-list-wrapping" />
-        <error line="26" column="126" source="standard:argument-list-wrapping" />
-        <error line="26" column="139" source="standard:argument-list-wrapping" />
-        <error line="27" column="1" source="standard:max-line-length" />
-        <error line="27" column="107" source="standard:argument-list-wrapping" />
-        <error line="27" column="116" source="standard:argument-list-wrapping" />
-        <error line="27" column="129" source="standard:argument-list-wrapping" />
-        <error line="28" column="1" source="standard:max-line-length" />
-        <error line="28" column="115" source="standard:argument-list-wrapping" />
-        <error line="28" column="124" source="standard:argument-list-wrapping" />
-        <error line="28" column="137" source="standard:argument-list-wrapping" />
-        <error line="32" column="1" source="standard:max-line-length" />
-        <error line="32" column="22" source="standard:argument-list-wrapping" />
-        <error line="32" column="90" source="standard:argument-list-wrapping" />
-        <error line="32" column="126" source="standard:argument-list-wrapping" />
-        <error line="38" column="1" source="standard:max-line-length" />
-        <error line="38" column="22" source="standard:argument-list-wrapping" />
-        <error line="38" column="82" source="standard:argument-list-wrapping" />
-        <error line="38" column="122" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt">
-        <error line="103" column="1" source="standard:max-line-length" />
-        <error line="137" column="1" source="standard:max-line-length" />
-        <error line="148" column="1" source="standard:max-line-length" />
-        <error line="372" column="1" source="standard:max-line-length" />
-        <error line="372" column="36" source="standard:argument-list-wrapping" />
-        <error line="372" column="42" source="standard:argument-list-wrapping" />
-        <error line="372" column="51" source="standard:argument-list-wrapping" />
-        <error line="372" column="82" source="standard:argument-list-wrapping" />
-        <error line="372" column="108" source="standard:argument-list-wrapping" />
-        <error line="372" column="126" source="standard:argument-list-wrapping" />
-        <error line="372" column="127" source="standard:argument-list-wrapping" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionBlockingFragmentTest.kt">
-        <error line="25" column="1" source="standard:max-line-length" />
-        <error line="43" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/translations/preferences/downloadlanguages/DownloadLanguagesFeatureTest.kt">
-        <error line="77" column="1" source="standard:max-line-length" />
-        <error line="90" column="1" source="standard:max-line-length" />
-        <error line="103" column="1" source="standard:max-line-length" />
-        <error line="116" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/utils/ClipboardHandlerTest.kt">
-        <error line="84" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt">
-        <error line="720" column="1" source="standard:max-line-length" />
-        <error line="738" column="1" source="standard:max-line-length" />
-        <error line="754" column="1" source="standard:max-line-length" />
-        <error line="773" column="1" source="standard:max-line-length" />
-        <error line="801" column="1" source="standard:max-line-length" />
-        <error line="809" column="1" source="standard:max-line-length" />
-        <error line="814" column="1" source="standard:max-line-length" />
-        <error line="822" column="1" source="standard:max-line-length" />
-        <error line="867" column="1" source="standard:max-line-length" />
-        <error line="906" column="1" source="standard:max-line-length" />
-        <error line="956" column="1" source="standard:max-line-length" />
-        <error line="971" column="1" source="standard:max-line-length" />
-        <error line="986" column="1" source="standard:max-line-length" />
-        <error line="1000" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/wallpapers/LegacyWallpaperMigrationTest.kt">
-        <error line="65" column="1" source="standard:max-line-length" />
-        <error line="85" column="1" source="standard:max-line-length" />
-        <error line="138" column="1" source="standard:max-line-length" />
-        <error line="159" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperDownloaderTest.kt">
-        <error line="59" column="1" source="standard:max-line-length" />
-        <error line="79" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperTest.kt">
-        <error line="20" column="1" source="standard:max-line-length" />
-        <error line="27" column="1" source="standard:max-line-length" />
-        <error line="34" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/wallpapers/WallpapersUseCasesTest.kt">
-        <error line="129" column="1" source="standard:max-line-length" />
-        <error line="159" column="1" source="standard:max-line-length" />
-        <error line="189" column="1" source="standard:max-line-length" />
-        <error line="215" column="1" source="standard:max-line-length" />
-        <error line="220" column="1" source="standard:max-line-length" />
-        <error line="245" column="1" source="standard:max-line-length" />
-        <error line="270" column="1" source="standard:max-line-length" />
-        <error line="301" column="1" source="standard:max-line-length" />
-        <error line="328" column="1" source="standard:max-line-length" />
-        <error line="352" column="1" source="standard:max-line-length" />
-        <error line="382" column="1" source="standard:max-line-length" />
-        <error line="404" column="1" source="standard:max-line-length" />
-        <error line="421" column="1" source="standard:max-line-length" />
-        <error line="421" column="17" source="standard:wrapping" />
-        <error line="421" column="40" source="standard:argument-list-wrapping" />
-        <error line="421" column="95" source="standard:argument-list-wrapping" />
-        <error line="421" column="114" source="standard:argument-list-wrapping" />
-        <error line="421" column="150" source="standard:argument-list-wrapping" />
-        <error line="421" column="151" source="standard:argument-list-wrapping" />
-        <error line="422" column="1" source="standard:max-line-length" />
-        <error line="422" column="17" source="standard:wrapping" />
-        <error line="422" column="40" source="standard:argument-list-wrapping" />
-        <error line="422" column="95" source="standard:argument-list-wrapping" />
-        <error line="422" column="114" source="standard:argument-list-wrapping" />
-        <error line="422" column="149" source="standard:argument-list-wrapping" />
-        <error line="422" column="150" source="standard:argument-list-wrapping" />
-        <error line="428" column="1" source="standard:max-line-length" />
-        <error line="445" column="1" source="standard:max-line-length" />
-        <error line="445" column="17" source="standard:wrapping" />
-        <error line="445" column="40" source="standard:argument-list-wrapping" />
-        <error line="445" column="95" source="standard:argument-list-wrapping" />
-        <error line="445" column="114" source="standard:argument-list-wrapping" />
-        <error line="445" column="150" source="standard:argument-list-wrapping" />
-        <error line="445" column="151" source="standard:argument-list-wrapping" />
-        <error line="446" column="1" source="standard:max-line-length" />
-        <error line="446" column="17" source="standard:wrapping" />
-        <error line="446" column="40" source="standard:argument-list-wrapping" />
-        <error line="446" column="95" source="standard:argument-list-wrapping" />
-        <error line="446" column="114" source="standard:argument-list-wrapping" />
-        <error line="446" column="144" source="standard:argument-list-wrapping" />
-        <error line="446" column="145" source="standard:argument-list-wrapping" />
-        <error line="451" column="1" source="standard:max-line-length" />
-        <error line="475" column="1" source="standard:max-line-length" />
-        <error line="499" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/widget/SearchWidgetProviderTest.kt">
-        <error line="145" column="1" source="standard:max-line-length" />
-    </file>
-    <file name="app/src/test/java/org/mozilla/fenix/wifi/WifiConnectionMonitorTest.kt">
-        <error line="176" column="1" source="standard:max-line-length" />
+    <file name="app/src/test/java/org/mozilla/fenix/home/recentvisits/view/RecentBookmarksViewHolderTest.kt">
+        <error line="36" column="6" source="standard:block-comment-initial-star-alignment" />
     </file>
 </baseline>

From ee0340a67300cc44d007c7c18d41a405c9427042 Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Mon, 29 Jan 2024 17:23:02 -0500
Subject: [PATCH 054/222] Revert "Bug 1876419 - Move comment from editorconfig
 files"

This reverts commit f293b810969921ac6468f75a7915375c0c1cab4f.
---
 .editorconfig | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index fe4b8e6b7..35408b931 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,9 +1,7 @@
 [*.{kt,kts}]
 ij_kotlin_allow_trailing_comma_on_call_site=true
 ij_kotlin_allow_trailing_comma=true
-
-# Matches maxLineLength in detekt.yml
-max_line_length = 120
+max_line_length = 120 # Matches maxLineLength in detekt.yml
 
 [*]
 insert_final_newline = true

From 6ac615710bccf59d8af7a2f99d7cbd7a4e028d95 Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Mon, 29 Jan 2024 18:09:38 -0500
Subject: [PATCH 055/222] Revert "Bug 1875923 - Update max_line_length in
 editorconfig to match detekt"

---
 .editorconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 35408b931..7ea380af1 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,7 +1,6 @@
 [*.{kt,kts}]
 ij_kotlin_allow_trailing_comma_on_call_site=true
 ij_kotlin_allow_trailing_comma=true
-max_line_length = 120 # Matches maxLineLength in detekt.yml
 
 [*]
 insert_final_newline = true

From 667e5fb209432ea43f45df55dd803948ed43b720 Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Thu, 25 Jan 2024 14:38:51 +0000
Subject: [PATCH 056/222] Bug 1852224 - Prevent background media from being
 stopped when existing application from an external link.

---
 app/src/main/java/org/mozilla/fenix/HomeActivity.kt  |  3 ++-
 .../org/mozilla/fenix/perf/StartupPathProvider.kt    |  1 -
 .../mozilla/fenix/perf/StartupPathProviderTest.kt    | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index eaa4d725a..8ea4a4d8e 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -612,7 +612,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         privateNotificationObserver?.stop()
         components.notificationsDelegate.unBindActivity(this)
 
-        if (this !is ExternalAppBrowserActivity) {
+        val activityStartedWithLink = startupPathProvider.startupPathForActivity == StartupPathProvider.StartupPath.VIEW
+        if (this !is ExternalAppBrowserActivity && !activityStartedWithLink) {
             stopMediaSession()
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/perf/StartupPathProvider.kt b/app/src/main/java/org/mozilla/fenix/perf/StartupPathProvider.kt
index 1cd626306..d6b0abe1c 100644
--- a/app/src/main/java/org/mozilla/fenix/perf/StartupPathProvider.kt
+++ b/app/src/main/java/org/mozilla/fenix/perf/StartupPathProvider.kt
@@ -100,7 +100,6 @@ class StartupPathProvider {
 
         override fun onStop(owner: LifecycleOwner) {
             // Clear existing state.
-            startupPathForActivity = StartupPath.NOT_SET
             wasResumedSinceStartedState = false
         }
     }
diff --git a/app/src/test/java/org/mozilla/fenix/perf/StartupPathProviderTest.kt b/app/src/test/java/org/mozilla/fenix/perf/StartupPathProviderTest.kt
index 8d22d86d3..ad14ebc0c 100644
--- a/app/src/test/java/org/mozilla/fenix/perf/StartupPathProviderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/perf/StartupPathProviderTest.kt
@@ -108,12 +108,12 @@ class StartupPathProviderTest {
     }
 
     @Test
-    fun `GIVEN the app is launched to the homescreen and stopped WHEN getting the start up path THEN it is not set`() {
+    fun `GIVEN the app is launched to the homescreen with MAIN and stopped WHEN getting the start up path THEN it set to MAIN`() {
         every { intent.action } returns Intent.ACTION_MAIN
         launchApp(intent)
         stopLaunchedApp()
 
-        assertEquals(StartupPath.NOT_SET, provider.startupPathForActivity)
+        assertEquals(StartupPath.MAIN, provider.startupPathForActivity)
     }
 
     @Test
@@ -129,13 +129,13 @@ class StartupPathProviderTest {
     }
 
     @Test
-    fun `GIVEN the app is launched to the homescreen, stopped, and relaunched warm from the app switcher WHEN getting the start up path THEN it is not set`() {
+    fun `GIVEN the app is launched to the homescreen with MAIN, stopped, and relaunched warm from the app switcher WHEN getting the start up path THEN it set to MAIN'`() {
         every { intent.action } returns Intent.ACTION_MAIN
         launchApp(intent)
         stopLaunchedApp()
         startStoppedAppFromAppSwitcher()
 
-        assertEquals(StartupPath.NOT_SET, provider.startupPathForActivity)
+        assertEquals(StartupPath.MAIN, provider.startupPathForActivity)
     }
 
     @Test
@@ -159,7 +159,7 @@ class StartupPathProviderTest {
     }
 
     @Test
-    fun `GIVEN the app is launched, stopped, started from the app switcher and receives an intent in the foreground WHEN getting the start up path THEN it returns not set`() {
+    fun `GIVEN the app is launched with MAIN, stopped, started from the app switcher and receives an intent in the foreground WHEN getting the start up path THEN it returns MAIN`() {
         every { intent.action } returns Intent.ACTION_MAIN
         launchApp(intent)
         stopLaunchedApp()
@@ -167,7 +167,7 @@ class StartupPathProviderTest {
         every { intent.action } returns Intent.ACTION_VIEW
         receiveIntentInForeground(intent)
 
-        assertEquals(StartupPath.NOT_SET, provider.startupPathForActivity)
+        assertEquals(StartupPath.MAIN, provider.startupPathForActivity)
     }
 
     private fun launchApp(intent: Intent) {

From 4dfa789597397a10ca77be7fceb0d2843cb6428f Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Tue, 30 Jan 2024 00:03:16 +0000
Subject: [PATCH 057/222] Import translations from android-l10n

---
 app/src/main/res/values-fy-rNL/strings.xml | 47 ++++++++++++++++++++++
 app/src/main/res/values-th/strings.xml     | 36 +++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index fec73513a..cd565c898 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -1694,6 +1694,9 @@
     <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Bewarre wachtwurden</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">De oanmeldingen dy’t jo bewarje of syngronisearje mei %s wurde hjir toand.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">De wachtwurden dy’t jo bewarje of syngronisearje mei %s sille hjir fermeld wurde. Alle wachtwurden dy’t jo bewarje binne fersifere.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Mear ynfo oer Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
@@ -1702,12 +1705,18 @@
     <string name="preferences_passwords_exceptions">Utsûnderingen</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Net-bewarre oanmeldingen en wachtwurden wurde hjir werjûn.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s sil gjin wachtwurden foar de hjir fermelde websites bewarje.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Oanmeldingen en wachtwurden wurde foar dizze websites net bewarre. </string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s sil gjin wachtwurden foar dizze websites bewarje.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Alle útsûnderingen fuortsmite</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Oanmeldingen sykje</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Wachtwurden sykje</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Website</string>
     <!-- The header for the username for a login -->
@@ -1736,10 +1745,16 @@
     <string name="saved_login_hide_password">Wachtwurd ferstopje</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Untskoattelje om jo bewarre oanmeldingen te besjen</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Untskoattelje om jo bewarre wachtwurden te besjen</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Befeiligje jo oanmeldingen en wachtwurden</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Befeiligje jo bewarre wachtwurden</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre oanmeldingen en wachtwurden te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre wachtwurden te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Letter</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1776,6 +1791,8 @@
     <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Betellingsmetoaden bewarje en ynfolje</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Gegevens binne fersifere</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s fersiferet alle betellingsmetoaden dy’t jo bewarje</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Kaarten syngronisearje tusken apparaten</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1856,6 +1873,8 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre creditcards te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
 
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre kaarten te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">No ynstelle</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1866,6 +1885,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Untskoattelje om bewarre creditkaartynformaasje te brûken</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Untskoattelje om bewarre betellingsmetoaden te brûken</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adres tafoegje</string>
     <!-- Title of the "Edit address" screen -->
@@ -2003,30 +2024,52 @@
     <string name="login_menu_edit_button">Bewurkje</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Binne jo wis dat jo dizze oanmelding fuortsmite wolle?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Binne jo wis dat jo dit wachtwurd fuortsmite wolle?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Fuortsmite</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Annulearje</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Oanmeldopsjes</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Wachtwurdopsjes</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">It bewurkbere tekstfjild foar it webadres fan de oanmelding.</string>
+    <!--  The editable text field for a password's website address. -->
+    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">It bewurkbere tekstfjild foar it websiteadres fan it wachtwurd.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">It bewurkbere tekstfjild foar de brûkersnamme fan de oanmelding.</string>
+    <!--  The editable text field for a password's username. -->
+    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">It bewurkbere tekstfjild foar de brûkersnamme fan it wachtwurd.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">It bewurkbere tekstfjild foar it wachtwurd fan de oanmelding.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">It bewurkbere tekstfjild foar it wachtwurd.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Wizigingen oan oanmelding bewarje.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Wizigingen bewarje.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Bewurkje</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Wachtwurd bewurkje</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Nije oanmelding tafoegje</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Wachtwurd tafoegje</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Wachtwurd fereaske</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Folje in wachtwurd yn</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Brûkersnamme fereaske</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Folje in brûkersnamme yn</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hostnamme fereaske</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Fier in websiteadres yn</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Sprutsen sykopdracht</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2403,6 +2446,10 @@ Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen
     <string name="translation_option_bottom_sheet_never_translate_in_language">%1$s nea oersette</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Dizze website nea oersette</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Oerskriuwt alle oare ynstellingen</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Negearret oersetoanbiedingen</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Oersetynstellingen</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 481dcdaca..5dbb20346 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -2345,6 +2345,8 @@
     <!-- Action label for links to the Firefox Pocket website. Talkback will append this to say "Double tap to open link to learn more". -->
     <string name="a11y_action_label_pocket_learn_more">เปิดลิงก์เพื่อเรียนรู้เพิ่มเติม</string>
 
+    <!-- Content description for headings announced by accessibility service. The first parameter is the text of the heading. Talkback will announce the first parameter and then speak the word "Heading" indicating to the user that this text is a heading for a section. -->
+    <string name="a11y_heading">%s หัวเรื่อง</string>
     <!-- Title for dialog displayed when trying to access links present in a text. -->
     <string name="a11y_links_title">ลิงก์</string>
     <!-- Additional content description for text bodies that contain urls. -->
@@ -2376,6 +2378,22 @@
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">เกิดปัญหาในการแปล โปรดลองอีกครั้ง</string>
 
+    <!-- Translations options dialog -->
+    <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
+    <string name="translation_option_bottom_sheet_title">ตัวเลือกการแปล</string>
+    <!-- Toggle switch label that allows a user to set the setting if they would like the browser to always offer or suggest translations when available. -->
+    <string name="translation_option_bottom_sheet_always_translate">เสนอให้แปลอยู่เสมอ</string>
+    <!-- Toggle switch label that allows a user to set if they would like a given language to automatically translate or not. The first parameter is the language name, for example, "Spanish". -->
+    <string name="translation_option_bottom_sheet_always_translate_in_language">แปล %1$s เสมอ</string>
+    <!-- Toggle switch label that allows a user to set if they would like to never be offered a translation of the given language. The first parameter is the language name, for example, "Spanish". -->
+    <string name="translation_option_bottom_sheet_never_translate_in_language">ไม่ต้องแปล %1$s เลย</string>
+    <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
+    <string name="translation_option_bottom_sheet_never_translate_site">ไม่ต้องแปลไซต์นี้เลย</string>
+    <!-- Button text for the button that will take the user to the translation settings dialog. -->
+    <string name="translation_option_bottom_sheet_translation_settings">การตั้งค่าการแปล</string>
+    <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translation_option_bottom_sheet_about_translations">เกี่ยวกับการแปลใน %1$s</string>
+
     <!-- Translation settings dialog -->
     <!-- Title of the translation settings dialog that allows a user to set their preferred translation settings. -->
     <string name="translation_settings_toolbar_title">การแปล</string>
@@ -2396,17 +2414,29 @@
     <!-- Title of the automatic translation preference screen that will appear on the toolbar.-->
     <string name="automatic_translation_toolbar_title_preference">การแปลอัตโนมัติ</string>
 
+    <!-- Screen header presenting the automatic translation preference feature. It will appear under the toolbar. -->
+    <string name="automatic_translation_header_preference">เลือกภาษาที่จะจัดการการกำหนดลักษณะ ”แปลเสมอ“ และ ”ไม่แปลเสมอ“</string>
+
     <!-- Automatic translation options preference screen -->
     <!-- Preference option for offering to translate. Radio button title text.-->
     <string name="automatic_translation_option_offer_to_translate_title_preference">เสนอให้แปล (ค่าเริ่มต้น)</string>
+    <!-- Preference option for offering to translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_offer_to_translate_summary_preference">%1$s จะเสนอให้แปลไซต์เป็นภาษานี้</string>
     <!-- Preference option for always translate. Radio button title text. -->
     <string name="automatic_translation_option_always_translate_title_preference">แปลเสมอ</string>
+    <!-- Preference option for always translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_always_translate_summary_preference">%1$s จะแปลภาษานี้โดยอัตโนมัติเมื่อโหลดหน้าเว็บ</string>
     <!-- Preference option for never translate. Radio button title text.-->
     <string name="automatic_translation_option_never_translate_title_preference">ไม่ต้องแปล</string>
 
+    <!-- Preference option for never translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_never_translate_summary_preference">%1$s จะไม่เสนอให้แปลไซต์เป็นภาษานี้เลย</string>
+
     <!-- Never translate site preference screen -->
     <!-- Title of the never translate site preference screen that will appear on the toolbar.-->
     <string name="never_translate_site_toolbar_title_preference">ไม่ต้องแปลไซต์เหล่านี้</string>
+    <!-- Screen header presenting the never translate site preference feature. It will appear under the toolbar. -->
+    <string name="never_translate_site_header_preference">หากต้องการเพิ่มไซต์ใหม่: ให้ไปที่ไซต์นั้นแล้วเลือก “ไม่ต้องแปลไซต์นี้เลย” จากเมนูการแปล</string>
     <!-- Content description (not visible, for screen readers etc.): For a never-translated site list item that is selected.
              The first parameter is web site url (for example:"wikipedia.com") -->
     <string name="never_translate_site_item_list_content_description_preference">เอา %1$s ออก</string>
@@ -2421,12 +2451,18 @@
     <!-- Download languages preference screen -->
     <!-- Title of the download languages preference screen toolbar.-->
     <string name="download_languages_toolbar_title_preference">ดาวน์โหลดภาษา</string>
+    <!-- Screen header presenting the download language preference feature. It will appear under the toolbar.The first parameter is "Learn More," a clickable text with a link. Talkback will append this to say "Double tap to open link to learn more". -->
+    <string name="download_languages_header_preference">ดาวน์โหลดภาษาแบบสมบูรณ์เพื่อให้แปลได้เร็วขึ้นและแปลแบบออฟไลน์ได้ %1$s</string>
     <!-- Clickable text from the screen header that links to a website. -->
     <string name="download_languages_header_learn_more_preference">เรียนรู้เพิ่ม</string>
     <!-- The subhead of the download language preference screen will appear above the pivot language. -->
     <string name="download_languages_available_languages_preference">ภาษาที่มี</string>
     <!-- Text that will appear beside a core or pivot language package name to show that the language is necessary for the translation feature to function. -->
     <string name="download_languages_default_system_language_require_preference">จำเป็น</string>
+    <!-- A text for download language preference item.
+    The first parameter is the language name, for example, "Spanish".
+    The second parameter is the language file size, for example, "(3.91 KB)" or, if the language package name is a pivot language, "(required)". -->
+    <string name="download_languages_language_item_preference">%1$s (%2$s)</string>
     <!-- The subhead of the download language preference screen will appear above the items that were not downloaded. -->
     <string name="download_language_header_preference">ดาวน์โหลดภาษา</string>
     <!-- All languages list item. When the user presses this item, they can download or delete all languages. -->

From 77adecc2d15e97ea77da417099eb5b3f02f3ea31 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 26 Jan 2024 12:12:36 +0200
Subject: [PATCH 058/222] Bug 1876700 - Add more test logs to CollectionRobot

---
 .../org/mozilla/fenix/helpers/TestHelper.kt   |  2 +
 .../fenix/ui/robots/CollectionRobot.kt        | 73 +++++++++++--------
 2 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
index 06bc94ee6..dedb39b2c 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
@@ -49,8 +49,10 @@ object TestHelper {
 
     fun scrollToElementByText(text: String): UiScrollable {
         val appView = UiScrollable(UiSelector().scrollable(true))
+        Log.i(TAG, "scrollToElementByText: Waiting for app view")
         appView.waitForExists(waitingTime)
         appView.scrollTextIntoView(text)
+        Log.i(TAG, "scrollToElementByText: Scrolled to element with text: $text")
         return appView
     }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt
index 1cbac1730..029e5485d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.ui.robots
 
+import android.util.Log
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.hasContentDescription
 import androidx.compose.ui.test.hasText
@@ -17,10 +18,10 @@ import androidx.test.espresso.action.ViewActions.pressImeActionButton
 import androidx.test.espresso.matcher.RootMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.uiautomator.By
-import androidx.test.uiautomator.UiScrollable
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import org.mozilla.fenix.R
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.MatcherHelper.assertItemTextEquals
 import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
@@ -46,18 +47,24 @@ class CollectionRobot {
             itemWithResId("$packageName:id/collections_list"),
         )
 
-    fun clickAddNewCollection() = addNewCollectionButton().click()
+    fun clickAddNewCollection() {
+        addNewCollectionButton().click()
+        Log.i(TAG, "clickAddNewCollection: Clicked the add new collection button")
+    }
 
     fun verifyCollectionNameTextField() = assertUIObjectExists(mainMenuEditCollectionNameField())
 
     // names a collection saved from tab drawer
     fun typeCollectionNameAndSave(collectionName: String) {
         collectionNameTextField().text = collectionName
-        addCollectionButtonPanel.waitForExists(waitingTime)
-        addCollectionOkButton.click()
+        Log.i(TAG, "typeCollectionNameAndSave: Collection name text field set to: $collectionName")
+        addCollectionButtonPanel().waitForExists(waitingTime)
+        addCollectionOkButton().click()
+        Log.i(TAG, "typeCollectionNameAndSave: Clicked \"OK\" panel button")
     }
 
     fun verifyTabsSelectedCounterText(numOfTabs: Int) {
+        Log.i(TAG, "verifyTabsSelectedCounterText: Waiting for \"Select tabs to save\" prompt to be gone")
         itemWithText("Select tabs to save").waitUntilGone(waitingTime)
 
         val tabsCounter = mDevice.findObject(UiSelector().resourceId("$packageName:id/bottom_bar_text"))
@@ -68,7 +75,8 @@ class CollectionRobot {
     }
 
     fun saveTabsSelectedForCollection() {
-        mDevice.findObject(UiSelector().resourceId("$packageName:id/save_button")).click()
+        itemWithResId("$packageName:id/save_button").click()
+        Log.i(TAG, "saveTabsSelectedForCollection: Clicked \"Save\" button")
     }
 
     fun verifyTabSavedInCollection(title: String, visible: Boolean = true) {
@@ -91,9 +99,11 @@ class CollectionRobot {
             collectionThreeDotButton(rule)
                 .assertExists()
                 .assertIsDisplayed()
+            Log.i(TAG, "verifyCollectionMenuIsVisible: Verified collection three dot button exists")
         } else {
             collectionThreeDotButton(rule)
                 .assertDoesNotExist()
+            Log.i(TAG, "verifyCollectionMenuIsVisible: Verified collection three dot button does not exist")
         }
     }
 
@@ -101,18 +111,21 @@ class CollectionRobot {
         collectionThreeDotButton(rule)
             .assertIsDisplayed()
             .performClick()
+        Log.i(TAG, "clickCollectionThreeDotButton: Clicked three dot button")
     }
 
     fun selectOpenTabs(rule: ComposeTestRule) {
         rule.onNode(hasText("Open tabs"))
             .assertIsDisplayed()
             .performClick()
+        Log.i(TAG, "selectOpenTabs: Clicked \"Open tabs\" menu option")
     }
 
     fun selectRenameCollection(rule: ComposeTestRule) {
         rule.onNode(hasText("Rename collection"))
             .assertIsDisplayed()
             .performClick()
+        Log.i(TAG, "selectRenameCollection: Clicked \"Rename collection\" menu option")
         mainMenuEditCollectionNameField().waitForExists(waitingTime)
     }
 
@@ -120,6 +133,7 @@ class CollectionRobot {
         rule.onNode(hasText("Add tab"))
             .assertIsDisplayed()
             .performClick()
+        Log.i(TAG, "selectAddTabToCollection: Clicked \"Add tab\" menu option")
 
         mDevice.waitNotNull(Until.findObject(By.text("Select Tabs")))
     }
@@ -128,35 +142,40 @@ class CollectionRobot {
         rule.onNode(hasText("Delete collection"))
             .assertIsDisplayed()
             .performClick()
+        Log.i(TAG, "selectDeleteCollection: Clicked \"Delete collection\" menu option")
     }
 
     fun verifyCollectionItemRemoveButtonIsVisible(title: String, visible: Boolean) =
         assertUIObjectExists(removeTabFromCollectionButton(title), exists = visible)
 
-    fun removeTabFromCollection(title: String) = removeTabFromCollectionButton(title).click()
+    fun removeTabFromCollection(title: String) {
+        removeTabFromCollectionButton(title).click()
+        Log.i(TAG, "removeTabFromCollection: Clicked remove button for tab: $title")
+    }
 
     fun swipeTabLeft(title: String, rule: ComposeTestRule) {
         rule.onNode(hasText(title), useUnmergedTree = true)
             .performTouchInput { swipeLeft() }
+        Log.i(TAG, "swipeTabLeft: Removed tab: $title using swipe left action")
         rule.waitForIdle()
+        Log.i(TAG, "swipeTabLeft: Waited for rule to be idle")
     }
 
     fun swipeTabRight(title: String, rule: ComposeTestRule) {
         rule.onNode(hasText(title), useUnmergedTree = true)
             .performTouchInput { swipeRight() }
+        Log.i(TAG, "swipeTabRight: Removed tab: $title using swipe right action")
         rule.waitForIdle()
+        Log.i(TAG, "swipeTabRight: Waited for rule to be idle")
     }
 
-    fun verifySnackBarText(expectedText: String) {
-        mDevice.findObject(UiSelector().text(expectedText)).waitForExists(waitingTime)
-    }
-
-    fun goBackInCollectionFlow() = backButton().click()
+    fun verifySnackBarText(expectedText: String) =
+        itemContainingText(expectedText).waitForExists(waitingTime)
 
-    fun swipeToBottom() =
-        UiScrollable(
-            UiSelector().resourceId("$packageName:id/sessionControlRecyclerView"),
-        ).scrollToEnd(3)
+    fun goBackInCollectionFlow() {
+        backButton().click()
+        Log.i(TAG, "goBackInCollectionFlow: Clicked collection creation flow back button")
+    }
 
     class Transition {
         fun collapseCollection(
@@ -165,6 +184,7 @@ class CollectionRobot {
         ): HomeScreenRobot.Transition {
             assertUIObjectExists(itemContainingText(title))
             itemContainingText(title).clickAndWaitForNewWindow(waitingTimeShort)
+            Log.i(TAG, "collapseCollection: Clicked collection $title")
             assertUIObjectExists(itemWithDescription(getStringResource(R.string.remove_tab_from_collection)), exists = false)
 
             HomeScreenRobot().interact()
@@ -178,7 +198,9 @@ class CollectionRobot {
         ): BrowserRobot.Transition {
             mainMenuEditCollectionNameField().waitForExists(waitingTime)
             mainMenuEditCollectionNameField().text = name
+            Log.i(TAG, "typeCollectionNameAndSave: Collection name text field set to: $name")
             onView(withId(R.id.name_collection_edittext)).perform(pressImeActionButton())
+            Log.i(TAG, "typeCollectionNameAndSave: Pressed done action button")
 
             // wait for the collection creation wrapper to be dismissed
             mDevice.waitNotNull(Until.gone(By.res("$packageName:id/createCollectionWrapper")))
@@ -193,6 +215,7 @@ class CollectionRobot {
         ): BrowserRobot.Transition {
             collectionTitle(title).waitForExists(waitingTime)
             collectionTitle(title).click()
+            Log.i(TAG, "selectExistingCollection: Clicked collection with title: $title")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -201,6 +224,7 @@ class CollectionRobot {
         fun clickShareCollectionButton(interact: ShareOverlayRobot.() -> Unit): ShareOverlayRobot.Transition {
             shareCollectionButton().waitForExists(waitingTime)
             shareCollectionButton().click()
+            Log.i(TAG, "clickShareCollectionButton: Clicked share collection button")
 
             ShareOverlayRobot().interact()
             return ShareOverlayRobot.Transition()
@@ -213,21 +237,14 @@ fun collectionRobot(interact: CollectionRobot.() -> Unit): CollectionRobot.Trans
     return CollectionRobot.Transition()
 }
 
-private fun collectionTitle(title: String) =
-    mDevice.findObject(
-        UiSelector()
-            .text(title),
-    )
+private fun collectionTitle(title: String) = itemWithText(title)
 
 private fun collectionThreeDotButton(rule: ComposeTestRule) =
     rule.onNode(hasContentDescription("Collection menu"))
 
 private fun collectionListItem(title: String) = mDevice.findObject(UiSelector().text(title))
 
-private fun shareCollectionButton() =
-    mDevice.findObject(
-        UiSelector().description("Share"),
-    )
+private fun shareCollectionButton() = itemWithDescription("Share")
 
 private fun removeTabFromCollectionButton(title: String) =
     mDevice.findObject(
@@ -245,9 +262,7 @@ private fun collectionNameTextField() =
 
 // collection name text field, when saving from the main menu option
 private fun mainMenuEditCollectionNameField() =
-    mDevice.findObject(
-        UiSelector().resourceId("$packageName:id/name_collection_edittext"),
-    )
+    itemWithResId("$packageName:id/name_collection_edittext")
 
 private fun addNewCollectionButton() =
     mDevice.findObject(UiSelector().text("Add new collection"))
@@ -256,7 +271,7 @@ private fun backButton() =
     mDevice.findObject(
         UiSelector().resourceId("$packageName:id/back_button"),
     )
-private val addCollectionButtonPanel =
+private fun addCollectionButtonPanel() =
     itemWithResId("$packageName:id/buttonPanel")
 
-private val addCollectionOkButton = onView(withId(android.R.id.button1)).inRoot(RootMatchers.isDialog())
+private fun addCollectionOkButton() = onView(withId(android.R.id.button1)).inRoot(RootMatchers.isDialog())

From feb1001f9e7973b128f30a8d9abafe9d73998c74 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 26 Jan 2024 14:17:27 +0200
Subject: [PATCH 059/222] Bug 1876720 - Add more test logs to
 ComposeTabDrawerRobot

---
 .../fenix/ui/robots/ComposeTabDrawerRobot.kt  | 64 ++++++++++++++++++-
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt
index baa7271b0..df12b8ff2 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt
@@ -6,6 +6,7 @@
 
 package org.mozilla.fenix.ui.robots
 
+import android.util.Log
 import android.view.View
 import androidx.compose.ui.semantics.SemanticsActions
 import androidx.compose.ui.test.ExperimentalTestApi
@@ -42,6 +43,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import org.hamcrest.Matcher
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.Constants
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.HomeActivityComposeTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
@@ -63,24 +65,30 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
     fun verifyNormalBrowsingButtonIsSelected(isSelected: Boolean = true) {
         if (isSelected) {
             composeTestRule.normalBrowsingButton().assertIsSelected()
+            Log.i(TAG, "verifyNormalBrowsingButtonIsSelected: Verified normal browsing button is selected")
         } else {
             composeTestRule.normalBrowsingButton().assertIsNotSelected()
+            Log.i(TAG, "verifyNormalBrowsingButtonIsSelected: Verified normal browsing button is not selected")
         }
     }
 
     fun verifyPrivateBrowsingButtonIsSelected(isSelected: Boolean = true) {
         if (isSelected) {
             composeTestRule.privateBrowsingButton().assertIsSelected()
+            Log.i(TAG, "verifyPrivateBrowsingButtonIsSelected: Verified private browsing button is selected")
         } else {
             composeTestRule.privateBrowsingButton().assertIsNotSelected()
+            Log.i(TAG, "verifyPrivateBrowsingButtonIsSelected: Verified private browsing button is not selected")
         }
     }
 
     fun verifySyncedTabsButtonIsSelected(isSelected: Boolean = true) {
         if (isSelected) {
             composeTestRule.syncedTabsButton().assertIsSelected()
+            Log.i(TAG, "verifySyncedTabsButtonIsSelected: Verified synced tabs button is selected")
         } else {
             composeTestRule.syncedTabsButton().assertIsNotSelected()
+            Log.i(TAG, "verifySyncedTabsButtonIsSelected: Verified synced tabs button is not selected")
         }
     }
 
@@ -97,14 +105,17 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
         titles.forEach { title ->
             itemContainingText(title).waitForExists(waitingTime)
             composeTestRule.tabItem(title).assertExists()
+            Log.i(TAG, "verifyExistingOpenTabs: Verified open tab with title: $title exists")
         }
     }
 
-    fun verifyOpenTabsOrder(title: String, position: Int) =
+    fun verifyOpenTabsOrder(title: String, position: Int) {
         composeTestRule.normalTabsList()
             .onChildAt(position - 1)
             .assert(hasTestTag(TabsTrayTestTag.tabItemRoot))
             .assert(hasAnyChild(hasText(title)))
+        Log.i(TAG, "verifyOpenTabsOrder: Verified open tab at position: $position has title: $title")
+    }
 
     fun verifyNoExistingOpenTabs(vararg titles: String) {
         titles.forEach { title ->
@@ -117,58 +128,72 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
 
     fun verifyNormalTabsList() {
         composeTestRule.normalTabsList().assertExists()
+        Log.i(TAG, "verifyNormalTabsList: Verified normal tabs list exists")
     }
 
     fun verifyPrivateTabsList() {
         composeTestRule.privateTabsList().assertExists()
+        Log.i(TAG, "verifyPrivateTabsList: Verified private tabs list exists")
     }
 
     fun verifySyncedTabsList() {
         composeTestRule.syncedTabsList().assertExists()
+        Log.i(TAG, "verifySyncedTabsList: Verified synced tabs list exists")
     }
 
     fun verifyNoOpenTabsInNormalBrowsing() {
         composeTestRule.emptyNormalTabsList().assertExists()
+        Log.i(TAG, "verifyNoOpenTabsInNormalBrowsing: Verified empty normal tabs list exists")
     }
 
     fun verifyNoOpenTabsInPrivateBrowsing() {
         composeTestRule.emptyPrivateTabsList().assertExists()
+        Log.i(TAG, "verifyNoOpenTabsInPrivateBrowsing: Verified empty private tabs list exists")
     }
 
     fun verifyAccountSettingsButton() {
         composeTestRule.dropdownMenuItemAccountSettings().assertExists()
+        Log.i(TAG, "verifyAccountSettingsButton: Verified \"Account settings\" menu button exists")
     }
 
     fun verifyCloseAllTabsButton() {
         composeTestRule.dropdownMenuItemCloseAllTabs().assertExists()
+        Log.i(TAG, "verifyCloseAllTabsButton: Verified \"Close all tabs\" menu button exists")
     }
 
     fun verifySelectTabsButton() {
         composeTestRule.dropdownMenuItemSelectTabs().assertExists()
+        Log.i(TAG, "verifySelectTabsButton: Verified \"Select tabs\" menu button exists")
     }
 
     fun verifyShareAllTabsButton() {
         composeTestRule.dropdownMenuItemShareAllTabs().assertExists()
+        Log.i(TAG, "verifyShareAllTabsButton: Verified \"Share all tabs\" menu button exists")
     }
 
     fun verifyRecentlyClosedTabsButton() {
         composeTestRule.dropdownMenuItemRecentlyClosedTabs().assertExists()
+        Log.i(TAG, "verifyRecentlyClosedTabsButton: Verified \"Recently closed tabs\" menu button exists")
     }
 
     fun verifyTabSettingsButton() {
         composeTestRule.dropdownMenuItemTabSettings().assertExists()
+        Log.i(TAG, "verifyTabSettingsButton: Verified \"Tab settings\" menu button exists")
     }
 
     fun verifyThreeDotButton() {
         composeTestRule.threeDotButton().assertExists()
+        Log.i(TAG, "verifyThreeDotButton: Verified three dot button exists")
     }
 
     fun verifyFab() {
         composeTestRule.tabsTrayFab().assertExists()
+        Log.i(TAG, "verifyFab: Verified new tab FAB button exists")
     }
 
     fun verifyNormalTabCounter() {
         composeTestRule.normalTabsCounter().assertExists()
+        Log.i(TAG, "verifyNormalTabCounter: Verified normal tabs list counter exists")
     }
 
     /**
@@ -176,6 +201,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      */
     fun verifyTabThumbnail() {
         composeTestRule.tabThumbnail().assertExists()
+        Log.i(TAG, "verifyTabThumbnail: Verified tab thumbnail exists")
     }
 
     /**
@@ -183,22 +209,27 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      */
     fun verifyTabCloseButton() {
         composeTestRule.closeTabButton().assertExists()
+        Log.i(TAG, "verifyTabCloseButton: Verified close tab button exists")
     }
 
     fun verifyTabsTrayBehaviorState(expectedState: Int) {
         tabsTrayView().check(ViewAssertions.matches(BottomSheetBehaviorStateMatcher(expectedState)))
+        Log.i(TAG, "verifyTabsTrayBehaviorState: Verified that the tabs tray state matches: $expectedState")
     }
 
     fun verifyMinusculeHalfExpandedRatio() {
         tabsTrayView().check(ViewAssertions.matches(BottomSheetBehaviorHalfExpandedMaxRatioMatcher(0.001f)))
+        Log.i(TAG, "verifyMinusculeHalfExpandedRatio: Verified that the tabs tray half expanded ratio")
     }
 
     fun verifyTabTrayIsOpen() {
         composeTestRule.tabsTray().assertExists()
+        Log.i(TAG, "verifyTabTrayIsOpen: Verified that the open tabs tray exists")
     }
 
     fun verifyTabTrayIsClosed() {
         composeTestRule.tabsTray().assertDoesNotExist()
+        Log.i(TAG, "verifyTabTrayIsClosed: Verified that the tabs tray is closed")
     }
 
     /**
@@ -206,6 +237,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      */
     fun closeTab() {
         composeTestRule.closeTabButton().performClick()
+        Log.i(TAG, "closeTab: Clicked close tab button")
     }
 
     /**
@@ -213,6 +245,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      */
     fun swipeTabLeft(title: String) {
         composeTestRule.tabItem(title).performTouchInput { swipeLeft() }
+        Log.i(TAG, "swipeTabLeft: Performed swipe left action on tab: $title")
     }
 
     /**
@@ -220,6 +253,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      */
     fun swipeTabRight(title: String) {
         composeTestRule.tabItem(title).performTouchInput { swipeRight() }
+        Log.i(TAG, "swipeTabRight: Performed swipe right action on tab: $title")
     }
 
     /**
@@ -231,7 +265,9 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
         firstCollection: Boolean = true,
     ) {
         composeTestRule.threeDotButton().performClick()
+        Log.i(TAG, "createCollection: Clicked 3 dot button")
         composeTestRule.dropdownMenuItemSelectTabs().performClick()
+        Log.i(TAG, "createCollection: Clicked \"Select tabs\" menu button")
 
         for (tab in tabTitles) {
             selectTab(tab)
@@ -250,8 +286,10 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      */
     @OptIn(ExperimentalTestApi::class)
     fun selectTab(title: String) {
-        composeTestRule.waitUntilExactlyOneExists(hasText(title), TestAssetHelper.waitingTime)
+        Log.i(TAG, "selectTab: Waiting for tab with title: $title to exist")
+        composeTestRule.waitUntilExactlyOneExists(hasText(title), waitingTime)
         composeTestRule.tabItem(title).performClick()
+        Log.i(TAG, "selectTab: Clicked tab with title: $title")
     }
 
     /**
@@ -260,6 +298,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
     fun longClickTab(title: String) {
         composeTestRule.tabItem(title)
             .performTouchInput { longClick(durationMillis = Constants.LONG_CLICK_DURATION) }
+        Log.i(TAG, "longClickTab: Long clicked tab with title: $title")
     }
 
     /**
@@ -268,6 +307,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
     fun verifyTabsMultiSelectionCounter(numOfTabs: Int) {
         composeTestRule.multiSelectionCounter()
             .assert(hasText("$numOfTabs selected"))
+        Log.i(TAG, "verifyTabsMultiSelectionCounter: Verified $numOfTabs are selected")
     }
 
     /**
@@ -275,9 +315,11 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      */
     @OptIn(ExperimentalTestApi::class)
     fun verifyTabMediaControlButtonState(action: String) {
+        Log.i(TAG, "verifyTabMediaControlButtonStateTab: Waiting for media tab control button: $action to exist")
         composeTestRule.waitUntilAtLeastOneExists(hasContentDescription(action), waitingTime)
         composeTestRule.tabMediaControlButton(action)
             .assertExists()
+        Log.i(TAG, "verifyTabMediaControlButtonStateTab: Verified media tab control button: $action exists")
     }
 
     /**
@@ -285,9 +327,11 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      */
     @OptIn(ExperimentalTestApi::class)
     fun clickTabMediaControlButton(action: String) {
+        Log.i(TAG, "clickTabMediaControlButton: Waiting for media tab control button: $action to exist")
         composeTestRule.waitUntilAtLeastOneExists(hasContentDescription(action), waitingTime)
         composeTestRule.tabMediaControlButton(action)
             .performClick()
+        Log.i(TAG, "clickTabMediaControlButton: Clicked media tab control button: $action")
     }
 
     /**
@@ -298,6 +342,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
             .filter(hasParent(hasText(title)))
             .onFirst()
             .performClick()
+        Log.i(TAG, "closeTabWithTitle: Closed tab with title: $title")
     }
 
     class Transition(private val composeTestRule: HomeActivityComposeTestRule) {
@@ -306,24 +351,28 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
             mDevice.waitForIdle()
 
             composeTestRule.tabsTrayFab().performClick()
+            Log.i(TAG, "openNewTab: Clicked new tab FAB button")
             SearchRobot().interact()
             return SearchRobot.Transition()
         }
 
         fun toggleToNormalTabs(interact: ComposeTabDrawerRobot.() -> Unit): Transition {
             composeTestRule.normalBrowsingButton().performClick()
+            Log.i(TAG, "toggleToNormalTabs: Clicked normal browsing button")
             ComposeTabDrawerRobot(composeTestRule).interact()
             return Transition(composeTestRule)
         }
 
         fun toggleToPrivateTabs(interact: ComposeTabDrawerRobot.() -> Unit): Transition {
             composeTestRule.privateBrowsingButton().performClick()
+            Log.i(TAG, "toggleToPrivateTabs: Clicked private browsing button")
             ComposeTabDrawerRobot(composeTestRule).interact()
             return Transition(composeTestRule)
         }
 
         fun toggleToSyncedTabs(interact: ComposeTabDrawerRobot.() -> Unit): Transition {
             composeTestRule.syncedTabsButton().performClick()
+            Log.i(TAG, "toggleToSyncedTabs: Clicked synced tabs button")
             ComposeTabDrawerRobot(composeTestRule).interact()
             return Transition(composeTestRule)
         }
@@ -331,18 +380,21 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
         fun clickSignInToSyncButton(interact: SyncSignInRobot.() -> Unit): SyncSignInRobot.Transition {
             itemContainingText(getStringResource(R.string.sync_sign_in))
                 .clickAndWaitForNewWindow(TestAssetHelper.waitingTimeShort)
+            Log.i(TAG, "clickSignInToSyncButton: Clicked sign in to sync button")
             SyncSignInRobot().interact()
             return SyncSignInRobot.Transition()
         }
 
         fun openThreeDotMenu(interact: ComposeTabDrawerRobot.() -> Unit): Transition {
             composeTestRule.threeDotButton().performClick()
+            Log.i(TAG, "openThreeDotMenu: Clicked three dot button")
             ComposeTabDrawerRobot(composeTestRule).interact()
             return Transition(composeTestRule)
         }
 
         fun closeAllTabs(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
             composeTestRule.dropdownMenuItemCloseAllTabs().performClick()
+            Log.i(TAG, "closeAllTabs: Clicked \"Close all tabs\" menu button")
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
         }
@@ -351,6 +403,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
             composeTestRule.tabItem(title)
                 .performScrollTo()
                 .performClick()
+            Log.i(TAG, "openTab: Scrolled and clicked tab with title: $title")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -360,6 +413,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
             composeTestRule.privateTabsList()
                 .onChildren()[position]
                 .performClick()
+            Log.i(TAG, "openPrivateTab: Opened private tab at position: ${position + 1}")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -369,6 +423,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
             composeTestRule.normalTabsList()
                 .onChildren()[position]
                 .performClick()
+            Log.i(TAG, "openNormalTab: Opened tab at position: ${position + 1}")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -378,6 +433,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
             // The topBar contains other views.
             // Don't do the default click in the middle, rather click in some free space - top right.
             Espresso.onView(ViewMatchers.withId(R.id.topBar)).clickAtLocationInView(GeneralLocation.TOP_RIGHT)
+            Log.i(TAG, "clickTopBar: Clicked tabs tray top bar")
             ComposeTabDrawerRobot(composeTestRule).interact()
             return Transition(composeTestRule)
         }
@@ -435,6 +491,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
 
         fun closeTabDrawer(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
             composeTestRule.bannerHandle().performSemanticsAction(SemanticsActions.OnClick)
+            Log.i(TAG, "closeTabDrawer: Closed tabs tray clicking the handle")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -442,6 +499,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
 
         fun clickSaveCollection(interact: CollectionRobot.() -> Unit): CollectionRobot.Transition {
             composeTestRule.collectionsButton().performClick()
+            Log.i(TAG, "clickSaveCollection: Clicked collections button")
 
             CollectionRobot().interact()
             return CollectionRobot.Transition()
@@ -449,6 +507,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
 
         fun clickShareAllTabsButton(interact: ShareOverlayRobot.() -> Unit): ShareOverlayRobot.Transition {
             composeTestRule.dropdownMenuItemShareAllTabs().performClick()
+            Log.i(TAG, "clickShareAllTabsButton: Clicked \"Share all tabs\" menu button button")
 
             ShareOverlayRobot().interact()
             return ShareOverlayRobot.Transition()
@@ -469,6 +528,7 @@ fun composeTabDrawer(composeTestRule: HomeActivityComposeTestRule, interact: Com
  */
 private fun clickCollectionsButton(composeTestRule: HomeActivityComposeTestRule, interact: CollectionRobot.() -> Unit): CollectionRobot.Transition {
     composeTestRule.collectionsButton().performClick()
+    Log.i(TAG, "clickCollectionsButton: Clicked collections button")
 
     CollectionRobot().interact()
     return CollectionRobot.Transition()

From b00685d4ff51bdf9891c2794da891a03c64d8ac1 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Mon, 22 Jan 2024 11:35:02 +0200
Subject: [PATCH 060/222] Bug 1874831 - Fix disabled FxSuggest related UI tests

---
 .../org/mozilla/fenix/ui/FirefoxSuggestTest.kt | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/FirefoxSuggestTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/FirefoxSuggestTest.kt
index a6b6eb35d..1f8b929fc 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/FirefoxSuggestTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/FirefoxSuggestTest.kt
@@ -5,7 +5,6 @@
 package org.mozilla.fenix.ui
 
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
@@ -48,9 +47,9 @@ class FirefoxSuggestTest {
                     "Nike.com - Official Site",
                     "nike.com/?cp=16423867261_search_318370984us128${getSponsoredFxSuggestPlaceHolder()}&mfadid=adm",
                 ),
-            "Macy" to listOf(
-                "macys.com - Official Site",
-                "macys.com/?cm_mmc=Google_AdMarketPlace-_-Privacy_Instant%20Suggest-_-319101130_Broad-_-kclickid__kenshoo_clickid_&m_sc=sem&m_sb=Admarketplace&m_tp=Search&m_ac=Admarketplace&m_ag=Instant%20Suggest&m_cn=Privacy&m_pi=kclickid__kenshoo_clickid__319101130us1201${getSponsoredFxSuggestPlaceHolder()}&mfadid=adm",
+            "Houzz" to listOf(
+                "Houzz.com - Official Site",
+                "houzz.com/products?m_refid=us-dsp-mpl-admp-219577_15416306_kwd-353208810&adcid=319104989us1287${getSponsoredFxSuggestPlaceHolder()}&mfadid=adm",
             ),
             "Spanx" to listOf(
                 "SPANX® -  Official Site",
@@ -101,7 +100,7 @@ class FirefoxSuggestTest {
     private val nonSponsoredKeyWord = nonSponsoredKeyWords.keys.random()
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2348361
-    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1874831")
+    // Known bug that might affect this UI test: https://bugzilla.mozilla.org/show_bug.cgi?id=1813587
     @SmokeTest
     @Test
     fun verifyFirefoxSuggestSponsoredSearchResultsTest() {
@@ -123,7 +122,7 @@ class FirefoxSuggestTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2348362
-    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1874831")
+    // Known bug that might affect this UI test: https://bugzilla.mozilla.org/show_bug.cgi?id=1813587
     @Test
     fun verifyFirefoxSuggestSponsoredSearchResultsWithPartialKeywordTest() {
         runWithCondition(TestHelper.appContext.settings().enableFxSuggest) {
@@ -144,7 +143,7 @@ class FirefoxSuggestTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2348363
-    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1874831")
+    // Known bug that might affect this UI test: https://bugzilla.mozilla.org/show_bug.cgi?id=1813587
     @Test
     fun openFirefoxSuggestSponsoredSearchResultsTest() {
         runWithCondition(TestHelper.appContext.settings().enableFxSuggest) {
@@ -168,7 +167,7 @@ class FirefoxSuggestTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2348369
-    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1874831")
+    // Known bug that might affect this UI test: https://bugzilla.mozilla.org/show_bug.cgi?id=1813587
     @Test
     fun verifyFirefoxSuggestSponsoredSearchResultsWithEditedKeywordTest() {
         runWithCondition(TestHelper.appContext.settings().enableFxSuggest) {
@@ -192,6 +191,7 @@ class FirefoxSuggestTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2348374
+    // Known bug that might affect this UI test: https://bugzilla.mozilla.org/show_bug.cgi?id=1813587
     @SmokeTest
     @Test
     fun verifyFirefoxSuggestNonSponsoredSearchResultsTest() {
@@ -218,6 +218,7 @@ class FirefoxSuggestTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2348375
+    // Known bug that might affect this UI test: https://bugzilla.mozilla.org/show_bug.cgi?id=1813587
     @Test
     fun verifyFirefoxSuggestNonSponsoredSearchResultsWithPartialKeywordTest() {
         runWithCondition(TestHelper.appContext.settings().enableFxSuggest) {
@@ -237,6 +238,7 @@ class FirefoxSuggestTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2348376
+    // Known bug that might affect this UI test: https://bugzilla.mozilla.org/show_bug.cgi?id=1813587
     @Test
     fun openFirefoxSuggestNonSponsoredSearchResultsTest() {
         runWithCondition(TestHelper.appContext.settings().enableFxSuggest) {

From dbf94e7cb3fae581e713c66bb0f85f570f83ec66 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Fri, 5 Jan 2024 16:39:28 -0500
Subject: [PATCH 061/222] Bug 1870351 - Improve touch targets Add-ons details
 screen.

---
 .../res/layout/fragment_add_on_details.xml    | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/layout/fragment_add_on_details.xml b/app/src/main/res/layout/fragment_add_on_details.xml
index 61bff2fcd..1ab400991 100644
--- a/app/src/main/res/layout/fragment_add_on_details.xml
+++ b/app/src/main/res/layout/fragment_add_on_details.xml
@@ -32,7 +32,9 @@
             style="@style/AboutHeaderContentText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:minHeight="48dp"
+            android:layout_marginTop="10dp"
             android:text="@string/mozac_feature_addons_author"
             app:layout_constraintEnd_toStartOf="@+id/author_text"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
@@ -44,8 +46,10 @@
             style="@style/AboutHeaderContentText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="center"
+            android:minHeight="48dp"
             android:layout_alignParentEnd="true"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="10dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/author_label"
             app:layout_constraintTop_toBottomOf="@+id/details"
@@ -56,7 +60,6 @@
             android:id="@+id/author_divider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="10dp"
             android:background="?android:attr/listDivider"
             android:importantForAccessibility="no"
             app:layout_constraintTop_toBottomOf="@id/author_text"
@@ -67,7 +70,8 @@
             style="@style/AboutHeaderContentText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:minHeight="48dp"
             android:text="@string/mozac_feature_addons_version"
             app:layout_constraintEnd_toStartOf="@+id/version_text"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
@@ -80,7 +84,9 @@
             style="@style/AboutHeaderContentText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
+            android:gravity="center"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/version_label"
             app:layout_constraintTop_toBottomOf="@+id/author_divider"
@@ -91,8 +97,6 @@
             android:id="@+id/version_divider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
             android:background="?android:attr/listDivider"
             android:importantForAccessibility="no"
             app:layout_constraintTop_toBottomOf="@+id/version_text" />
@@ -102,7 +106,8 @@
             style="@style/AboutHeaderContentText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:minHeight="48dp"
             android:text="@string/mozac_feature_addons_last_updated"
             app:layout_constraintEnd_toStartOf="@+id/last_updated_text"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
@@ -114,7 +119,8 @@
             style="@style/AboutHeaderContentText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:minHeight="48dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/last_updated_label"
             app:layout_constraintTop_toBottomOf="@+id/version_divider"
@@ -125,7 +131,6 @@
             android:id="@+id/last_updated_divider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="10dp"
             android:background="?android:attr/listDivider"
             android:importantForAccessibility="no"
             app:layout_constraintTop_toBottomOf="@+id/last_updated_text" />
@@ -135,7 +140,10 @@
             style="@style/AboutHeaderContentText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:minHeight="48dp"
+            android:clickable="true"
+            android:focusable="true"
             android:text="@string/mozac_feature_addons_home_page"
             android:textColor="?textAccent"
             app:layout_constraintStart_toStartOf="parent"
@@ -145,7 +153,6 @@
             android:id="@+id/home_page_divider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="10dp"
             android:background="?android:attr/listDivider"
             android:importantForAccessibility="no"
             app:layout_constraintTop_toBottomOf="@+id/home_page_label" />
@@ -154,7 +161,6 @@
             android:id="@+id/rating"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
             app:layout_constraintTop_toBottomOf="@+id/home_page_divider">
 
             <TextView
@@ -162,6 +168,8 @@
                 style="@style/AboutHeaderContentText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:gravity="center"
+                android:minHeight="48dp"
                 android:text="@string/mozac_feature_addons_rating"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -189,6 +197,9 @@
                 style="@style/AboutHeaderContentText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:gravity="center"
+                android:minWidth="48dp"
+                android:minHeight="48dp"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -202,7 +213,6 @@
             android:id="@+id/detail_url_divider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="10dp"
             android:background="?android:attr/listDivider"
             android:importantForAccessibility="no"
             app:layout_constraintTop_toBottomOf="@+id/rating" />
@@ -212,7 +222,10 @@
             style="@style/AboutHeaderContentText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:minHeight="48dp"
+            android:clickable="true"
+            android:focusable="true"
             android:text="@string/mozac_feature_addons_more_info_link"
             android:textColor="?textAccent"
             app:layout_constraintStart_toStartOf="parent"

From 6bc66460eb73b78502955ebadd10b1e22a187c2c Mon Sep 17 00:00:00 2001
From: Noah Bond <nbond@mozilla.com>
Date: Tue, 30 Jan 2024 10:07:26 -0800
Subject: [PATCH 062/222] Bug 1876596 - Add probe for debug drawer secret
 setting

---
 app/metrics.yaml                                 | 16 ++++++++++++++++
 .../fenix/settings/SecretSettingsFragment.kt     |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/app/metrics.yaml b/app/metrics.yaml
index aba35607b..fe36185ed 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -11353,3 +11353,19 @@ fx_suggest:
     expires: never
     send_in_pings:
       - fx-suggest
+debug_drawer:
+  debug_drawer_enabled:
+    type: boolean
+    description: |
+      Whether or not the user has enabled the Debug Drawer feature.
+    send_in_pings:
+      - metrics
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1876596
+    data_reviews:
+      - https://github.com/mozilla-mobile/firefox-android/pull/5356
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+    expires: never
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
index ecffe568a..4f5c99085 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
@@ -23,6 +23,7 @@ import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.showToolbar
+import org.mozilla.fenix.GleanMetrics.DebugDrawer as DebugDrawerMetrics
 
 class SecretSettingsFragment : PreferenceFragmentCompat() {
 
@@ -114,6 +115,7 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
                 onPreferenceChangeListener =
                     Preference.OnPreferenceChangeListener { _, newValue ->
                         debugSettingsRepository.setDebugDrawerEnabled(enabled = newValue as Boolean)
+                        DebugDrawerMetrics.debugDrawerEnabled.set(newValue)
                         true
                     }
             }

From db6f728e78da4929ff9c7b4c258974cbda19129e Mon Sep 17 00:00:00 2001
From: mike a <mavduevskiy@gmail.com>
Date: Mon, 29 Jan 2024 18:58:36 -0800
Subject: [PATCH 063/222] Bug 1877350 - Refactor tabstray composable to extract
 tab counter into a separate file

Preparing to use it for navigation bar composable.
---
 .../org/mozilla/fenix/compose/TabCounter.kt   | 127 ++++++++++++++++++
 .../mozilla/fenix/tabstray/TabsTrayBanner.kt  |  93 +------------
 2 files changed, 130 insertions(+), 90 deletions(-)
 create mode 100644 app/src/main/java/org/mozilla/fenix/compose/TabCounter.kt

diff --git a/app/src/main/java/org/mozilla/fenix/compose/TabCounter.kt b/app/src/main/java/org/mozilla/fenix/compose/TabCounter.kt
new file mode 100644
index 000000000..a2f2d0709
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/compose/TabCounter.kt
@@ -0,0 +1,127 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.compose
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Icon
+import androidx.compose.material.LocalContentAlpha
+import androidx.compose.material.LocalContentColor
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import org.mozilla.fenix.R
+import org.mozilla.fenix.compose.annotation.LightDarkPreview
+import org.mozilla.fenix.tabstray.TabsTrayTestTag
+import org.mozilla.fenix.theme.FirefoxTheme
+
+private const val MAX_VISIBLE_TABS = 99
+private const val SO_MANY_TABS_OPEN = "∞"
+private val NORMAL_TABS_BOTTOM_PADDING = 0.5.dp
+private const val ONE_DIGIT_SIZE_RATIO = 0.5f
+private const val TWO_DIGITS_SIZE_RATIO = 0.4f
+private const val MIN_SINGLE_DIGIT = 0
+private const val MAX_SINGLE_DIGIT = 9
+private const val TWO_DIGIT_THRESHOLD = 10
+private const val TAB_TEXT_BOTTOM_PADDING_RATIO = 4
+
+/**
+ * UI for displaying the number of opened tabs.
+*
+* This composable uses LocalContentColor, provided by CompositionLocalProvider,
+* to set the color of its icons and text.
+*
+* @param tabCount the number to be displayed inside the counter.
+*/
+
+@Composable
+fun TabCounter(tabCount: Int) {
+    val normalTabCountText: String
+    val tabCountTextRatio: Float
+    val needsBottomPaddingForInfiniteTabs: Boolean
+
+    when (tabCount) {
+        in MIN_SINGLE_DIGIT..MAX_SINGLE_DIGIT -> {
+            normalTabCountText = tabCount.toString()
+            tabCountTextRatio = ONE_DIGIT_SIZE_RATIO
+            needsBottomPaddingForInfiniteTabs = false
+        }
+
+        in TWO_DIGIT_THRESHOLD..MAX_VISIBLE_TABS -> {
+            normalTabCountText = tabCount.toString()
+            tabCountTextRatio = TWO_DIGITS_SIZE_RATIO
+            needsBottomPaddingForInfiniteTabs = false
+        }
+
+        else -> {
+            normalTabCountText = SO_MANY_TABS_OPEN
+            tabCountTextRatio = ONE_DIGIT_SIZE_RATIO
+            needsBottomPaddingForInfiniteTabs = true
+        }
+    }
+
+    val normalTabsContentDescription = if (tabCount == 1) {
+        stringResource(id = R.string.mozac_tab_counter_open_tab_tray_single)
+    } else {
+        stringResource(
+            id = R.string.mozac_tab_counter_open_tab_tray_plural,
+            tabCount.toString(),
+        )
+    }
+
+    val counterBoxWidthDp =
+        dimensionResource(id = mozilla.components.ui.tabcounter.R.dimen.mozac_tab_counter_box_width_height)
+    val counterBoxWidthPx = LocalDensity.current.run { counterBoxWidthDp.roundToPx() }
+    val counterTabsTextSize = (tabCountTextRatio * counterBoxWidthPx).toInt()
+
+    val normalTabsTextModifier = if (needsBottomPaddingForInfiniteTabs) {
+        val bottomPadding = with(LocalDensity.current) { counterTabsTextSize.toDp() / TAB_TEXT_BOTTOM_PADDING_RATIO }
+        Modifier.padding(bottom = bottomPadding)
+    } else {
+        Modifier.padding(bottom = NORMAL_TABS_BOTTOM_PADDING)
+    }
+
+    Box(
+        modifier = Modifier
+            .semantics(mergeDescendants = true) {
+                testTag = TabsTrayTestTag.normalTabsCounter
+            },
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            painter = painterResource(
+                id = mozilla.components.ui.tabcounter.R.drawable.mozac_ui_tabcounter_box,
+            ),
+            contentDescription = normalTabsContentDescription,
+        )
+
+        Text(
+            text = normalTabCountText,
+            modifier = normalTabsTextModifier,
+            color = LocalContentColor.current.copy(alpha = LocalContentAlpha.current),
+            fontSize = with(LocalDensity.current) { counterTabsTextSize.toDp().toSp() },
+            fontWeight = FontWeight.W700,
+            textAlign = TextAlign.Center,
+        )
+    }
+}
+
+@LightDarkPreview
+@Composable
+private fun TabCounterPreview() {
+    FirefoxTheme {
+        TabCounter(tabCount = 55)
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt
index 2779acc4f..13e9c1d4c 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt
@@ -13,12 +13,9 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
-import androidx.compose.material.LocalContentAlpha
-import androidx.compose.material.LocalContentColor
 import androidx.compose.material.Tab
 import androidx.compose.material.TabRow
 import androidx.compose.material.Text
@@ -35,27 +32,22 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.semantics.testTag
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import mozilla.components.browser.state.state.ContentState
 import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.lib.state.ext.observeAsComposableState
-import mozilla.components.ui.tabcounter.TabCounter
 import org.mozilla.fenix.R
 import org.mozilla.fenix.compose.Banner
 import org.mozilla.fenix.compose.BottomSheetHandle
 import org.mozilla.fenix.compose.ContextualMenu
 import org.mozilla.fenix.compose.Divider
 import org.mozilla.fenix.compose.MenuItem
+import org.mozilla.fenix.compose.TabCounter
 import org.mozilla.fenix.compose.annotation.LightDarkPreview
 import org.mozilla.fenix.tabstray.ext.getMenuItems
 import org.mozilla.fenix.theme.FirefoxTheme
@@ -232,7 +224,7 @@ private fun SingleSelectBanner(
                         selectedContentColor = selectedColor,
                         unselectedContentColor = inactiveColor,
                     ) {
-                        NormalTabsTabIcon(normalTabCount = normalTabCount)
+                        TabCounter(tabCount = normalTabCount)
                     }
 
                     Tab(
@@ -293,85 +285,6 @@ private fun SingleSelectBanner(
     }
 }
 
-private const val MAX_VISIBLE_TABS = 99
-private const val SO_MANY_TABS_OPEN = "∞"
-private val NORMAL_TABS_BOTTOM_PADDING = 0.5.dp
-private const val ONE_DIGIT_SIZE_RATIO = 0.5f
-private const val TWO_DIGITS_SIZE_RATIO = 0.4f
-
-@Composable
-@Suppress("MagicNumber")
-private fun NormalTabsTabIcon(normalTabCount: Int) {
-    val normalTabCountText: String
-    val tabCountTextRatio: Float
-    val needsBottomPaddingForInfiniteTabs: Boolean
-
-    when (normalTabCount) {
-        in 0..9 -> {
-            normalTabCountText = normalTabCount.toString()
-            tabCountTextRatio = ONE_DIGIT_SIZE_RATIO
-            needsBottomPaddingForInfiniteTabs = false
-        }
-
-        in 10..MAX_VISIBLE_TABS -> {
-            normalTabCountText = normalTabCount.toString()
-            tabCountTextRatio = TWO_DIGITS_SIZE_RATIO
-            needsBottomPaddingForInfiniteTabs = false
-        }
-
-        else -> {
-            normalTabCountText = SO_MANY_TABS_OPEN
-            tabCountTextRatio = ONE_DIGIT_SIZE_RATIO
-            needsBottomPaddingForInfiniteTabs = true
-        }
-    }
-
-    val normalTabsContentDescription = if (normalTabCount == 1) {
-        stringResource(id = R.string.mozac_tab_counter_open_tab_tray_single)
-    } else {
-        stringResource(
-            id = R.string.mozac_tab_counter_open_tab_tray_plural,
-            normalTabCount.toString(),
-        )
-    }
-
-    val counterBoxWidthDp =
-        dimensionResource(id = mozilla.components.ui.tabcounter.R.dimen.mozac_tab_counter_box_width_height)
-    val counterBoxWidthPx = LocalDensity.current.run { counterBoxWidthDp.roundToPx() }
-    val counterTabsTextSize = (tabCountTextRatio * counterBoxWidthPx).toInt()
-
-    val normalTabsTextModifier = if (needsBottomPaddingForInfiniteTabs) {
-        val bottomPadding = with(LocalDensity.current) { counterTabsTextSize.toDp() / 4 }
-        Modifier.padding(bottom = bottomPadding)
-    } else {
-        Modifier.padding(bottom = NORMAL_TABS_BOTTOM_PADDING)
-    }
-
-    Box(
-        modifier = Modifier
-            .semantics(mergeDescendants = true) {
-                testTag = TabsTrayTestTag.normalTabsCounter
-            },
-        contentAlignment = Alignment.Center,
-    ) {
-        Icon(
-            painter = painterResource(
-                id = mozilla.components.ui.tabcounter.R.drawable.mozac_ui_tabcounter_box,
-            ),
-            contentDescription = normalTabsContentDescription,
-        )
-
-        Text(
-            text = normalTabCountText,
-            modifier = normalTabsTextModifier,
-            color = LocalContentColor.current.copy(alpha = LocalContentAlpha.current),
-            fontSize = with(LocalDensity.current) { counterTabsTextSize.toDp().toSp() },
-            fontWeight = FontWeight.W700,
-            textAlign = TextAlign.Center,
-        )
-    }
-}
-
 /**
  * Banner displayed in multi select mode.
  *
@@ -470,7 +383,7 @@ private fun TabsTrayBannerPreview() {
 @Composable
 private fun TabsTrayBannerInfinityPreview() {
     TabsTrayBannerPreviewRoot(
-        normalTabCount = TabCounter.MAX_VISIBLE_TABS + 1,
+        normalTabCount = 200,
     )
 }
 

From 2d3fa988b4b3806711d637ee4d1b26327ae5727b Mon Sep 17 00:00:00 2001
From: sarah541 <sarahkhan1107@hotmail.com>
Date: Thu, 25 Jan 2024 11:12:41 -0500
Subject: [PATCH 064/222] Bug 1876794 - Fixes in A-C and Fenix strings

---
 app/src/main/res/values/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 081bf9eb9..ad5d9588a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1812,7 +1812,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Set up a device lock pattern, PIN, or password to protect your saved credit cards from being accessed if someone else has your device.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Set up a device lock pattern, PIN, or password to protect your saved cards from being accessed if someone else has your device.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Set up a device lock pattern, PIN, or password to protect your saved payment methods from being accessed if someone else has your device.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Set up now</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1969,12 +1969,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Password options</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">The editable text field for the web address of the login.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">The editable text field for the website address of the password.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">The editable text field for the website address.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">The editable text field for the username of the login.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">The editable text field for the username of the password.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">The editable text field for the username.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">The editable text field for the password of the login.</string>
     <!--  The editable text field for a login's password. -->

From a02cb0cb39ca3ec0b570f3c5aa1b8f7181132c50 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Wed, 31 Jan 2024 00:03:42 +0000
Subject: [PATCH 065/222] Import translations from android-l10n

---
 app/src/main/res/values-pa-rPK/strings.xml | 158 +++++++++++++++++++--
 1 file changed, 144 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index a77e24283..36245c9b3 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -259,8 +259,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">سکین کرو</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">کھوج انجݨ</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">کھوج انجݨ دیاں ترجیحاں</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -312,23 +310,28 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">اطلاعواں تہانوں %s نال ہور کرن دی مدد کردے ہن</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">اطلاعواں تہانوں %s نال ہور کرن دی مدد کردے ہن</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">ڈوائیساں وچالے آپݨیاں ٹیباں نوں ہم وقت کرو، ڈاؤن‌لوڈ دا انتظام کرو، %s  ایپ دی پردہ داری سرکھیا دا پورا فائدہ لیݨ لئی گر لوو تے ہور۔</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">ڈوائیساں وچالے آپݨیاں ٹیباں نوں ہم وقت کرو، ڈاؤن‌لوڈ دا انتظام کرو، %s  ایپ دی پردہ داری سرکھیا دا پورا فائدہ لیݨ لئی گر لوو تے ہور۔</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">جاری رکھو</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">جاری رکھو</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">ہݨے نہیں</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">ہݨے نہیں</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">فائرفاکس پردے داری سوچنا</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">اسیں تہانوں سرکھیت رکھݨا چاہندے آں</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">ساڈا غیر منافع سمرتھ براؤزر کمپنیاں نوں ویب اُتے چوری بھِپے پِچھا کرن توں روکݨ لئی مدد کردا اے۔ \n\n ساڈے پردے داری نوٹس بارے ہور سکھو۔</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">کمپنیاں نوں چوری چوری ویب اُتے تہاڈا پچھا کرن توں ساڈا غیر فائدہ سمرتھ براؤزر آپݨے آپ ہی روکدا اے۔</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">ساڈا غیر منافع سمرتھ براؤزر کمپنیاں نوں ویب اُتے چوری بھِپے پِچھا کرن توں روکݨ لئی مدد کردا اے۔ \n\n ساڈے پردے داری نوٹس بارے ہور سکھو۔</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">پردے داری دا بیان</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">پردے داری دا بیان</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">مول براؤزر تے طور تے بݨاؤ</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -354,6 +357,22 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">ہݨے نہیں</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">فائرفاکس کھوج وجیٹ ازماؤ</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">تہاڈی مکھ سکرین اُتے فائرفاکس نال تسیں پرائیویسی ادھارت براؤزر نوں سوکھی طرح ورت سکدے او، جو کہ انتر سائیٹ ٹریکراں اُتے پابندی لاوندا اے۔</string>
+
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">فائرفاکس وجیٹ جوڑو</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">ہݨے نہیں</string>
+
+    <!-- Search Widget -->
+    <!-- Content description for searching with a widget. The first parameter is the name of the application.-->
+    <string name="search_widget_content_description_2">%1$s نال نویں ٹیب کھولھو</string>
     <!-- Text preview for smaller sized widgets -->
     <string name="search_widget_text_short">کھوج</string>
     <!-- Text preview for larger sized widgets -->
@@ -369,34 +388,115 @@
     <string name="preferences_category_general">عام</string>
     <!-- Preference category for all links about Fenix -->
     <string name="preferences_category_about">بارے</string>
+    <!-- Preference category for settings related to changing the default search engine -->
+    <string name="preferences_category_select_default_search_engine">اک چݨو</string>
+    <!-- Preference for settings related to managing search shortcuts for the quick search menu -->
+    <string name="preferences_manage_search_shortcuts_2">بدلویں کھوج انجݨاں دا انتئام کرو</string>
+    <!-- Summary for preference for settings related to managing search shortcuts for the quick search menu -->
+    <string name="preferences_manage_search_shortcuts_summary">کھوج مینو وچ دسݨ والے انجݨاں نوں سودھو</string>
+    <!-- Preference category for settings related to managing search shortcuts for the quick search menu -->
+    <string name="preferences_category_engines_in_search_menu">کھوج مینو وچ دسݨ والے انجݨ</string>
     <!-- Preference for settings related to changing the default search engine -->
     <string name="preferences_default_search_engine">مول کھوج والا</string>
     <!-- Preference for settings related to Search -->
     <string name="preferences_search">کھوج</string>
 
 
+    <!-- Preference for settings related to Search engines -->
+    <string name="preferences_search_engines">کھوجݨ والے انجݨ</string>
+    <!-- Preference for settings related to Search engines suggestions-->
+    <string name="preferences_search_engines_suggestions">کھوجݨ والیاں انجݨاں توں سجھاؤ</string>
+    <!-- Preference Category for settings related to Search address bar -->
+    <string name="preferences_settings_address_bar">سرناواں پٹی لئی ترجیحاں</string>
+    <!-- Preference Category for settings to Firefox Suggest -->
+    <string name="preference_search_address_bar_fx_suggest">سرناواں پٹی – فائرفاکس سجھاؤ</string>
+    <!-- Preference link to Learn more about Firefox Suggest -->
+    <string name="preference_search_learn_about_fx_suggest">فائرفاکس سجھاؤ بارے پور جاݨو</string>
     <!-- Preference link to rating Fenix on the Play Store -->
     <string name="preferences_rate">ایپ دکان تے درجہ دیو</string>
     <!-- Preference linking to about page for Fenix
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
     <string name="preferences_about">%1$s بارے</string>
 
+    <!-- Preference for settings related to changing the default browser -->
+    <string name="preferences_set_as_default_browser">مول براؤزر تے طور تے بݨاؤ</string>
     <!-- Preference category for advanced settings -->
     <string name="preferences_category_advanced">اضافی</string>
 
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">بند</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">چالو</string>
+    <!-- Preference category for privacy and security settings -->
+    <string name="preferences_category_privacy_security">پردے داری تے سرکھیا</string>
+    <!-- Preference for advanced site permissions -->
+    <string name="preferences_site_permissions">سائیٹ دیاں اجازتاں</string>
+    <!-- Preference for private browsing options -->
+    <string name="preferences_private_browsing_options">نجی براؤز کرن</string>
+    <!-- Preference for opening links in a private tab-->
+    <string name="preferences_open_links_in_a_private_tab">لنک نجی ٹیب وچ کھولھو</string>
+    <!-- Preference for allowing screenshots to be taken while in a private tab-->
+    <string name="preferences_allow_screenshots_in_private_mode">نجی براؤز وچ سکرین‌شاٹ منظور کرو</string>
+    <!-- Will inform the user of the risk of activating Allow screenshots in private browsing option -->
+    <string name="preferences_screenshots_in_private_mode_disclaimer">جے اجازت دتی تاں نجی ٹیباں اودوں وی دکھائی دیݨ‌گیاں، جدوں کئی ایپاں کھلھیاں ہندیاں ہن</string>
+
+    <!-- Preference for adding private browsing shortcut -->
+    <string name="preferences_add_private_browsing_shortcut"> نجی براؤز کرن شارٹ‌کٹ جوڑو</string>
+    <!-- Preference for enabling "HTTPS-Only" mode -->
+    <string name="preferences_https_only_title">سرف HTTPS ڈھنگ</string>
+
+    <!-- Label for cookie banner section in quick settings panel. -->
+    <string name="cookie_banner_blocker">کوکی جھنڈا روکو</string>
+    <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
+    <string name="preferences_cookie_banner_reduction_private_mode">نجی براؤز کرن وچ کوکی جھنڈا روکو</string>
+    <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
+    <string name="reduce_cookie_banner_off_for_site">ایس سائیٹ لئی بند اے</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
     <string name="cookie_banner_handling_details_site_is_not_supported_cancel_button">رد کرو</string>
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">اجازت دیو</string>
 
+    <!-- Text for request support button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
+    <string name="cookie_banner_handling_details_site_is_not_supported_request_support_button_2">بینتی بھیجیں</string>
+    <!-- Text for title indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
+    <string name="cookie_banner_handling_details_site_is_not_supported_title_2">ایس سائیٹ لئی سہایتا دی بینتی کرنی اے؟</string>
+    <!-- Label for the snackBar, after the user reports with success a website where cookie banner reducer did not work -->
+    <string name="cookie_banner_handling_report_site_snack_bar_text_2">ںینتی بھیجی ہوئی</string>
+    <!-- Text for indicating cookie banner handling is on this site, this is shown as part of the protections panel with the tracking protection toggle -->
+    <string name="reduce_cookie_banner_on_for_site">ایس سائیٹ لئی چالو</string>
+    <!-- Text for indicating that a request for unsupported site was sent to Nimbus (it's a Mozilla library for experiments), this is shown as part of the protections panel with the tracking protection toggle -->
+    <string name="reduce_cookie_banner_unsupported_site_request_submitted_2">سہایتا بینتی بھیجی</string>
+    <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
+    <string name="reduce_cookie_banner_unsupported_site">سائیٹ ایس ویلے سہایک نہیں اے</string>
+    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
+    <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">کیہہ %1$s لئی کوکی جھنڈا روکو چالو کرنا اے؟</string>
+    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
+    <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">کیہہ %1$s لئی کوکی جھنڈا روکو بند کرنا اے؟</string>
+    <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
+    <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s ایس سائیٹ لئی آپݨے آپ کوکی بینتیاں نوں بند نہیں کر سکدا اے۔ تسیں مستقبل وچ ایس سائیٹ واسطے سہایتا لئی بینتی کر سکدے او۔</string>
+    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
+    <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">بند کرن نال %1$s ایس سائیٹ لئی کوکیاں مٹا کے ایس نوں مڑ لوڈ کرےگا۔ ایہہ تہانوں لاگ آؤٹ جاں تہاڈی خرید داری کارٹاں نوں خالی کرےگا۔</string>
+
+    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
+    <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">چاکو کرو تے %1$s ایس سائیٹ واسطے کوکی جھنڈے نوں آپݨے آپ انکار کرن دی کوشش کرےگا۔</string>
+    <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
+    <string name="cookie_banner_cfr_title">%1$s نے ہݨے تہاڈے لئی کوکیاں توں انکار کیتا اے</string>
+
+    <!--Message for the cookie banner re-engagement CFR -->
+    <string name="cookie_banner_cfr_message">ایس سائیٹ لئی تہاڈے لئی گھٹ دھیان بھٹکݨا، گھٹ کوکیاں ٹریک کرن اے۔</string>
+
+    <!-- Description of the preference to enable "HTTPS-Only" mode. -->
+    <string name="preferences_https_only_summary">وادھا کیتی سرکھیا لئی HTTPS انکرپشن پروٹوکال ورت کے سائیٹاں نال کنیکٹ کرن دی آپݨے آپ کوشش کرو۔</string>
     <!-- Summary of https only preference if https only is set to off -->
     <string name="preferences_https_only_off">بند</string>
+    <!-- Summary of https only preference if https only is set to on in all tabs -->
+    <string name="preferences_https_only_on_all">سبھناں ٹیباں وچ چالو اے</string>
+    <!-- Summary of https only preference if https only is set to on in private tabs only -->
+    <string name="preferences_https_only_on_private">نجی ٹیباں وچ چالو ہی اے</string>
     <!-- Text displayed that links to website containing documentation about "HTTPS-Only" mode -->
     <string name="preferences_http_only_learn_more">ہور جاݨو</string>
+    <!-- Option for the https only setting -->
+    <string name="preferences_https_only_in_all_tabs">ساریاں ٹیباں وچ چالو کرو</string>
+    <!-- Option for the https only setting -->
+    <string name="preferences_https_only_in_private_tabs">صرف نجی ٹیباں وچ چالو کرو</string>
+    <!-- Title shown in the error page for when trying to access a http website while https only mode is enabled. -->
+    <string name="errorpage_httpsonly_title">سرکھیت سائیٹ دستیاب نہیں اے</string>
+    <!-- Preference for accessibility -->
+    <string name="preferences_accessibility">رسائیت</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">کھاتہ</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -416,17 +516,32 @@
     <!-- Preference for data choices -->
     <string name="preferences_data_choices">ڈیٹا چوݨاں</string>
 
+    <!-- Preference title for switch preference to suggest bookmarks when searching -->
+    <string name="preferences_search_bookmarks">اتے پتے دی کھوج</string>
+    <!-- Preference for open links in third party apps always open in apps option -->
+    <string name="preferences_open_links_in_apps_always">ہمیشہ</string>
+    <!-- Preference for open links in third party apps never open in apps option -->
+    <string name="preferences_open_links_in_apps_never">کدے نہیں</string>
+
     <!-- Preference for add_ons -->
     <string name="preferences_addons">وادھے والے</string>
 
     <!-- Preference for notifications -->
     <string name="preferences_notifications">اطلاع نامے</string>
 
+    <!-- Summary for notification preference indicating notifications are allowed -->
+    <string name="notifications_allowed_summary">اجازت دتے</string>
+    <!-- Summary for notification preference indicating notifications are not allowed -->
+    <string name="notifications_not_allowed_summary">اجازت نہیں دتے</string>
+
     <!-- Button caption to confirm the add-on collection configuration -->
     <string name="customize_addon_collection_ok">ٹھیک اے</string>
     <!-- Button caption to abort the add-on collection configuration -->
     <string name="customize_addon_collection_cancel">رد کرو</string>
 
+    <!-- Title for the opening wallpaper settings screen -->
+    <string name="customize_wallpapers">والپیپر</string>
+
     <!-- Snackbar label for action to view selected wallpaper -->
     <string name="wallpaper_updated_snackbar_action">ویکھو</string>
 
@@ -437,6 +552,18 @@
 
     <!-- Preference for syncing history -->
     <string name="preferences_sync_history">تریخ</string>
+    <!-- Preference for syncing bookmarks -->
+    <string name="preferences_sync_bookmarks">اتے پتے</string>
+    <!-- Preference for syncing logins -->
+    <string name="preferences_sync_logins">لاگ ان</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">پاس‌ورڈ</string>
+    <!-- Preference for syncing tabs -->
+    <string name="preferences_sync_tabs_2">ساریاں کھولھو</string>
+    <!-- Preference for signing out -->
+    <string name="preferences_sign_out">لاگ آؤٹ</string>
+    <!-- Preference displays and allows changing current FxA device name -->
+    <string name="preferences_sync_device_name">ڈوائیس دا ناں</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">پتے</string>
 
@@ -811,6 +938,9 @@
     <!-- Clickable text for opening an external link for more information about Pocket. -->
     <string name="pocket_stories_feature_learn_more">ہور جاݨو</string>
 
+    <!-- Snackbar button text to navigate to telemetry settings.-->
+    <string name="experiments_snackbar_button">سیٹنگاں نوں جاؤ</string>
+
     <!-- Translations feature-->
 
     </resources>

From 294b781e80e5f2b37363a5daf07ae3ecac62b4fc Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 30 Jan 2024 12:48:21 +0200
Subject: [PATCH 066/222] Bug 1877409 - Add more test logs to CustomTabRobot

---
 .../mozilla/fenix/ui/robots/CustomTabRobot.kt | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt
index fd76071c1..01959e7b8 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package org.mozilla.fenix.ui.robots
 
+import android.util.Log
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -14,6 +15,7 @@ import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiSelector
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.Constants.LONG_CLICK_DURATION
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
@@ -43,14 +45,16 @@ class CustomTabRobot {
             itemWithDescription(getStringResource(R.string.mozac_feature_customtabs_share_link)),
         )
 
-    fun verifyMainMenuButton() = assertUIObjectExists(mainMenuButton)
+    fun verifyMainMenuButton() = assertUIObjectExists(mainMenuButton())
 
     fun verifyDesktopSiteButtonExists() {
         desktopSiteButton().check(matches(isDisplayed()))
+        Log.i(TAG, "verifyDesktopSiteButtonExists: Verified request desktop site button is displayed")
     }
 
     fun verifyFindInPageButtonExists() {
         findInPageButton().check(matches(isDisplayed()))
+        Log.i(TAG, "verifyFindInPageButtonExists: Verified find in page button is displayed")
     }
 
     fun verifyPoweredByTextIsDisplayed() =
@@ -58,6 +62,7 @@ class CustomTabRobot {
 
     fun verifyOpenInBrowserButtonExists() {
         openInBrowserButton().check(matches(isDisplayed()))
+        Log.i(TAG, "verifyOpenInBrowserButtonExists: Verified open in browser button is displayed")
     }
 
     fun verifyBackButtonExists() = assertUIObjectExists(itemWithDescription("Back"))
@@ -70,6 +75,7 @@ class CustomTabRobot {
 
     fun verifyCustomTabCloseButton() {
         closeButton().check(matches(isDisplayed()))
+        Log.i(TAG, "verifyCustomTabCloseButton: Verified close custom tab button is displayed")
     }
 
     fun verifyCustomTabToolbarTitle(title: String) {
@@ -104,6 +110,7 @@ class CustomTabRobot {
             waitingTime,
         )
         customTabToolbar().click(LONG_CLICK_DURATION)
+        Log.i(TAG, "longCLickAndCopyToolbarUrl: Long clicked custom tab toolbar")
         clickContextMenuItem("Copy")
     }
 
@@ -118,9 +125,15 @@ class CustomTabRobot {
         )
     }
 
-    fun waitForPageToLoad() = progressBar.waitUntilGone(waitingTime)
+    fun waitForPageToLoad() {
+        progressBar().waitUntilGone(waitingTime)
+        Log.i(TAG, "waitForPageToLoad: Waited $waitingTime ms until progress bar was gone")
+    }
 
-    fun clickCustomTabCloseButton() = closeButton().click()
+    fun clickCustomTabCloseButton() {
+        closeButton().click()
+        Log.i(TAG, "clickCustomTabCloseButton: Clicked close custom tab button")
+    }
 
     fun verifyCustomTabActionButton(customTabActionButtonDescription: String) =
         assertUIObjectExists(itemWithDescription(customTabActionButtonDescription))
@@ -133,9 +146,11 @@ class CustomTabRobot {
 
     class Transition {
         fun openMainMenu(interact: CustomTabRobot.() -> Unit): Transition {
-            mainMenuButton.also {
+            mainMenuButton().also {
+                Log.i(TAG, "openMainMenu: Looking for main menu button")
                 it.waitForExists(waitingTime)
                 it.click()
+                Log.i(TAG, "openMainMenu: Clicked main menu button")
             }
 
             CustomTabRobot().interact()
@@ -144,6 +159,7 @@ class CustomTabRobot {
 
         fun clickOpenInBrowserButton(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
             openInBrowserButton().perform(click())
+            Log.i(TAG, "clickOpenInBrowserButton: Clicked \"Open in Firefox\" button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -151,6 +167,7 @@ class CustomTabRobot {
 
         fun clickShareButton(interact: ShareOverlayRobot.() -> Unit): ShareOverlayRobot.Transition {
             itemWithDescription(getStringResource(R.string.mozac_feature_customtabs_share_link)).click()
+            Log.i(TAG, "clickShareButton: Clicked share button")
 
             ShareOverlayRobot().interact()
             return ShareOverlayRobot.Transition()
@@ -163,7 +180,7 @@ fun customTabScreen(interact: CustomTabRobot.() -> Unit): CustomTabRobot.Transit
     return CustomTabRobot.Transition()
 }
 
-private val mainMenuButton = itemWithResId("$packageName:id/mozac_browser_toolbar_menu")
+private fun mainMenuButton() = itemWithResId("$packageName:id/mozac_browser_toolbar_menu")
 
 private fun desktopSiteButton() = onView(withId(R.id.switch_widget))
 
@@ -175,7 +192,7 @@ private fun closeButton() = onView(withContentDescription("Return to previous ap
 
 private fun customTabToolbar() = mDevice.findObject(By.res("$packageName:id/toolbar"))
 
-private val progressBar =
+private fun progressBar() =
     mDevice.findObject(
         UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_progress"),
     )

From 7122973f6a363cf7b5b8eb735206eaed0523c23a Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 30 Jan 2024 14:10:25 +0200
Subject: [PATCH 067/222] Bug 1877435 - Add more test logs to
 EnhancedTrackingProtectionRobot

---
 .../robots/EnhancedTrackingProtectionRobot.kt | 51 +++++++++++++++----
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt
index 6c7cdeff3..29e2a25ab 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt
@@ -6,6 +6,7 @@
 
 package org.mozilla.fenix.ui.robots
 
+import android.util.Log
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.RootMatchers
@@ -21,6 +22,7 @@ import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.containsString
 import org.hamcrest.Matchers.not
 import org.mozilla.fenix.R
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
@@ -43,7 +45,8 @@ class EnhancedTrackingProtectionRobot {
 
     fun verifyCrossSiteCookiesBlocked(isBlocked: Boolean) {
         assertUIObjectExists(itemWithResId("$packageName:id/cross_site_tracking"))
-        crossSiteCookiesBlockListButton.click()
+        crossSiteCookiesBlockListButton().click()
+        Log.i(TAG, "verifyCrossSiteCookiesBlocked: Clicked cross site cookies block list button")
         // Verifies the trackers block/allow list
         onView(withId(R.id.details_blocking_header))
             .check(
@@ -57,11 +60,13 @@ class EnhancedTrackingProtectionRobot {
                     ),
                 ),
             )
+        Log.i(TAG, "verifyCrossSiteCookiesBlocked: Verified cross site cookies are blocked: $isBlocked")
     }
 
     fun verifySocialMediaTrackersBlocked(isBlocked: Boolean) {
         assertUIObjectExists(itemWithResId("$packageName:id/social_media_trackers"))
-        socialTrackersBlockListButton.click()
+        socialTrackersBlockListButton().click()
+        Log.i(TAG, "verifySocialMediaTrackersBlocked: Clicked social trackers block list button")
         // Verifies the trackers block/allow list
         onView(withId(R.id.details_blocking_header))
             .check(
@@ -75,12 +80,15 @@ class EnhancedTrackingProtectionRobot {
                     ),
                 ),
             )
+        Log.i(TAG, "verifySocialMediaTrackersBlocked: Verified social trackers are blocked: $isBlocked")
         onView(withId(R.id.blocking_text_list)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifySocialMediaTrackersBlocked: Verified blocked social trackers list is displayed")
     }
 
     fun verifyFingerprintersBlocked(isBlocked: Boolean) {
         assertUIObjectExists(itemWithResId("$packageName:id/fingerprinters"))
-        fingerprintersBlockListButton.click()
+        fingerprintersBlockListButton().click()
+        Log.i(TAG, "verifyFingerprintersBlocked: Clicked fingerprinters block list button")
         // Verifies the trackers block/allow list
         onView(withId(R.id.details_blocking_header))
             .check(
@@ -94,12 +102,15 @@ class EnhancedTrackingProtectionRobot {
                     ),
                 ),
             )
+        Log.i(TAG, "verifyFingerprintersBlocked: Verified fingerprinters are blocked: $isBlocked")
         onView(withId(R.id.blocking_text_list)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyFingerprintersBlocked: Verified blocked fingerprinter trackers list is displayed")
     }
 
     fun verifyCryptominersBlocked(isBlocked: Boolean) {
         assertUIObjectExists(itemWithResId("$packageName:id/cryptominers"))
-        cryptominersBlockListButton.click()
+        cryptominersBlockListButton().click()
+        Log.i(TAG, "verifyCryptominersBlocked: Clicked cryptominers block list button")
         // Verifies the trackers block/allow list
         onView(withId(R.id.details_blocking_header))
             .check(
@@ -113,12 +124,15 @@ class EnhancedTrackingProtectionRobot {
                     ),
                 ),
             )
+        Log.i(TAG, "verifyCryptominersBlocked: Verified cryptominers are blocked: $isBlocked")
         onView(withId(R.id.blocking_text_list)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyCryptominersBlocked: Verified blocked cryptominers trackers list is displayed")
     }
 
     fun verifyTrackingContentBlocked(isBlocked: Boolean) {
         assertUIObjectExists(itemWithText("Tracking Content"))
-        trackingContentBlockListButton.click()
+        trackingContentBlockListButton().click()
+        Log.i(TAG, "verifyTrackingContentBlocked: Clicked tracking content block list button")
         // Verifies the trackers block/allow list
         onView(withId(R.id.details_blocking_header))
             .check(
@@ -132,7 +146,9 @@ class EnhancedTrackingProtectionRobot {
                     ),
                 ),
             )
+        Log.i(TAG, "verifyTrackingContentBlocked: Verified tracking content is blocked: $isBlocked")
         onView(withId(R.id.blocking_text_list)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyTrackingContentBlocked: Verified blocked tracking content trackers list is displayed")
     }
 
     fun viewTrackingContentBlockList() {
@@ -148,6 +164,7 @@ class EnhancedTrackingProtectionRobot {
                     ),
                 ),
             )
+        Log.i(TAG, "viewTrackingContentBlockList: Verified blocked tracking content trackers")
     }
 
     fun verifyETPSectionIsDisplayedInQuickSettingsSheet(isDisplayed: Boolean) =
@@ -158,12 +175,15 @@ class EnhancedTrackingProtectionRobot {
 
     fun navigateBackToDetails() {
         onView(withId(R.id.details_back)).click()
+        Log.i(TAG, "navigateBackToDetails: Clicked details list back button")
     }
 
     class Transition {
         fun openEnhancedTrackingProtectionSheet(interact: EnhancedTrackingProtectionRobot.() -> Unit): Transition {
+            Log.i(TAG, "openEnhancedTrackingProtectionSheet: Looking for site security button")
             pageSecurityIndicator().waitForExists(waitingTime)
             pageSecurityIndicator().click()
+            Log.i(TAG, "openEnhancedTrackingProtectionSheet: Clicked site security button")
             assertSecuritySheetIsCompletelyDisplayed()
 
             EnhancedTrackingProtectionRobot().interact()
@@ -173,6 +193,7 @@ class EnhancedTrackingProtectionRobot {
         fun closeEnhancedTrackingProtectionSheet(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
             // Back out of the Enhanced Tracking Protection sheet
             mDevice.pressBack()
+            Log.i(TAG, "closeEnhancedTrackingProtectionSheet: Clicked device back button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -180,23 +201,29 @@ class EnhancedTrackingProtectionRobot {
 
         fun toggleEnhancedTrackingProtectionFromSheet(interact: EnhancedTrackingProtectionRobot.() -> Unit): Transition {
             enhancedTrackingProtectionSwitch().click()
+            Log.i(TAG, "toggleEnhancedTrackingProtectionFromSheet: Clicked ETP switch")
 
             EnhancedTrackingProtectionRobot().interact()
             return Transition()
         }
 
         fun openProtectionSettings(interact: SettingsSubMenuEnhancedTrackingProtectionRobot.() -> Unit): SettingsSubMenuEnhancedTrackingProtectionRobot.Transition {
+            Log.i(TAG, "openProtectionSettings: Looking for ETP sheet \"Details\" button")
             openEnhancedTrackingProtectionDetails().waitForExists(waitingTime)
             openEnhancedTrackingProtectionDetails().click()
+            Log.i(TAG, "openProtectionSettings: Clicked ETP sheet \"Details\" button")
             trackingProtectionSettingsButton().click()
+            Log.i(TAG, "openProtectionSettings: Clicked \"Protection Settings\" button")
 
             SettingsSubMenuEnhancedTrackingProtectionRobot().interact()
             return SettingsSubMenuEnhancedTrackingProtectionRobot.Transition()
         }
 
         fun openDetails(interact: EnhancedTrackingProtectionRobot.() -> Unit): Transition {
+            Log.i(TAG, "openDetails: Looking for ETP sheet \"Details\" button")
             openEnhancedTrackingProtectionDetails().waitForExists(waitingTime)
             openEnhancedTrackingProtectionDetails().click()
+            Log.i(TAG, "openDetails: Clicked ETP sheet \"Details\" button")
 
             EnhancedTrackingProtectionRobot().interact()
             return Transition()
@@ -213,9 +240,11 @@ private fun assertETPSwitchVisibility(visible: Boolean) {
     if (visible) {
         enhancedTrackingProtectionSwitch()
             .check(matches(isDisplayed()))
+        Log.i(TAG, "assertETPSwitchVisibility: Verified ETP toggle is displayed")
     } else {
         enhancedTrackingProtectionSwitch()
             .check(matches(not(isDisplayed())))
+        Log.i(TAG, "assertETPSwitchVisibility: Verified ETP toggle is not displayed")
     }
 }
 
@@ -228,6 +257,7 @@ private fun assertEnhancedTrackingProtectionSheetStatus(status: String, state: B
             ),
         ),
     )
+    Log.i(TAG, "assertEnhancedTrackingProtectionSheetStatus: Verified ETP toggle is checked: $state")
 }
 
 private fun pageSecurityIndicator() =
@@ -246,7 +276,7 @@ private fun trackingProtectionSettingsButton() =
 private fun openEnhancedTrackingProtectionDetails() =
     mDevice.findObject(UiSelector().resourceId("$packageName:id/trackingProtectionDetails"))
 
-private val trackingContentBlockListButton =
+private fun trackingContentBlockListButton() =
     onView(
         allOf(
             withText("Tracking Content"),
@@ -254,7 +284,7 @@ private val trackingContentBlockListButton =
         ),
     )
 
-private val socialTrackersBlockListButton =
+private fun socialTrackersBlockListButton() =
     onView(
         allOf(
             withId(R.id.social_media_trackers),
@@ -262,7 +292,7 @@ private val socialTrackersBlockListButton =
         ),
     )
 
-private val crossSiteCookiesBlockListButton =
+private fun crossSiteCookiesBlockListButton() =
     onView(
         allOf(
             withId(R.id.cross_site_tracking),
@@ -270,7 +300,7 @@ private val crossSiteCookiesBlockListButton =
         ),
     )
 
-private val cryptominersBlockListButton =
+private fun cryptominersBlockListButton() =
     onView(
         allOf(
             withId(R.id.cryptominers),
@@ -278,7 +308,7 @@ private val cryptominersBlockListButton =
         ),
     )
 
-private val fingerprintersBlockListButton =
+private fun fingerprintersBlockListButton() =
     onView(
         allOf(
             withId(R.id.fingerprinters),
@@ -287,6 +317,7 @@ private val fingerprintersBlockListButton =
     )
 
 private fun assertSecuritySheetIsCompletelyDisplayed() {
+    Log.i(TAG, "assertSecuritySheetIsCompletelyDisplayed: Looking for quick actions sheet")
     mDevice.findObject(UiSelector().description(getStringResource(R.string.quick_settings_sheet)))
         .waitForExists(waitingTime)
     assertUIObjectExists(itemWithResId("$packageName:id/quick_action_sheet"))

From f1b67e9866ea0ed22b207b7433f57dfafbfb4a45 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 26 Jan 2024 15:16:37 +0200
Subject: [PATCH 068/222] Bug 1876734 - Add more test logs to
 ComposeTopSitesRobot

---
 .../mozilla/fenix/ui/ComposeTopSitesTest.kt   |  6 +++-
 .../fenix/ui/robots/ComposeTopSitesRobot.kt   | 28 +++++++++++--------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTopSitesTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTopSitesTest.kt
index a648e4d6d..50bfadce1 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTopSitesTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTopSitesTest.kt
@@ -20,8 +20,10 @@ import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.helpers.TestHelper.waitUntilSnackbarGone
 import org.mozilla.fenix.ui.robots.browserScreen
+import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.homeScreenWithComposeTopSites
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
@@ -259,9 +261,11 @@ class ComposeTopSitesTest {
             verifyExistingTopSitesList()
             verifyExistingTopSiteItem(defaultWebPage.title)
         }.openContextMenuOnTopSitesWithTitle(defaultWebPage.title) {
-        }.deleteTopSiteFromHistory {
+        }.removeTopSite {
             verifySnackBarText(getStringResource(R.string.snackbar_top_site_removed))
             waitUntilSnackbarGone()
+        }
+        homeScreen {
         }.openThreeDotMenu {
         }.openHistory {
             verifyEmptyHistoryView()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt
index 8493d3ee7..1a25a39e6 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.ui.robots
 
+import android.util.Log
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.filter
 import androidx.compose.ui.test.hasAnyChild
@@ -16,6 +17,7 @@ import androidx.compose.ui.test.onFirst
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performScrollTo
 import androidx.compose.ui.test.performTouchInput
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.HomeActivityComposeTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
@@ -32,14 +34,17 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
 
     @OptIn(ExperimentalTestApi::class)
     fun verifyExistingTopSitesList() {
+        Log.i(TAG, "verifyExistingTopSitesList: Waiting for top sites list to exist")
         composeTestRule.waitUntilAtLeastOneExists(hasTestTag(TopSitesTestTag.topSites), timeoutMillis = waitingTime)
     }
 
     @OptIn(ExperimentalTestApi::class)
     fun verifyExistingTopSiteItem(vararg titles: String) {
         titles.forEach { title ->
+            Log.i(TAG, "verifyExistingTopSiteItem: Waiting for top site: $title to exist")
             composeTestRule.waitUntilAtLeastOneExists(hasText(title), timeoutMillis = waitingTime)
             composeTestRule.topSiteItem(title).assertExists()
+            Log.i(TAG, "verifyExistingTopSiteItem: Top site with $title exists")
         }
     }
 
@@ -47,6 +52,7 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
         titles.forEach { title ->
             itemContainingText(title).waitForExists(waitingTime)
             composeTestRule.topSiteItem(title).assertDoesNotExist()
+            Log.i(TAG, "verifyNotExistingTopSiteItem: Top site with $title does not exist")
         }
     }
 
@@ -58,14 +64,17 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
 
     fun verifyTopSiteContextMenuOpenInPrivateTabButton() {
         composeTestRule.contextMenuItemOpenInPrivateTab().assertExists()
+        Log.i(TAG, "verifyTopSiteContextMenuOpenInPrivateTabButton: Verified \"Open in private tab\" menu button exists")
     }
 
     fun verifyTopSiteContextMenuRenameButton() {
         composeTestRule.contextMenuItemRename().assertExists()
+        Log.i(TAG, "verifyTopSiteContextMenuRenameButton: Verified \"Rename\" menu button exists")
     }
 
     fun verifyTopSiteContextMenuRemoveButton() {
         composeTestRule.contextMenuItemRemove().assertExists()
+        Log.i(TAG, "verifyTopSiteContextMenuRemoveButton: Verified \"Remove\" menu button exists")
     }
 
     class Transition(private val composeTestRule: HomeActivityComposeTestRule) {
@@ -75,6 +84,7 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
             interact: BrowserRobot.() -> Unit,
         ): BrowserRobot.Transition {
             composeTestRule.topSiteItem(title).performScrollTo().performClick()
+            Log.i(TAG, "openTopSiteTabWithTitle: Scrolled and clicked top site with title: $title")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -84,6 +94,7 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
             interact: BrowserRobot.() -> Unit,
         ): BrowserRobot.Transition {
             composeTestRule.contextMenuItemOpenInPrivateTab().performClick()
+            Log.i(TAG, "openTopSiteInPrivate: Clicked \"Open in private tab\" menu button")
             composeTestRule.waitForIdle()
 
             BrowserRobot().interact()
@@ -97,6 +108,7 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
             composeTestRule.topSiteItem(title).performScrollTo().performTouchInput {
                 longClick()
             }
+            Log.i(TAG, "openContextMenuOnTopSitesWithTitle: Long clicked top site with title: $title")
 
             ComposeTopSitesRobot(composeTestRule).interact()
             return Transition(composeTestRule)
@@ -107,12 +119,15 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
             interact: ComposeTopSitesRobot.() -> Unit,
         ): Transition {
             composeTestRule.contextMenuItemRename().performClick()
+            Log.i(TAG, "renameTopSite: Clicked \"Rename\" menu button")
             itemWithResId("$packageName:id/top_site_title")
                 .also {
                     it.waitForExists(waitingTimeShort)
                     it.setText(title)
                 }
+            Log.i(TAG, "renameTopSite: Top site rename text box was set to: $title")
             itemWithResIdContainingText("android:id/button1", "OK").click()
+            Log.i(TAG, "renameTopSite: Clicked \"Ok\" dialog button")
 
             ComposeTopSitesRobot(composeTestRule).interact()
             return Transition(composeTestRule)
@@ -123,22 +138,13 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
             interact: ComposeTopSitesRobot.() -> Unit,
         ): Transition {
             composeTestRule.contextMenuItemRemove().performClick()
+            Log.i(TAG, "removeTopSite: Clicked \"Remove\" menu button")
             composeTestRule.waitUntilDoesNotExist(hasTestTag(TopSitesTestTag.remove), waitingTime)
+            Log.i(TAG, "removeTopSite: Waited for \"Remove\" menu button to not exist")
 
             ComposeTopSitesRobot(composeTestRule).interact()
             return Transition(composeTestRule)
         }
-
-        @OptIn(ExperimentalTestApi::class)
-        fun deleteTopSiteFromHistory(
-            interact: BrowserRobot.() -> Unit,
-        ): BrowserRobot.Transition {
-            composeTestRule.contextMenuItemRemove().performClick()
-            composeTestRule.waitUntilDoesNotExist(hasTestTag(TopSitesTestTag.remove), waitingTime)
-
-            BrowserRobot().interact()
-            return BrowserRobot.Transition()
-        }
     }
 }
 

From b170ff7927919a4cf438a4b490fdc807f3395b41 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Wed, 31 Jan 2024 11:06:09 +0200
Subject: [PATCH 069/222] Bug 1877639 - Add more test logs to FindInPageRobot

---
 .../java/org/mozilla/fenix/ui/MainMenuTest.kt | 12 ++--
 .../org/mozilla/fenix/ui/PDFViewerTest.kt     |  8 +--
 .../fenix/ui/robots/FindInPageRobot.kt        | 61 +++++++++++--------
 3 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTest.kt
index fa871f779..24a877737 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTest.kt
@@ -175,21 +175,21 @@ class MainMenuTest {
             verifyFindInPagePrevButton()
             verifyFindInPageCloseButton()
             enterFindInPageQuery("a")
-            verifyFindNextInPageResult("1/3")
+            verifyFindInPageResult("1/3")
             clickFindInPageNextButton()
-            verifyFindNextInPageResult("2/3")
+            verifyFindInPageResult("2/3")
             clickFindInPageNextButton()
-            verifyFindNextInPageResult("3/3")
+            verifyFindInPageResult("3/3")
             clickFindInPagePrevButton()
-            verifyFindPrevInPageResult("2/3")
+            verifyFindInPageResult("2/3")
             clickFindInPagePrevButton()
-            verifyFindPrevInPageResult("1/3")
+            verifyFindInPageResult("1/3")
         }.closeFindInPageWithCloseButton {
             verifyFindInPageBar(false)
         }.openThreeDotMenu {
         }.openFindInPage {
             enterFindInPageQuery("3")
-            verifyFindNextInPageResult("1/1")
+            verifyFindInPageResult("1/1")
         }.closeFindInPageWithBackButton {
             verifyFindInPageBar(false)
         }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/PDFViewerTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/PDFViewerTest.kt
index 7b07993a2..340cbd08e 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/PDFViewerTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/PDFViewerTest.kt
@@ -117,17 +117,17 @@ class PDFViewerTest {
             verifyFindInPagePrevButton()
             verifyFindInPageCloseButton()
             enterFindInPageQuery("l")
-            verifyFindNextInPageResult("1/2")
+            verifyFindInPageResult("1/2")
             clickFindInPageNextButton()
-            verifyFindNextInPageResult("2/2")
+            verifyFindInPageResult("2/2")
             clickFindInPagePrevButton()
-            verifyFindPrevInPageResult("1/2")
+            verifyFindInPageResult("1/2")
         }.closeFindInPageWithCloseButton {
             verifyFindInPageBar(false)
         }.openThreeDotMenu {
         }.openFindInPage {
             enterFindInPageQuery("p")
-            verifyFindNextInPageResult("1/1")
+            verifyFindInPageResult("1/1")
         }.closeFindInPageWithBackButton {
             verifyFindInPageBar(false)
         }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt
index 277375597..ed459189b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt
@@ -6,6 +6,7 @@
 
 package org.mozilla.fenix.ui.robots
 
+import android.util.Log
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.clearText
 import androidx.test.espresso.action.ViewActions.typeText
@@ -16,6 +17,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.Until
 import org.mozilla.fenix.R
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.click
@@ -25,42 +27,39 @@ import org.mozilla.fenix.helpers.ext.waitNotNull
  * Implementation of Robot Pattern for the find in page UI.
  */
 class FindInPageRobot {
-    fun verifyFindInPageQuery() = assertFindInPageQuery()!!
-    fun verifyFindInPageNextButton() = assertFindInPageNextButton()!!
-    fun verifyFindInPagePrevButton() = assertFindInPagePrevButton()!!
-    fun verifyFindInPageCloseButton() = assertFindInPageCloseButton()!!
-    fun clickFindInPageNextButton() = findInPageNextButton().click()
-    fun clickFindInPagePrevButton() = findInPagePrevButton().click()
-
-    fun verifyFindInPageSearchBarItems() {
-        verifyFindInPageQuery()
-        verifyFindInPageNextButton()
-        verifyFindInPagePrevButton()
-        verifyFindInPageCloseButton()
+    fun verifyFindInPageNextButton() = assertFindInPageNextButton()
+    fun verifyFindInPagePrevButton() = assertFindInPagePrevButton()
+    fun verifyFindInPageCloseButton() = assertFindInPageCloseButton()
+    fun clickFindInPageNextButton() {
+        findInPageNextButton().click()
+        Log.i(TAG, "clickFindInPageNextButton: Clicked next result button")
+    }
+    fun clickFindInPagePrevButton() {
+        findInPagePrevButton().click()
+        Log.i(TAG, "clickFindInPagePrevButton: Clicked previous result button")
     }
 
     fun enterFindInPageQuery(expectedText: String) {
         mDevice.waitNotNull(Until.findObject(By.res("org.mozilla.fenix.debug:id/find_in_page_query_text")), waitingTime)
         findInPageQuery().perform(clearText())
+        Log.i(TAG, "enterFindInPageQuery: Cleared find in page bar text")
         mDevice.waitNotNull(Until.gone(By.res("org.mozilla.fenix.debug:id/find_in_page_result_text")), waitingTime)
         findInPageQuery().perform(typeText(expectedText))
+        Log.i(TAG, "enterFindInPageQuery: Typed $expectedText to find in page bar")
         mDevice.waitNotNull(Until.findObject(By.res("org.mozilla.fenix.debug:id/find_in_page_result_text")), waitingTime)
     }
 
-    fun verifyFindNextInPageResult(ratioCounter: String) {
-        mDevice.waitNotNull(Until.findObject(By.text(ratioCounter)), waitingTime)
-        findInPageResult().check(matches(withText((ratioCounter))))
-    }
-
-    fun verifyFindPrevInPageResult(ratioCounter: String) {
+    fun verifyFindInPageResult(ratioCounter: String) {
         mDevice.waitNotNull(Until.findObject(By.text(ratioCounter)), waitingTime)
         findInPageResult().check(matches(withText((ratioCounter))))
+        Log.i(TAG, "verifyFindInPageResult: Verified $ratioCounter results")
     }
 
     class Transition {
         fun closeFindInPageWithCloseButton(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
             mDevice.waitForIdle()
             findInPageCloseButton().click()
+            Log.i(TAG, "closeFindInPageWithCloseButton: Clicked close find in page button")
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
@@ -70,7 +69,9 @@ class FindInPageRobot {
 
             // Will need to press back 2x, the first will only dismiss the keyboard
             mDevice.pressBack()
+            Log.i(TAG, "closeFindInPageWithBackButton: Pressed 1x the device back button")
             mDevice.pressBack()
+            Log.i(TAG, "closeFindInPageWithBackButton: Pressed 2x the device back button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -84,14 +85,20 @@ private fun findInPageNextButton() = onView(withId(R.id.find_in_page_next_btn))
 private fun findInPagePrevButton() = onView(withId(R.id.find_in_page_prev_btn))
 private fun findInPageCloseButton() = onView(withId(R.id.find_in_page_close_btn))
 
-private fun assertFindInPageQuery() = findInPageQuery()
-    .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-
-private fun assertFindInPageNextButton() = findInPageNextButton()
-    .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+private fun assertFindInPageNextButton() {
+    findInPageNextButton()
+        .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+    Log.i(TAG, "assertFindInPageNextButton: Verified find in page next result button is visible")
+}
 
-private fun assertFindInPagePrevButton() = findInPagePrevButton()
-    .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+private fun assertFindInPagePrevButton() {
+    findInPagePrevButton()
+        .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+    Log.i(TAG, "assertFindInPagePrevButton: Verified find in page previous result button is visible")
+}
 
-private fun assertFindInPageCloseButton() = findInPageCloseButton()
-    .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+private fun assertFindInPageCloseButton() {
+    findInPageCloseButton()
+        .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+    Log.i(TAG, "assertFindInPageCloseButton: Verified find in page close button is visible")
+}

From 2c1324df25c3200363178f0ad03a050960632603 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Wed, 31 Jan 2024 11:32:26 +0200
Subject: [PATCH 070/222] Bug 1865316 - Fix askBeforeOpeningLinkInAppCancelTest
 UI test

---
 .../org/mozilla/fenix/ui/SettingsAdvancedTest.kt     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt
index 61244f8a6..86b0b1752 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt
@@ -158,11 +158,10 @@ class SettingsAdvancedTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(externalLinksPage.url) {
-            clickPageObject(youTubeFullLink)
+            clickPageObject(youTubeSchemaLink)
             verifyOpenLinkInAnotherAppPrompt()
             clickPageObject(itemWithResIdAndText("android:id/button2", "CANCEL"))
-            waitForPageToLoad()
-            verifyUrl("youtube")
+            verifyUrl(externalLinksPage.url.toString())
         }
     }
 
@@ -225,14 +224,13 @@ class SettingsAdvancedTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(externalLinksPage.url) {
-            clickPageObject(youTubeFullLink)
+            clickPageObject(youTubeSchemaLink)
             verifyPrivateBrowsingOpenLinkInAnotherAppPrompt(
                 url = "youtube",
-                pageObject = youTubeFullLink,
+                pageObject = youTubeSchemaLink,
             )
             clickPageObject(itemWithResIdAndText("android:id/button2", "CANCEL"))
-            waitForPageToLoad()
-            verifyUrl("youtube")
+            verifyUrl(externalLinksPage.url.toString())
         }
     }
 

From 48df9bb6bfa1ed136e0049718ecf6b57cbacd92c Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Wed, 31 Jan 2024 11:43:18 +0200
Subject: [PATCH 071/222] Bug 1844252 - Fix
 verifyVideoPlaybackSystemNotificationTest UI test

---
 .../java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt
index df12b8ff2..ffe888fbf 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt
@@ -235,7 +235,10 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
     /**
      * Closes a tab when there is only one tab open.
      */
+    @OptIn(ExperimentalTestApi::class)
     fun closeTab() {
+        composeTestRule.waitUntilAtLeastOneExists(hasTestTag(TabsTrayTestTag.tabItemClose))
+        composeTestRule.closeTabButton().assertExists()
         composeTestRule.closeTabButton().performClick()
         Log.i(TAG, "closeTab: Clicked close tab button")
     }

From 45238224b3888590b3b046ab720d2cbcbc5058db Mon Sep 17 00:00:00 2001
From: mike a <mavduevskiy@gmail.com>
Date: Fri, 5 Jan 2024 10:52:04 -0800
Subject: [PATCH 072/222] Bug 1873260 - Move Behavior classes to ui-widget
 component

---
 .../mozilla/fenix/browser/BaseBrowserFragment.kt    |  6 +++---
 .../fenix/components/toolbar/BrowserToolbarView.kt  | 13 ++++++-------
 .../fenix/browser/BaseBrowserFragmentTest.kt        |  8 ++++----
 .../components/toolbar/BrowserToolbarViewTest.kt    | 12 ++++++------
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index db23b580b..c90ccb91b 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -91,7 +91,6 @@ import mozilla.components.feature.session.PictureInPictureFeature
 import mozilla.components.feature.session.ScreenOrientationFeature
 import mozilla.components.feature.session.SessionFeature
 import mozilla.components.feature.session.SwipeRefreshFeature
-import mozilla.components.feature.session.behavior.EngineViewBrowserToolbarBehavior
 import mozilla.components.feature.sitepermissions.SitePermissionsFeature
 import mozilla.components.feature.webauthn.WebAuthnFeature
 import mozilla.components.lib.state.ext.consumeFlow
@@ -111,6 +110,7 @@ import mozilla.components.support.ktx.android.view.hideKeyboard
 import mozilla.components.support.ktx.kotlin.getOrigin
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
 import mozilla.components.support.locale.ActivityContextWrapper
+import mozilla.components.ui.widgets.behavior.EngineViewClippingBehavior
 import mozilla.components.ui.widgets.withCenterAlignedButtons
 import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.FeatureFlags
@@ -168,7 +168,7 @@ import org.mozilla.fenix.utils.allowUndo
 import org.mozilla.fenix.wifi.SitePermissionsWifiIntegration
 import java.lang.ref.WeakReference
 import kotlin.coroutines.cancellation.CancellationException
-import mozilla.components.feature.session.behavior.ToolbarPosition as MozacToolbarPosition
+import mozilla.components.ui.widgets.behavior.ToolbarPosition as MozacToolbarPosition
 
 /**
  * Base fragment extended by [BrowserFragment].
@@ -1154,7 +1154,7 @@ abstract class BaseBrowserFragment :
                 MozacToolbarPosition.TOP
             }
             (getSwipeRefreshLayout().layoutParams as CoordinatorLayout.LayoutParams).behavior =
-                EngineViewBrowserToolbarBehavior(
+                EngineViewClippingBehavior(
                     context,
                     null,
                     getSwipeRefreshLayout(),
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
index 666819159..1e3fc7a98 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
@@ -19,9 +19,9 @@ import mozilla.components.browser.state.selector.selectedTab
 import mozilla.components.browser.state.state.CustomTabSessionState
 import mozilla.components.browser.state.state.ExternalAppType
 import mozilla.components.browser.toolbar.BrowserToolbar
-import mozilla.components.browser.toolbar.behavior.BrowserToolbarBehavior
 import mozilla.components.browser.toolbar.display.DisplayToolbar
 import mozilla.components.support.ktx.util.URLStringUtils
+import mozilla.components.ui.widgets.behavior.EngineViewScrollingBehavior
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.toolbar.interactor.BrowserToolbarInteractor
 import org.mozilla.fenix.customtabs.CustomTabToolbarIntegration
@@ -32,7 +32,7 @@ import org.mozilla.fenix.theme.ThemeManager
 import org.mozilla.fenix.utils.Settings
 import org.mozilla.fenix.utils.ToolbarPopupWindow
 import java.lang.ref.WeakReference
-import mozilla.components.browser.toolbar.behavior.ToolbarPosition as MozacToolbarPosition
+import mozilla.components.ui.widgets.behavior.ViewPosition as MozacToolbarPosition
 
 @SuppressWarnings("LargeClass")
 class BrowserToolbarView(
@@ -53,8 +53,7 @@ class BrowserToolbarView(
     private val layout = LayoutInflater.from(context)
         .inflate(toolbarLayout, container, true)
 
-    @VisibleForTesting
-    internal var view: BrowserToolbar = layout
+    var view: BrowserToolbar = layout
         .findViewById(R.id.toolbar)
 
     val toolbarIntegration: ToolbarIntegration
@@ -191,7 +190,7 @@ class BrowserToolbarView(
         }
 
         (view.layoutParams as? CoordinatorLayout.LayoutParams)?.apply {
-            (behavior as? BrowserToolbarBehavior)?.forceExpand(view)
+            (behavior as? EngineViewScrollingBehavior)?.forceExpand(view)
         }
     }
 
@@ -202,7 +201,7 @@ class BrowserToolbarView(
         }
 
         (view.layoutParams as? CoordinatorLayout.LayoutParams)?.apply {
-            (behavior as? BrowserToolbarBehavior)?.forceCollapse(view)
+            (behavior as? EngineViewScrollingBehavior)?.forceCollapse(view)
         }
     }
 
@@ -255,7 +254,7 @@ class BrowserToolbarView(
     @VisibleForTesting
     internal fun setDynamicToolbarBehavior(toolbarPosition: MozacToolbarPosition) {
         (view.layoutParams as? CoordinatorLayout.LayoutParams)?.apply {
-            behavior = BrowserToolbarBehavior(view.context, null, toolbarPosition)
+            behavior = EngineViewScrollingBehavior(view.context, null, toolbarPosition)
         }
     }
 
diff --git a/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt
index 9db600442..4a7e37e36 100644
--- a/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt
@@ -16,8 +16,8 @@ import mozilla.components.browser.state.state.SessionState
 import mozilla.components.concept.engine.EngineView
 import mozilla.components.concept.engine.permission.SitePermissions
 import mozilla.components.feature.contextmenu.ContextMenuCandidate
-import mozilla.components.feature.session.behavior.EngineViewBrowserToolbarBehavior
 import mozilla.components.ui.widgets.VerticalSwipeRefreshLayout
+import mozilla.components.ui.widgets.behavior.EngineViewClippingBehavior
 import org.junit.Before
 import org.junit.Test
 import org.mozilla.fenix.ext.components
@@ -88,17 +88,17 @@ class BaseBrowserFragmentTest {
     }
 
     @Test
-    fun `initializeEngineView should set EngineViewBrowserToolbarBehavior when dynamic toolbar is enabled`() {
+    fun `initializeEngineView should set EngineViewClippingBehavior when dynamic toolbar is enabled`() {
         every { settings.shouldUseFixedTopToolbar } returns false
         every { settings.isDynamicToolbarEnabled } returns true
         val params: CoordinatorLayout.LayoutParams = mockk(relaxed = true)
         every { params.behavior } returns mockk(relaxed = true)
         every { swipeRefreshLayout.layoutParams } returns params
-        val behavior = slot<EngineViewBrowserToolbarBehavior>()
+        val behavior = slot<EngineViewClippingBehavior>()
 
         fragment.initializeEngineView(13)
 
-        // EngineViewBrowserToolbarBehavior constructor parameters are not properties, we cannot check them.
+        // EngineViewClippingBehavior constructor parameters are not properties, we cannot check them.
         // Ensure just that the right behavior is set.
         verify { params.behavior = capture(behavior) }
     }
diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt
index 8ad2f6854..2fad1a270 100644
--- a/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt
@@ -11,9 +11,9 @@ import io.mockk.mockk
 import io.mockk.spyk
 import io.mockk.verify
 import mozilla.components.browser.toolbar.BrowserToolbar
-import mozilla.components.browser.toolbar.behavior.BrowserToolbarBehavior
 import mozilla.components.lib.publicsuffixlist.PublicSuffixList
 import mozilla.components.support.test.robolectric.testContext
+import mozilla.components.ui.widgets.behavior.EngineViewScrollingBehavior
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Before
@@ -22,20 +22,20 @@ import org.junit.runner.RunWith
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.utils.Settings
-import mozilla.components.browser.toolbar.behavior.ToolbarPosition as MozacToolbarPosition
+import mozilla.components.ui.widgets.behavior.ViewPosition as MozacToolbarPosition
 
 @RunWith(FenixRobolectricTestRunner::class)
 class BrowserToolbarViewTest {
     private lateinit var toolbarView: BrowserToolbarView
     private lateinit var toolbar: BrowserToolbar
-    private lateinit var behavior: BrowserToolbarBehavior
+    private lateinit var behavior: EngineViewScrollingBehavior
     private lateinit var settings: Settings
 
     @Before
     fun setup() {
         toolbar = BrowserToolbar(testContext)
         toolbar.layoutParams = CoordinatorLayout.LayoutParams(100, 100)
-        behavior = spyk(BrowserToolbarBehavior(testContext, null, MozacToolbarPosition.BOTTOM))
+        behavior = spyk(EngineViewScrollingBehavior(testContext, null, MozacToolbarPosition.BOTTOM))
         (toolbar.layoutParams as CoordinatorLayout.LayoutParams).behavior = behavior
         settings = mockk(relaxed = true)
         every { testContext.components.useCases } returns mockk(relaxed = true)
@@ -217,7 +217,7 @@ class BrowserToolbarViewTest {
     }
 
     @Test
-    fun `setDynamicToolbarBehavior should set a BrowserToolbarBehavior for the bottom toolbar`() {
+    fun `setDynamicToolbarBehavior should set a ViewHideOnScrollBehavior for the bottom toolbar`() {
         val toolbarViewSpy = spyk(toolbarView)
         (toolbar.layoutParams as CoordinatorLayout.LayoutParams).behavior = null
 
@@ -227,7 +227,7 @@ class BrowserToolbarViewTest {
     }
 
     @Test
-    fun `setDynamicToolbarBehavior should set a BrowserToolbarBehavior for the top toolbar`() {
+    fun `setDynamicToolbarBehavior should set a ViewHideOnScrollBehavior for the top toolbar`() {
         val toolbarViewSpy = spyk(toolbarView)
         (toolbar.layoutParams as CoordinatorLayout.LayoutParams).behavior = null
 

From 1a5db351f2259b25dcc41bb0816cd562692a633d Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Thu, 1 Feb 2024 00:03:43 +0000
Subject: [PATCH 073/222] Import translations from android-l10n

---
 app/src/main/res/values-am/strings.xml     |  14 ++-
 app/src/main/res/values-bg/strings.xml     |  58 +++-------
 app/src/main/res/values-cy/strings.xml     |  16 ++-
 app/src/main/res/values-da/strings.xml     |  54 ++--------
 app/src/main/res/values-de/strings.xml     |  61 +++--------
 app/src/main/res/values-dsb/strings.xml    |  59 +++--------
 app/src/main/res/values-es-rAR/strings.xml |  16 ++-
 app/src/main/res/values-fi/strings.xml     |  12 +--
 app/src/main/res/values-fr/strings.xml     |  61 +++--------
 app/src/main/res/values-fy-rNL/strings.xml |  16 ++-
 app/src/main/res/values-hsb/strings.xml    |  62 +++--------
 app/src/main/res/values-hu/strings.xml     |  61 +++--------
 app/src/main/res/values-ia/strings.xml     |  61 +++--------
 app/src/main/res/values-is/strings.xml     |  61 +++--------
 app/src/main/res/values-it/strings.xml     |  61 +++--------
 app/src/main/res/values-iw/strings.xml     |  58 +++-------
 app/src/main/res/values-kab/strings.xml    | 118 ++++++++++++++-------
 app/src/main/res/values-kk/strings.xml     |  62 +++--------
 app/src/main/res/values-ko/strings.xml     |  64 +++--------
 app/src/main/res/values-nl/strings.xml     |  61 +++--------
 app/src/main/res/values-pt-rBR/strings.xml |  16 ++-
 app/src/main/res/values-pt-rPT/strings.xml |  16 ++-
 app/src/main/res/values-ru/strings.xml     |  62 +++--------
 app/src/main/res/values-si/strings.xml     |   7 ++
 app/src/main/res/values-sv-rSE/strings.xml |  16 ++-
 app/src/main/res/values-tr/strings.xml     |  16 ++-
 app/src/main/res/values-ug/strings.xml     |  16 ++-
 app/src/main/res/values-zh-rCN/strings.xml |  53 ++-------
 app/src/main/res/values-zh-rTW/strings.xml |  62 +++--------
 29 files changed, 449 insertions(+), 851 deletions(-)

diff --git a/app/src/main/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml
index 536812bbd..82c9874c7 100644
--- a/app/src/main/res/values-am/strings.xml
+++ b/app/src/main/res/values-am/strings.xml
@@ -238,6 +238,7 @@
     <string name="browser_menu_edit">አርትዕ</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">መነሻ ገጽ አብጅ</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">የመነሻ ማያ ገጽ</string>
@@ -245,6 +246,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">የአሰሳ ታሪክን አጥፋ</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">ገጽ ተርጉም</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">የተመረጠ ቋንቋ</string>
@@ -1992,12 +1996,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">የይለፍ ቃል አማራጮች</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">ለመግቢያው የድር አድራሻ ሊስተካከል የሚችል የጽሑፍ መስክ።</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">የይለፍ ቃል የድርጣቢያ አድራሻ ሊስተካከል የሚችል የጽሑፍ መስክ።</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">ለድር ጣቢያው አድራሻ ሊስተካከል የሚችል የጽሑፍ መስክ።</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">ለመግቢያው የተጠቃሚ ስም ሊስተካከል የሚችል የጽሑፍ መስክ።</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">የይለፍ ቃል የተጠቃሚ ስም ሊስተካከል የሚችል የጽሑፍ መስክ።</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">ለተጠቃሚ ስም ሊስተካከል የሚችል የጽሑፍ መስክ።</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">ለመግቢያው የይለፍ ቃል ሊስተካከል የሚችል የጽሑፍ መስክ።</string>
     <!--  The editable text field for a login's password. -->
@@ -2374,6 +2378,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">በመተርጎም ሂደት ላይ</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">ቋንቋ ይምረጡ</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">የመተርጎም ችግር ነበር። እባክዎ እንደገና ይሞክሩ።</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index cc35bf1da..36085508a 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -246,6 +246,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Персонализиране на началната страница</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Начален екран</string>
@@ -253,6 +254,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Изчистване историята на разглеждане</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Превеждане на страницатa</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Избран език</string>
@@ -265,8 +269,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Сканиране</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Търсеща машина</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Настройки на търсачките</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -320,14 +322,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Известията ви помагат да правите повече с %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Известията ви помагат да правите повече с %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Синхронизирайте вашите раздели между устройствата, управлявайте изтеглянията, получавайте съвети как да се възползвате максимално от защитата на поверителността на %s и много други.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Синхронизирайте вашите раздели между устройствата, управлявайте изтеглянията, получавайте съвети как да се възползвате максимално от защитата на поверителността на %s и много други.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Продължаване</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Продължаване</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Не сега</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Не сега</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -445,20 +447,10 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Режим „само HTTPS“</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Намаляване на банерите за бисквитки</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Блокиране на банери за бисквитки</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Блокиране на банери за бисквитки при поверително сърфиране</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Намаляване на банерите за бисквитки</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Изключено</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Включено</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s автоматично се опитва да отхвърли заявки за бисквитки от банери за бисквитки.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Изключено за страницата</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -476,34 +468,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Страницата не се поддържа</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Включване на намаляването на банерите за бисквитки за %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Включване на скриването на банери за бисквитки за %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Изключване на намаляването на банерите за бисквитки за %1$s?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Изключване на скриването на банери за бисквитки за %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s не може автоматично да отхвърля заявките за бисквитки на този сайт. Можете да изпратите заявка за поддръжка на този сайт в бъдеще.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ще изчисти бисквитките на този сайт и ще презареди страницата. Изчистването на всички бисквитки може да ви отпише от системата или да изпразни количките ви за пазаруване.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Изключете и %1$s ще изчисти бисквитките и ще презареди този сайт. Това може да доведе до излизане от профила или изпразване на количките.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s се опитва автоматично да отхвърли всички заявки за бисквитки на поддържаните сайтове.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Включете и %1$s ще се опита автоматично да откаже всички банери за бисквитки на този сайт.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Да се разреши ли на %1$s да отхвърля банери за бисквитки?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s може автоматично да отхвърли много заявки за банери за бисквитки.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Не сега</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Ще виждате по-малко заявки за бисквитки</string>
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Разрешаване</string>
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s току-що отказа бисквитки вместо вас</string>
     <!--Message for the cookie banner re-engagement CFR -->
@@ -1292,8 +1266,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Прекратяване</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Грешка при отпечатване</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Страницата не може да бъде отпечатана</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Отпечатване</string>
@@ -1919,7 +1891,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените банкови карти, в случай че някой друг има достъп до него.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените карти от достъп, ако някой друг има вашето устройство.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените методи на плащане от достъп, ако някой друг има вашето устройство.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Настройване</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2084,12 +2056,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Опции за парола</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Текстовото поле за редактиране на адреса на регистрация.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Текстовото поле за редактиране на адреса на уебсайта на паролата.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Текстовото поле за редактиране на адреса на уебсайта.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Текстовото поле за редактиране на потребителското име на регистрация.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Текстовото поле за редактиране на потребителското име на паролата.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Текстовото поле за редактиране на потребителското име.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Текстовото поле за редактиране на паролата на регистрация.</string>
     <!--  The editable text field for a login's password. -->
@@ -2284,8 +2256,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Акцентите</b> са от %s отзиви през последните 80 дни, които смятаме за надеждни.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Научете повече за %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">как %s от Mozilla определя качеството на рецензията</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">как %s определя качеството на рецензията</string>
     <!-- Text for title of settings section. -->
@@ -2469,6 +2439,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Превеждането е в процес на изпълнение</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Избор на език</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Възникна проблем при превода. Моля, опитайте отново.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 9bac5c4fc..4f1c27f9c 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -242,6 +242,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Cyfaddasu’r dudalen cartref</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Sgrin cartref</string>
@@ -249,6 +250,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Dileu hanes pori</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Cyfieithu\'r dudalen</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Dewi iaith</string>
@@ -1874,7 +1878,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Gosodwch batrwm cloi dyfais, PIN, neu gyfrinair i ddiogelu eich mewngofnodion a’ch cyfrineiriau sydd wedi’u cadw rhag i rhywun arall sydd â mynediad i’ch dyfais.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Gosodwch batrwm clo dyfais, PIN neu gyfrinair i ddiogelu eich cyfrineiriau sydd wedi\'u cadw rhag i rywun arall sydd â\'ch dyfais gael mynediad iddyn nhw.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Sefydlwch batrwm clo dyfais, PIN, neu gyfrinair i amddiffyn eich dulliau talu a arbedwyd rhag cael mynediad iddynt os oes gan rywun arall eich dyfais.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Gosod nawr</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2036,12 +2040,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Dewisiadau cyfrineiriau</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Maes testun golygadwy cyfeiriad gwe’r mewngofnodi.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Maes testun golygadwy ar gyfer cyfeiriad gwefan y cyfrinair.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Y maes testun y gellir ei olygu ar gyfer cyfeiriad y wefan.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Maes testun golygadwy enw defnyddiwr y mewngofnodi.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Maes testun golygadwy ar gyfer enw defnyddiwr y cyfrinair.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Y maes testun y gellir ei olygu ar gyfer yr enw defnyddiwr.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Maes testun golygadwy cyfrinair y mewngofnodi.</string>
     <!--  The editable text field for a login's password. -->
@@ -2422,6 +2426,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Wrthi\'n Cyfieithu</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Dewiswch iaith</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Bu anhawster wrth gyfieithu. Ceisiwch eto.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index e1ff65330..7e983ecc9 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -243,6 +243,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Tilpas startside</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Startskærm</string>
@@ -250,6 +251,7 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Slet browser-historik</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valgt sprog</string>
@@ -261,8 +263,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skan</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Søgetjeneste</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Indstillinger for søgetjenester</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -316,23 +316,23 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Meddelelser hjælper dig med at gøre mere med %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Meddelelser hjælper dig med at gøre mere med %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synkroniser dine faneblade mellem enheder, håndter filhentninger, få tips til at få mest muligt ud af privatlivsbeskyttelse i %s og meget mere.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synkroniser dine faneblade mellem enheder, håndter filhentninger, få tips til at få mest muligt ud af privatlivsbeskyttelse i %s og meget mere.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Fortsæt</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Fortsæt</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ikke nu</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ikke nu</string>
 
-    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Vi elsker at holde dig sikker</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Vores non-profit-støttede browser hjælper med at forhindre virksomheder i at følge dig rundt på nettet i hemmelighed.\n\nLæs mere i vores privatlivserklæring.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Vores non-profit-støttede browser hjælper med at forhindre virksomheder i at følge dig rundt på nettet i hemmelighed.\n\nLæs mere i vores privatlivserklæring.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">privatlivserklæring</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">privatlivserklæring</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Angiv som standard-browser</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -435,22 +435,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Tilstanden Kun-HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduktion af cookie-bannere</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blokering af cookie-bannere</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blokering af cookie-bannere i privat browsing</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducer cookie-bannere</string>
 
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Fra</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Til</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s forsøger automatisk at afvise cookie-anmodninger på cookie-bannere.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Slået fra for dette websted</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -468,36 +457,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Webstedet understøttes ikke i øjeblikket</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Slå reduktion af cookie-bannere til for %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Slå blokering af cookie-bannere til for %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Slå reduktion af cookie-bannere fra for %1$s?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Slå blokering af cookie-bannere fra for %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s kan ikke afvise cookie-anmodninger automatisk på dette websted. Du kan sende en anmodning om understøttelse af dette websted i fremtiden.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s vil rydde dette websteds cookies og genindlæse siden. Rydning af alle cookies kan logge dig ud eller tømme indkøbskurve.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Slå funktionen fra - og %1$s vil rydde cookies og genindlæse webstedet. Dette kan logge dig ud eller tømme indkøbskurve.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s forsøger automatisk at afvise alle cookie-anmodninger på understøttede websteder.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Slå funktionen til - og %1$s vil forsøge at afvise cookie-bannere automatisk på dette websted.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Tillad %1$s at afvise cookie-bannere?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s kan automatisk afvise mange cookie-banner-anmodninger.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ikke nu</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Du vil få vist færre cookie-anmodninger</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Tillad</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s har lige afvist cookies for dig</string>
@@ -1272,8 +1242,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Afvis</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Kunne ikke udskrive</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Kunne ikke udskrive denne side</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Udskriv</string>
@@ -2171,8 +2139,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Højdepunkter</b> stammer fra %s-anmeldelser fra de seneste 80 dage, som vi vurderer er pålidelige.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Læs mere om, %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">hvordan %s fra Mozilla afgør kvaliteten af anmeldelser</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">hvordan %s afgør kvaliteten af anmeldelser</string>
     <!-- Text for title of settings section. -->
@@ -2404,7 +2370,7 @@
     <!-- Title of the automatic translation preference screen that will appear on the toolbar.-->
     <string name="automatic_translation_toolbar_title_preference">Automatisk oversættelse</string>
     <!-- Screen header presenting the automatic translation preference feature. It will appear under the toolbar. -->
-    <string name="automatic_translation_header_preference">Vælg et sprog for at håndtere indstillingerne &quot;oversæt altid&quot; og &quot;oversæt aldrig&quot;.</string>
+    <string name="automatic_translation_header_preference">Vælg et sprog for at håndtere indstillingerne ”oversæt altid“ og ”oversæt aldrig“.</string>
 
     <!-- Automatic translation options preference screen -->
     <!-- Preference option for offering to translate. Radio button title text.-->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e2268dcae..f970da8ca 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -247,6 +247,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Startbildschirm anpassen</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Startbildschirm</string>
@@ -254,6 +255,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Browser-Chronik löschen</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Seite übersetzen</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Gewählte Sprache</string>
@@ -265,8 +269,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scannen</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Suchmaschine</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Suchmaschinen-Einstellungen</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -322,14 +324,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Benachrichtigungen helfen Ihnen, mehr aus %s zu machen</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Benachrichtigungen helfen Ihnen, mehr aus %s zu machen</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synchronisieren Sie Ihre Tabs zwischen Geräten, verwalten Sie Downloads, erhalten Sie Tipps, wie Sie den Datenschutz von %s am besten nutzen können, und mehr.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synchronisieren Sie Ihre Tabs zwischen Geräten, verwalten Sie Downloads, erhalten Sie Tipps, wie Sie den Datenschutz von %s am besten nutzen können, und mehr.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Fortsetzen</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Fortsetzen</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Nicht jetzt</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Nicht jetzt</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -447,21 +449,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Nur-HTTPS-Modus</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduzierung von Cookie-Bannern</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Cookie-Banner-Blocker</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Cookie-Banner-Blocker im privaten Modus</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie-Banner reduzieren</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Aus</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Ein</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s versucht automatisch, Cookie-Anforderungen auf Cookie-Bannern abzulehnen.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Für diese Website deaktiviert</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -479,35 +471,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Website derzeit nicht unterstützt</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie-Banner-Reduzierung für %1$s aktivieren?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Cookie-Banner-Blocker für %1$s aktivieren?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie-Banner-Reduzierung für %1$s deaktivieren?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Cookie-Banner-Blocker für %1$s deaktivieren?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s kann Cookie-Anfragen auf dieser Website nicht automatisch ablehnen. Sie können eine Anfrage senden, um diese Website in Zukunft zu unterstützen.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s löscht die Cookies dieser Webseite und aktualisiert die Seite. Das Löschen aller Cookies kann Sie abmelden oder Warenkörbe leeren.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Beim Deaktivieren löscht %1$s die Cookies und lädt die Website neu. Dies kann Sie abmelden oder Warenkörbe leeren.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s versucht, alle Cookie-Anfragen auf unterstützten Websites automatisch abzulehnen.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Wenn dies aktiviert ist, wird %1$s versuchen, alle Cookie-Banner auf dieser Website automatisch abzulehnen.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s erlauben, Cookie-Banner abzulehnen?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s kann viele Cookie-Banner-Anfragen automatisch ablehnen.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Nicht jetzt</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Sie sehen weniger Cookie-Anfragen</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Erlauben</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s hat Cookies für Sie abgelehnt</string>
@@ -1314,8 +1287,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Schließen</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Drucken nicht möglich</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Seite kann nicht gedruckt werden</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Drucken</string>
@@ -1943,7 +1914,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Karten zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Karten zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Zahlungsmethoden zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Jetzt einrichten</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2105,12 +2076,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Passwort-Optionen</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Das bearbeitbare Textfeld für die Internetadresse der Zugangsdaten.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Das bearbeitbare Textfeld für die Internetadresse des Passworts.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Das bearbeitbare Textfeld für die Adresse der Website.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Das bearbeitbare Textfeld für den Benutzernamen der Zugangsdaten.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Das bearbeitbare Textfeld für den Benutzernamen des Passworts.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Das bearbeitbare Textfeld für den Benutzernamen.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Das bearbeitbare Textfeld für das Passwort der Zugangsdaten.</string>
     <!--  The editable text field for a login's password. -->
@@ -2307,8 +2278,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Highlights</b> stammen von %s-Bewertungen innerhalb der letzten 80 Tage, die wir für zuverlässig halten.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Weitere Informationen zu %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">Wie %s von Mozilla die Qualität der Bewertungen feststellt</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">Wie %s die Qualität der Rezensionen bestimmt</string>
     <!-- Text for title of settings section. -->
@@ -2492,6 +2461,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Übersetzung läuft</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Sprache auswählen</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Beim Übersetzen ist ein Problem aufgetreten. Bitte versuchen Sie es erneut.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-dsb/strings.xml b/app/src/main/res/values-dsb/strings.xml
index a7f3174c3..bbc3d240b 100644
--- a/app/src/main/res/values-dsb/strings.xml
+++ b/app/src/main/res/values-dsb/strings.xml
@@ -243,6 +243,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Startowy bok pśiměriś</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Startowa wobrazowka</string>
@@ -250,6 +251,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Pśeglědowańsku historiju lašowaś</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Bok pśełožyś</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Wubrana rěc</string>
@@ -261,8 +265,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scannowaś</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Pytnica</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Nastajenja pytnicow</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -316,14 +318,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Powěźeńki wam pomagaju, wěcej z %s cyniś</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Powěźeńki wam pomagaju, wěcej z %s cyniś</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synchronizěrujśo swóje rejtariki mjazy rědami, zastojśo ześěgnjenja, dostańśo pokaze, aby mógał ze šcita priwatnosći %s nejlěpše wuwónoźeś , a wjace.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synchronizěrujśo swóje rejtariki mjazy rědami, zastojśo ześěgnjenja, dostańśo pokaze, aby mógał ze šcita priwatnosći %s nejlěpše wuwónoźeś , a wjace.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Dalej</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Dalej</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Nic něnto</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Nic něnto</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -442,20 +444,10 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modus Jano-HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducěrowanje cookiejowych chórgojow</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blokěrowak cookiejowych chórgojow</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blokěrowak cookiejowych chórgojow w priwatnem modusu</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookieje chórgoje reducěrowaś</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Wušaltowany</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Zašaltowany</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s awtomatiski wopytujo, cookiejowe napšašowanja na cookiejowych chórgojach wótpokazaś.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Za toś to sedło znjemóžnjony</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -473,34 +465,15 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Sedło se tuchylu njepódpěra</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducěrowanje cookiejowych chórgojow za %1$s zmóžniś?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Blokěrowak cookiejowych chórgojow za %1$s zmóžniś?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducěrowanje cookiejowych chórgojow za %1$s znjemóžniś?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Blokěrowak cookiejowych chórgojow za %1$s znjemóžniś?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s njamóžo cookiejowe napšašowanja na toś tom sedle awtomatiski wótpokazaś. Móžośo pšosbu wó pódpěru toś togo sedła w pśichoźe pósłaś.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s cookieje sedła lašujo a buźo bok aktualizěrowaś. Lašowanje wšych cookiejow móžo was pśizjawiś abo nakupowańske wózyki wuprozniś.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Pśi znjemóžnjanju %1$s cookieje lašujo a toś to sedło znowego zacytajo. To móžo was wótzjawiś abo nakupowańske kórbiki wuprozniś.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s wopytujo wšykne cookiejowe napšašowanja na pódprětych sedłach awtomatiski wótpokazaś.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Zmóžniśo toś to nastajenje a %1$s wopytajo, wšykne cookiejowe chórgoje na toś tom sedle awtomatiski wótpokazaś.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s dowóliś, cookiejowe chórgoji wótpokazaś?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s móžo wjele napšašowanjow wó cookiejowych chórgojach awtomatiski wótpokazaś.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Nic něnto</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Buźośo mjenjej cookiejowych napšašowanjow wiźeś</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Dowóliś</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s jo rowno wótpokazał cookieje za was</string>
@@ -1287,8 +1260,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Zachyśiś</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Njedajo se śišćaś</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Toś ten bok njedajo se śišćaś</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Śišćaś</string>
@@ -1909,7 +1880,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym kreditowym kórtam zajźował, jolic něchten drugi ma waš rěd.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym kórtam zajźował, jolic něchten drugi ma waš rěd.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym płaśeńskim metodam zajźował, jolic něchten drugi ma waš rěd.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Něnto konfigurěrowaś</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2071,12 +2042,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Gronidłowe nastajenja</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Wobźěłujobne tekstowe pólo za webadresu pśizjawjenja.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Wobźěłujobne tekstowe pólo za adresu websedła gronidła.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Wobźěłujobne tekstowe pólo za adresu websedła.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Wobźěłujobne tekstowe pólo za wužywaŕske mě pśizjawjenja.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Wobźěłujobne tekstowe pólo za wužywaŕske mě gronidła.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Wobźěłujobne tekstowe pólo za wužywaŕske mě.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Wobźěłujobne tekstowe pólo za gronidło pśizjawjenja.</string>
     <!--  The editable text field for a login's password. -->
@@ -2275,8 +2246,6 @@ To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produkt
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Wjerški</b> su z pógódnośenjow %s w běgu slědnych 80 dnjow, kótarež mamy za spušćobne.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Zgóńśo wěcej wó %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">kak %s wót Mozilla kwalitu pógódnośenja póstaja</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">kak %s kwalitu pógódnośenja póstaja</string>
     <!-- Text for title of settings section. -->
@@ -2461,6 +2430,8 @@ To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produkt
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Pśełoženje běžy</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Rěc wubraś</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Pśi pśełožowanju jo problem nastał. Pšosym wopytajśo hyšći raz.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 42eec1144..82c069db9 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -246,6 +246,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalizar inicio</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Pantalla de inicio</string>
@@ -253,6 +254,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Borrar historial de navegación</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Traducir página</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Idioma seleccionado</string>
@@ -1899,7 +1903,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configurá un patrón de bloqueo del dispositivo, PIN o contraseña para proteger el acceso a tus tarjetas de crédito guardadas si alguien más tiene tu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configurá un patrón de bloqueo del dispositivo, PIN o contraseña para proteger el acceso a tus tarjetas guardadas si alguien más tiene tu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Configurá un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus métodos de pago guardados por si otra persona accede a tu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2063,12 +2067,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Opciones de contraseña</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">El campo de texto editable para la dirección web del inicio de sesión.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">El campo de texto editable para la dirección del sitio web de la contraseña.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">El campo de texto editable para la dirección del sitio web.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">El campo de texto editable para el nombre de usuario del inicio de sesión.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario de la contraseña.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">El campo de texto editable para la contraseña del inicio de sesión.</string>
     <!--  The editable text field for a login's password. -->
@@ -2450,6 +2454,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Traducción en proceso</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Seleccionar un idioma</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Hubo un problema al traducir. Probá de nuevo.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b12aece6c..01e16e803 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -247,6 +247,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Mukauta kotisivua</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Aloitusnäkymä</string>
@@ -254,6 +255,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Tyhjennä selaushistoria</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Käännä sivu</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valittu kieli</string>
@@ -1895,8 +1899,6 @@
     <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Suojaa tallennetut maksutavat</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Aseta laitteen avaukseen tarkoitettu kuvio, PIN-koodi tai salasana suojataksesi tallennetut luottokorttitiedot siltä varalta, että joku saa laitteesi haltuunsa.</string>
-    <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Määritä laitteen lukituskuvio, PIN-koodi tai salasana suojataksesi tallennettuja korttejasi, jos laitteesi on jollain toisella.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Aseta nyt</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2059,12 +2061,8 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Salasanojen asetukset</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Muokattava tekstikenttä kirjautumisen verkkosivua varten.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Salasanan verkkosivuston osoitteen muokattava tekstikenttä.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Muokattava tekstikenttä kirjautumisen käyttäjätunnusta varten.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Salasanan käyttäjätunnuksen muokattava tekstikenttä.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Muokattava tekstikenttä kirjautumisen salasanaa varten.</string>
     <!--  The editable text field for a login's password. -->
@@ -2426,6 +2424,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Käännös käynnissä</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Valitse kieli</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Käännettäessä ilmeni ongelma. Yritä uudelleen.</string>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b83331140..c6e72ec33 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -247,6 +247,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personnaliser la page d’accueil</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Écran d’accueil</string>
@@ -254,6 +255,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Effacer l’historique de navigation</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Traduire la page</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Langue sélectionnée</string>
@@ -265,8 +269,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scanner</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Moteur de recherche</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Paramètres du moteur de recherche</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -322,14 +324,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Les notifications vous aident à en faire plus avec %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Les notifications vous aident à en faire plus avec %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synchronisez les onglets entre vos appareils, gérez les téléchargements, obtenez des conseils pour tirer le meilleur parti de la protection de la vie privée de %s, et bien plus.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synchronisez les onglets entre vos appareils, gérez les téléchargements, obtenez des conseils pour tirer le meilleur parti de la protection de la vie privée de %s, et bien plus.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Continuer</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Continuer</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Plus tard</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Plus tard</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -448,21 +450,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Mode HTTPS uniquement</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Réduction des bannières de cookies</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Bloqueur de bannières de cookies</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Bloqueur de bannières de cookies en navigation privée</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Réduire les bannières de cookies</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Désactivée</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Activée</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s essaie automatiquement de refuser les demandes de dépôt de cookies quand une bannière de cookies s’affiche.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Désactivée pour ce site</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -480,35 +472,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Site actuellement non pris en charge</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Activer la réduction des bannières de cookies pour %1$s ?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Activer le bloqueur de bannières de cookies pour %1$s ?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Désactiver la réduction des bannières de cookies pour %1$s ?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Désactiver le bloqueur de bannières de cookies pour %1$s ?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s ne peut pas refuser automatiquement les demandes de dépôt de cookies sur ce site. Vous pouvez envoyer une demande afin que ce site soit pris en charge ultérieurement.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s effacera les cookies de ce site et actualisera la page. La suppression de tous les cookies peut vous déconnecter ou vider les paniers d’achats.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Désactivez-le et %1$s effacera les cookies puis rechargera le site. Ces actions peuvent vous déconnecter ou vider votre panier.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s peut essayer de refuser automatiquement les demandes de dépôt de cookies sur les sites compatibles.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Activez-le et %1$s tentera de refuser automatiquement les bannières de cookies sur ce site.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Autoriser %1$s à refuser les bannières de cookies ?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s peut refuser automatiquement les demandes de dépôt de cookies.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Plus tard</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Vous verrez moins de demandes de cookies</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Autoriser</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s a refusé les cookies pour vous</string>
@@ -1313,8 +1286,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Fermer</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Impression impossible</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Impression de la page impossible</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Imprimer</string>
@@ -1942,7 +1913,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos cartes bancaires enregistrées si jamais quelqu’un accède à votre appareil.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos cartes enregistrées si jamais quelqu’un accède à votre appareil.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos moyens de paiement enregistrés si jamais quelqu’un accède à votre appareil.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurer maintenant</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2103,12 +2074,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Options de mot de passe</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Le champ de texte modifiable pour l’adresse web de l’identifiant.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Le champ de texte modifiable pour l’adresse du site web du mot de passe.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Le champ de texte modifiable pour l’adresse du site web.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Le champ de texte modifiable pour le nom d’utilisateur de l’identifiant.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Le champ de texte modifiable pour le nom d’utilisateur du mot de passe.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Le champ de texte modifiable pour le nom d’utilisateur.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Le champ de texte modifiable pour le mot de passe de l’identifiant.</string>
     <!--  The editable text field for a login's password. -->
@@ -2306,8 +2277,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[Les <b>points essentiels</b> proviennent des avis laissés sur %s au cours des 80 derniers jours que nous estimons fiables.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">En savoir plus sur %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">la façon dont %s par Mozilla détermine la qualité d’un avis</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">la façon dont %s détermine la qualité d’un avis</string>
     <!-- Text for title of settings section. -->
@@ -2493,6 +2462,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Traduction en cours</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Choisissez une langue</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Un problème s’est produit lors de la traduction. Veuillez réessayer.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index cd565c898..2c2948d36 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -244,6 +244,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Startside oanpasse</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Startskerm</string>
@@ -251,6 +252,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Navigaasjeskiednis wiskje</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Side oersette</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Selektearre taal</string>
@@ -1874,7 +1878,7 @@
     <string name="credit_cards_warning_dialog_message">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre creditcards te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
 
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre kaarten te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre betellingsmetoaden te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">No ynstelle</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2036,12 +2040,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Wachtwurdopsjes</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">It bewurkbere tekstfjild foar it webadres fan de oanmelding.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">It bewurkbere tekstfjild foar it websiteadres fan it wachtwurd.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">It bewurkbere tekstfjild foar it websiteadres.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">It bewurkbere tekstfjild foar de brûkersnamme fan de oanmelding.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">It bewurkbere tekstfjild foar de brûkersnamme fan it wachtwurd.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">It bewurkbere tekstfjild foar de brûkersnamme.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">It bewurkbere tekstfjild foar it wachtwurd fan de oanmelding.</string>
     <!--  The editable text field for a login's password. -->
@@ -2426,6 +2430,8 @@ Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Oersetting wurdt útfierd</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Kies in taal</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Der is in probleem bard by it oersetten. Probearje it opnij.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-hsb/strings.xml b/app/src/main/res/values-hsb/strings.xml
index 9858af0a4..c3b5c4e7c 100644
--- a/app/src/main/res/values-hsb/strings.xml
+++ b/app/src/main/res/values-hsb/strings.xml
@@ -243,6 +243,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Startowu stronu přiměrić</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Startowa wobrazowka</string>
@@ -250,6 +251,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Přehladowansku historiju zhašeć</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Stronu přełožić</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Wubrana rěč</string>
@@ -261,8 +265,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skenować</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Pytawa</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Nastajenja pytawy</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -316,14 +318,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Zdźělenki wam pomhaja, wjace z %s činić</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Zdźělenki wam pomhaja, wjace z %s činić</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synchronizujće swoje rajtarki mjez gratami, rjadujće sćehnjenja, dóstańće pokiwy, zo byšće móhł škit priwatnosće %s najlěpje zwužitkować, a wjace.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synchronizujće swoje rajtarki mjez gratami, rjadujće sćehnjenja, dóstańće pokiwy, zo byšće móhł škit priwatnosće %s najlěpje zwužitkować, a wjace.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Dale</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Dale</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Nic nětko</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Nic nětko</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -441,21 +443,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modus Jenož-HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Redukowanje plackowych chorhojow</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blokowak plackowych chorhojow</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blokowak plackowych chorhojow w priwatnym modusu</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Plackowe chorhoje redukować</string>
-
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Wupinjeny</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Zapinjeny</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s awtomatisce pospytuje, plackowe naprašowanja na plackowych chorhojach wotpokazać.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Za tute sydło znjemóžnjeny</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -473,35 +465,15 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Sydło so tuchwilu njepodpěruje</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Redukowanje plackowych chorhojow za %1$s zmóžnić?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Blokowak plackowych chorhojow za %1$s zmóžnić?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Redukowanje plackowych chorhojow za %1$s znjemóžnić?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Blokowak plackowych chorhojow za %1$s znjemóžnić?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s njemóže plackowe naprašowanja na tutym sydle awtomatisce wotpokazać. Móžeće próstwu wo podpěru tutoho sydła w přichodźe pósłać.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s placki sydła zhaša a budźe stronu aktualizować. Zhašenje wšěch plackow móže was přizjewić abo nakupowanske wozyčki wuprózdnić.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Při znjemóžnjenju %1$s placki zhaša a tute sydło znowa začita. To móže was wotzjewić abo nakupowanske koše wuprózdnić.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s pospytuje wšě plackowe naprašowanja na podpěranych sydłach awtomatisce wotpokazać.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Zmóžńće tute nastajenje a %1$s spyta, wšě plackowe chorhoje na tutym sydle awtomatisce wotpokazać.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s dowolić, plackowe chorhoje wotpokazać?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s móže wjele naprašowanjow wo plackowych chorhojach awtomatisce wotpokazać.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Nic nětko</string>
-
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Budźeće mjenje plackowych naprašowanjow widźeć</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Dowolić</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s je runje placki za was wotpokazał</string>
@@ -1292,8 +1264,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Zaćisnyć</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Njeda so ćišćeć</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Tuta strona njeda so ćišćeć</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Ćišćeć</string>
@@ -1917,7 +1887,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym kreditnym kartam zadźěwał, jeli něchtó druhi waš grat ma.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym kartam zadźěwał, jeli něchtó druhi waš grat ma.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym płácenskim metodam zadźěwał, jeli něchtó druhi waš grat ma.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Nětko konfigurować</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2080,12 +2050,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Hesłowe nastajenja</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Wobdźěłujomne tekstowe polo za webadresu přizjewjenja.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Wobdźěłujomne tekstowe polo za adresu websydła hesła.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Wobdźěłujomne tekstowe polo za adresu websydła.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Wobdźěłujomne tekstowe polo za wužiwarske mjeno přizjewjenja.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Wobdźěłujomne tekstowe polo za wužiwarske mjeno hesła.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Wobdźěłujomne tekstowe polo za wužiwarske mjeno.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Wobdźěłujomne tekstowe polo za hesło přizjewjenja.</string>
     <!--  The editable text field for a login's password. -->
@@ -2283,8 +2253,6 @@ To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produk
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Wjerški</b> su z pohódnoćenjow %s w běhu poslednich 80 dnjow, kotrež mamy za spušćomne.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Zhońće wjace wo %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">kak %s wot Mozilla kwalitu pohódnoćenja postaja</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">kak %s kwalitu pohódnoćenja postaja</string>
     <!-- Text for title of settings section. -->
@@ -2469,6 +2437,8 @@ To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produk
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Přełoženje běži</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Rěč wubrać</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Při přełožowanju je problem nastał. Prošu spytajće hišće raz.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 3bbb88c79..3ffd638ea 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -244,6 +244,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Kezdőoldal testreszabása</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Kezdőképernyő</string>
@@ -251,6 +252,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Böngészési előzmények törlése</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Oldal fordítása</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Kiválasztott nyelv</string>
@@ -262,8 +266,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Beolvasás</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Keresőszolgáltatás</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Keresőszolgáltatás-beállítások</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -319,14 +321,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Az értesítések segítségével még többet tehet a %s alkalmazással</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Az értesítések segítségével még többet tehet a %s alkalmazással</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Szinkronizálhatja lapjait az eszközök között, kezelheti a letöltéseket, tippeket kaphat a %s adatvédelmi funkcióinak maximális kihasználásához stb.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Szinkronizálhatja lapjait az eszközök között, kezelheti a letöltéseket, tippeket kaphat a %s adatvédelmi funkcióinak maximális kihasználásához stb.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Folytatás</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Folytatás</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Most nem</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Most nem</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -443,21 +445,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Csak HTTPS mód</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Sütibannerek számának csökkentése</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Sütibanner-blokkoló</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Sütibanner-blokkoló privát böngészésben</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">A sütibannerek számának csökkentése</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Ki</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Be</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">A %1$s automatikusan megpróbálja elutasítani a sütibannereken lévő sütikéréseket.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Kikapcsolva erre az oldalra</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -475,35 +467,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">A webhely jelenleg nem támogatott</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Bekapcsolja a sütibanner-csökkentést a következőnél: %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Bekapcsolja a sütibanner-blokkolót ennél a webhelynél: %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Kikapcsolja a sütibanner-csökkentést a következőnél: %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Kikapcsolja a sütibanner-blokkolót ennél a webhelynél: %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">A %1$s nem tudja automatikusan elutasítani a sütikéréseket ezen az oldalon. Küldhet egy kérést, hogy támogassák ezt az oldalt a jövőben.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">A %1$s törli a webhely sütijeit, és frissíti az oldalt. Az összes süti törlésével kijelentkezhet, vagy kiürítheti a kosarait.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Kapcsolja ki, és a %1$s törli a sütiket, és újratölti a webhelyet. Ez kijelentkeztetheti, vagy kiürítheti a kosarait.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">A %1$s automatikusan megpróbálja elutasítani az összes sütikérést a támogatott oldalakon.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Kapcsolja be, és a %1$s automatikusan megpróbálja elutasítani a sütibannereket ezen az oldalon.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Engedélyezi a %1$s számára a sütibannerek elutasítását?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">A %1$s automatikusan elutasíthat számos sütibanneres kérést.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Most nem</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Kevesebb sütikérést fog látni</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Engedélyezés</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">A %1$s most elutasította a sütiket Önnek</string>
@@ -1294,8 +1267,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Eltüntetés</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Nem lehet kinyomtatni</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Az oldal nem nyomtatható</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Nyomtatás</string>
@@ -1921,7 +1892,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett bankkártyáit, ha valaki hozzáfér az eszközéhez.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett kártyáit, ha valaki hozzáfér az eszközéhez.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett fizetési módjait, ha valaki hozzáfér az eszközéhez.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Beállítás most</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2083,12 +2054,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Jelszóbeállítások</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">A bejelentkezés webcíméhéz használandó szerkeszthető szövegmező.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">A jelszóhoz tartozó webhely címének szerkeszthető szövegmezője.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">A webhely címének szerkeszthető szövegmezője.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">A bejelentkezés felhasználónevéhez használandó szerkeszthető szövegmező.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">A jelszóhoz tartozó felhasználónév szerkeszthető szövegmezője.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">A felhasználónév szerkeszthető szövegmezője.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">A bejelentkezés jelszavához használandó szerkeszthető szövegmező.</string>
     <!--  The editable text field for a login's password. -->
@@ -2286,8 +2257,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[A <b>kiemelések</b> a(z) %s értékeléseinek az elmúlt 80 napból származó és megbízhatónak ítélt elemei.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Tudjon meg többet arról, %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">hogy a %s by Mozilla hogyan határozza meg az értékelések minőségét</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">hogyan határozza meg a %s az értékelések minőségét</string>
     <!-- Text for title of settings section. -->
@@ -2477,6 +2446,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Fordítás folyamatban</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Válasszon nyelvet</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Hiba történt a fordítás során. Próbálja meg újra.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
index 0a3a6bcb5..9d9fe0724 100644
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@@ -246,6 +246,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalisar pagina initial</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Pagina initial</string>
@@ -253,6 +254,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Eliminar le chronologia de navigation</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Traducer le pagina</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Lingua seligite</string>
@@ -264,8 +268,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scannar</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Motor de recerca</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Parametros de motor de recerca</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -321,15 +323,15 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Le notificationes te adjuta a facer plus con %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Le notificationes te adjuta a facer plus con %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synchronisa tu schedas inter apparatos, gere le discargamentos, recipe le suggestiones re maximisar le protection del confidentialitate de %s e altero ancora.
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synchronisa tu schedas inter apparatos, gere le discargamentos, recipe le suggestiones re maximisar le protection del confidentialitate de %s e altero ancora.
 </string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Continuar</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Continuar</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Non ora</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Non ora</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -448,22 +450,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modo solo HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduction de banner pro le cookie </string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blocada de bandiera pro cookie</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blocada de bandiera pro cookie in navigation private</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducer banners pro le cookie</string>
-
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Disactivar</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Activar</string>
 
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s automaticamente prova a rejectar le requestas de cookies sur banners pro cookies.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Disactivar pro iste sito</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -481,36 +472,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Sito actualmente non supportate</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Activar le reduction de banner pro cookie pro %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Activar le blocada de bandiera pro cookie pro %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Disactivar le reduction de banner pro cookie pro %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Disactivar le blocada de bandiera pro cookie pro %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s non pote automaticamente rejectar requestas de cookies sur iste sito. Tu pote inviar un requesta pro supportar iste sito in futuro.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s clarara le cookies de iste sito e actualisara le pagina. Clarar tote le cookies pote clauder tu connexion o vacuar tu carrettos de compras.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Disactiva lo e %1$s clarara le cookies e recargara iste sito. Isto pote disconnecter le section o vacuara le carrettos de compras.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s tenta rejectar automaticamente tote le requestas de cookies sur le sitos supportate.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Activa lo e %1$s essayara refusar automaticamente le bandieras pro cookies sur iste sito.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Permitter a %1$s de rejectar bandieras pro cookies?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s pote rejectar automaticamente multe requestas de bandieras pro cookie.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Non ora</string>
-
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Tu videra minus requestas de cookies</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Permitter</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s justo refusava cookies pro te</string>
@@ -1325,8 +1296,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Ignorar</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Impossibile imprimer</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Impossibile imprimer iste pagina</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Imprimer</string>
@@ -1961,7 +1930,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu cartas de credito de esser accedite, si alcuno altere ha tu apparato.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu cartas de esser accedite, si alcuno altere ha tu apparato.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu methodos de pagamento salvate de esser accedite, si alcun altere ha tu apparato.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Implementar ora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2125,12 +2094,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Optiones de contrasigno</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Le campo de texto redigibile pro le adresse web del credentiales.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Le campo de texto redigibile pro le adresse web del contrasigno.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Le campo de texto redigibile pro le adresse del sito web.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Le campo de texto redigibile pro le nomine de usator del accesso.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Le campo de texto redigibile pro le nomine de usator del contrasigno.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Le campo de texto redigibile pro le nomine de usator.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Le campo de texto redigibile pro le contrasigno del credentiales.</string>
     <!--  The editable text field for a login's password. -->
@@ -2328,8 +2297,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Aspectos notabile</b> es ab %s recensiones in le ultime 80 dies que nos crede fidabile.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Pro saper plus re %s. </string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">como %s per Mozilla determina le qualitate de revision</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">como %s determina le qualitate del revision</string>
     <!-- Text for title of settings section. -->
@@ -2514,6 +2481,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Traduction in curso</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Elige un lingua</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Il habeva un problema traducente. Retenta.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 9028c3eea..bdb531e46 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -242,6 +242,7 @@
     <string name="browser_menu_edit">Breyta</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Sérsníða upphafssíðu</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Upphafsskjár</string>
@@ -249,6 +250,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Eyða vafurferli</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Þýða síðu</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valið tungumál</string>
@@ -260,8 +264,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skanna</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Leitarvél</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Leitarvélastillingar</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -316,14 +318,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Tilkynningar hjálpa þér að gera meira með %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Tilkynningar hjálpa þér að gera meira með %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Samstilltu flipa á milli tækja, stýrðu niðurhali, fáðu ábendingar um að nýta persónuvernd %s sem best og fleira.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Samstilltu flipa á milli tækja, stýrðu niðurhali, fáðu ábendingar um að nýta persónuvernd %s sem best og fleira.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Halda áfram</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Halda áfram</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ekki núna</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ekki núna</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -441,21 +443,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Einungis-HTTPS-hamur</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Fækkun vefkökuborða</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Útilokun vefkökuborða</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Útilokun vefkökuborða í huliðsvafri</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Fækka vefkökuborðum</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Óvirkt</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Virkt</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s reynir sjálfkrafa að hafna vefkökubeiðnum á vefkökuborðum.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Slökkt fyrir þetta vefsvæði</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -473,36 +465,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Vefsvæðið er ekki stutt í augnablikinu</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Viltu kveikja á fækkun vefkökuborða fyrir %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Viltu kveikja á útilokun vefkökuborða fyrir %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Viltu slökkva á fækkun vefkökuborða fyrir %1$s?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Viltu slökkva á útilokun vefkökuborða fyrir %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s getur ekki hafnað sjálfvirkt vefkökubeiðnum á þessari síðu. Þú getur sent beiðni um stuðning við þessa síðu.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s mun hreinsa vefkökur þessa vefsvæðis og endurlesa síðuna. Að hreinsa allar vefkökur gæti skráð þig út eða tæmt innkaupakörfur.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Slökktu á þessu og %1$s mun hreinsa vefkökur og endurlesa þetta vefsvæði. Það gæti skráð þig út eða tæmt innkaupakörfur.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s reynir að hafna sjálfkrafa beiðnum um vefkökur á þeim vefsvæðum þar sem það er hægt.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Kveiktu á þessu og %1$s mun reyna að hafna sjálfkrafa öllum vefkökuborðum á þessu vefsvæði.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Leyfa %1$s að hafna vefkökuborðum?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s getur reynt að hafna sjálfkrafa beiðnum um vefkökur.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ekki núna</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Þú munt sjá færri beiðnir um vefkökur</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Leyfa</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s var að hafna vefkökum fyrir þína hönd</string>
@@ -1283,8 +1256,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Afgreiða</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Ekki hægt að prenta</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Ekki er hægt að prenta þessa síðu</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Prenta</string>
@@ -1902,7 +1873,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Settu upp læsimynstur, PIN-númer eða lykilorð til að vernda vistuðu greiðslukortin þín ef ske kynni að einhver annar komist yfir tækið þitt.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Settu upp læsimynstur, PIN-númer eða lykilorð til að vernda vistuðu greiðslukortin þín ef ske kynni að einhver annar komist yfir tækið þitt.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Settu upp læsimynstur, PIN-númer eða lykilorð til að vernda vistuðu greiðslumátana þína ef ske kynni að einhver annar komist yfir tækið þitt.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Setja upp núna</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2064,12 +2035,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Valkostir lykilorðs</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Breytilegi textareiturinn fyrir veffang þessarar innskráningarinnar.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Breytanlegi textareiturinn fyrir veffang lykilorðsins.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Breytanlegi textareiturinn fyrir vistfang vefsvæðisins.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Breytilegi textareiturinn fyrir notandanafn innskráningarinnar.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Breytanlegi textareiturinn fyrir notandanafn lykilorðsins.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Breytanlegi textareiturinn fyrir notandanafnið.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Breytilegi textareiturinn fyrir lykilorð innskráningarinnar.</string>
     <!--  The editable text field for a login's password. -->
@@ -2267,8 +2238,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Hápunktar</b> eru úr umsögnum um %s frá síðustu 80 dögum sem við teljum vera áreiðanlegar.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Frekari upplýsingar um %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">hvernig %s frá Mozilla ákvarðar gæði umsagna</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">hvernig %s ákvarðar gæði umsagna</string>
     <!-- Text for title of settings section. -->
@@ -2453,6 +2422,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Þýðing í gangi</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Veldu tungumál</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Vandamál kom upp við að þýða. Reyndu aftur.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 42e0da8f3..8e50ec4f7 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -247,6 +247,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalizza pagina iniziale</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Schermata principale</string>
@@ -254,6 +255,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Elimina cronologia di navigazione</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Traduci pagina</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Lingua selezionata</string>
@@ -265,8 +269,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Leggi</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Motore di ricerca</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Impostazioni motori di ricerca</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -322,14 +324,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Le notifiche ti aiutano a ottenere di più da %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Le notifiche ti aiutano a ottenere di più da %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sincronizza le schede tra dispositivi, gestisci download, ottieni suggerimenti per sfruttare al meglio la protezione della privacy di %s e molto altro ancora.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sincronizza le schede tra dispositivi, gestisci download, ottieni suggerimenti per sfruttare al meglio la protezione della privacy di %s e molto altro ancora.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Continua</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Continua</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Non adesso</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Non adesso</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -448,21 +450,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modalità solo HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Riduzione banner per i cookie</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blocco banner per i cookie</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blocco banner per i cookie in navigazione anonima</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Riduci i banner per i cookie</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Disattivata</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Attiva</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s cerca automaticamente di rifiutare le richieste di cookie quando viene visualizzato un banner per i cookie.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Disattivata per questo sito</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -480,35 +472,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Sito attualmente non supportato</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Attivare la riduzione banner per i cookie su %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Attivare il blocco banner per i cookie in %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Disattivare la riduzione banner per i cookie su %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Disattivare il blocco banner per i cookie in %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s non può rifiutare automaticamente le richieste di cookie su questo sito. Puoi inviare una richiesta per supportare questo sito in futuro.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s eliminerà i cookie per questo sito e aggiornerà la pagina. L’eliminazione dei cookie potrebbe disconnetterti dal sito o svuotare eventuali carrelli in sospeso.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Dopo la disattivazione %1$s rimuove i cookie e ricarica la pagina. Questo potrebbe disconnetterti dal sito o svuotare eventuali carrelli in sospeso.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s cerca di rifiutare automaticamente le richieste di cookie nei siti supportati.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Attivalo e %1$s cercherà di rifiutare automaticamente i banner per i cookie su questo sito.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Consentire a %1$s di rifiutare i banner per i cookie?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s può rifiutare automaticamente i banner per i cookie in diversi siti.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Non adesso</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Vedrai meno richieste per i cookie</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Consenti</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s ha appena rifiutato dei cookie per te</string>
@@ -1317,8 +1290,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Chiudi</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Impossibile stampare</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Impossibile stampare questa pagina</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Stampa</string>
@@ -1949,7 +1920,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare le carte di credito salvate.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare le carte di credito salvate.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare i metodi di pagamento salvati.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Imposta adesso</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2112,12 +2083,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Opzioni password</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Il campo di testo modificabile per l’indirizzo web delle credenziali</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Il campo di testo modificabile per l’indirizzo del sito web della password.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Il campo di testo modificabile per l’indirizzo del sito web.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Il campo di testo modificabile per il nome utente delle credenziali</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Il campo di testo modificabile per il nome utente.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Il campo di testo modificabile per il nome utente.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Il campo di testo modificabile per la password delle credenziali</string>
     <!--  The editable text field for a login's password. -->
@@ -2316,8 +2287,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[Gli elementi <b>in evidenza</b> provengono dalle recensioni su %s degli ultimi 80 giorni che riteniamo affidabili.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Scopri ulteriori informazioni su %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">come %s by Mozilla determina la qualità delle recensioni</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">come %s determina la qualità delle recensioni</string>
     <!-- Text for title of settings section. -->
@@ -2505,6 +2474,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Traduzione in corso</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Scegli una lingua</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Si è verificato un problema durante la traduzione. Riprova.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 7ae3a56c4..72c8c8a79 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -242,6 +242,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">התאמה אישית של מסך הבית</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">מסך הבית</string>
@@ -249,6 +250,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">מחיקת היסטורית גלישה</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">תרגום הדף</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">שפה נבחרת</string>
@@ -260,8 +264,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">סריקה</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">מנוע חיפוש</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">הגדרות מנוע חיפוש</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -316,14 +318,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">התראות עוזרות לך לעשות יותר עם %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">התראות עוזרות לך לעשות יותר עם %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">סנכרון הלשוניות שלך בין מכשירים, ניהול הורדות, קבלת טיפים להפקת המירב מהגנת הפרטיות של %s ועוד.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">סנכרון הלשוניות שלך בין מכשירים, ניהול הורדות, קבלת טיפים להפקת המירב מהגנת הפרטיות של %s ועוד.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">המשך</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">המשך</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">לא כעת</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">לא כעת</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -440,20 +442,10 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">מצב HTTPS בלבד</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">צמצום כרזות עוגיות</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">חוסם כרזות עוגיות</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">חוסם כרזות עוגיות בגלישה פרטית</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">צמצום כרזות עוגיות</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">כבוי</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">פעיל</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">‏%1$s מנסה לדחות בקשות עוגיות אוטומטית בכרזות עוגיות.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">כבוי עבור אתר זה</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -472,33 +464,15 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">האתר לא נתמך כרגע</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">להפעיל צמצום כרזות עוגיות לאתר %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">להפעיל חוסם כרזות עוגיות לאתר %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">להשבית צמצום כרזות עוגיות לאתר %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">להשבית חוסם כרזות עוגיות לאתר %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">ל־%1$s אין אפשרות לדחות באופן אוטומטי בקשות עוגיות באתר הזה. אפשר לשלוח בקשה לתמוך באתר הזה בעתיד.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">‏%1$s ינקה את העוגיות של אתר זה וירענן את הדף. ניקוי כל העוגית עשוי לנתק את החשבון שלך מהאתר או לרוקן את עגלת הקניות שלך.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">כיבוי אפשרות זו תגרום לכך ש־%1$s ינקה עוגיות ויטען מחדש את אתר זה. פעולה זו עשויה לנתק את החשבון שלך מהאתר או לרוקן את עגלת הקניות שלך.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">‏%1$s מנסה לדחות באופן אוטומטי את כל בקשות העוגיות באתרים נתמכים.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">הפעלת אפשרות זו תגרום לכך ש־%1$s ינסה לסרב באופן אוטומטי לכל כרזות העוגיות באתר זה.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">לאפשר ל־%1$s לדחות כרזות עוגיות?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">‏%1$s יכול לדחות באופן אוטומטי מגוון רחב של בקשות כרזות עוגיות.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">לא כעת</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">תוצגנה פחות בקשות עוגיות</string>
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">לאפשר</string>
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">‏%1$s הרגע סירב לעוגיות עבורך</string>
     <!--Message for the cookie banner re-engagement CFR -->
@@ -1290,8 +1264,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">סגירה</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">לא ניתן להדפיס</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">לא ניתן להדפיס דף זה</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">הדפסה</string>
@@ -1913,7 +1885,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על כרטיסי האשראי השמורים שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על אמצעי התשלום השמורים שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על אמצעי התשלום השמורים שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">להגדיר כעת</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2075,12 +2047,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">אפשרויות ססמה</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">שדה הטקסט הניתן לעריכה עבור כתובת האתר של הכניסה.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">שדה הטקסט הניתן לעריכה עבור כתובת האתר של הססמה.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">שדה הטקסט הניתן לעריכה עבור כתובת האתר.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">שדה הטקסט הניתן לעריכה עבור שם המשתמש של הכניסה.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">שדה הטקסט הניתן לעריכה עבור שם המשתמש של הססמה.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">שדה הטקסט הניתן לעריכה עבור שם המשתמש.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">שדה הטקסט הניתן לעריכה עבור הססמה של הכניסה.</string>
     <!--  The editable text field for a login's password. -->
@@ -2279,8 +2251,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>הדגשים</b> הם מסקירות של %s במהלך 80 הימים האחרונים, שאנו מאמינים שהן אמינות.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">מידע נוסף על %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">כיצד %s מבית Mozilla קובע את איכות הסקירות</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">כיצד %s קובע את איכות הסקירות</string>
     <!-- Text for title of settings section. -->
@@ -2465,6 +2435,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">התרגום בתהליך</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">בחירת שפה</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">אירעה שגיאה בתרגום. נא לנסות שוב.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 2e204dcc3..cce974e94 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -216,6 +216,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="resync_button_content_description">Ales amtawi</string>
     <!-- Browser menu button that opens the find in page menu -->
     <string name="browser_menu_find_in_page">Nadi deg usebter</string>
+    <!-- Browser menu button that opens the translations dialog, which has options to translate the current browser page. -->
+    <string name="browser_menu_translations">Suqel asebter</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">Sekles ɣer tegrumma</string>
     <!-- Browser menu button that open a share menu to share the current site -->
@@ -246,6 +248,7 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Sagen asebter agejdan</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Agilal agejdan</string>
@@ -253,6 +256,10 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Sfeḍ azray n tunigin</string>
+
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Suqel asebter</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Fren tutlayt</string>
@@ -264,8 +271,6 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Snirem</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Amsedday unadi</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Iɣewwaṛen n umsedday n unadi</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -320,20 +325,25 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Ilɣa ttɛawanen ad tgeḍ ugar akked %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Ilɣa ttɛawanen ad tgeḍ ugar akked %s</string>
 
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Mtawi iccaren-ik•im gar yibenkan, sefrek isadaren, awi iwellihen akken ad tfarseḍ deg ummesten n tbaḍnit n %s, d wugar.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Mtawi iccaren-ik•im gar yibenkan, sefrek isadaren, awi iwellihen akken ad tfarseḍ deg ummesten n tbaḍnit n %s, d wugar.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Kemmel</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Kemmel</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Mačči tura</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Mačči tura</string>
 
+    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Tasertit tabaḍnit n Firefox</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Nḥemmel ad teqqimeḍ d aɣellsan</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Iminig-nneɣ tettallit yiwet n tkebbanit ur nettnadi ɣef tedrimt, tessewḥal tikebbaniyin ara ak-iḍefren deg web.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Iminig-nneɣ tettallit yiwet n tkebbanit ur nettnadi ɣef tedrimt, tessewḥal tikebbaniyin ara ak-iḍefren deg web.\n\nIssin ugar ɣef tsertit-nneɣ n tbaḍnit.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -436,21 +446,11 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Askar HTTPS-Only</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Asenqes n yiɣarracen n yinagan n tuqqna</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Amsewḥel n yiɣarracen n yinagan n tuqqna</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Amsewḥal n uɣerrac n yinagan n tuqqna deg tunigin tusligt</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Senqes iɣarracen n yinagan n tuqqna</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Yensa</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Yermed</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s iɛerreḍ s wudem awurman ad yagi isuturen n yinagan n tuqqna deg yiɣarracen n yinagan n tuqqna. </string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Sens i usmel-a</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -468,34 +468,15 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Asmel-a ur yettusefrak ara akka tura</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Rmed asenqes n yiɣerracen n yinagan n tuqqna i %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Rmed amsewḥel n yiɣerracen n yinagan n tuqqna i %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Sens asenqes n yiɣerracen n yinagan n tuqqna i %1$s?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Sens amsewḥel n yiɣerracen n yinagan n tuqqna i %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s ur yezmir ara ad yagi issutar n trusi n yinagan n tuqqna s wudem awurman ɣef usmel-a. Tzemreḍ ad tazneḍ assuter i tallalt n usmel-a ɣer sdat.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ad isfeḍ inagan n tuqqna n usmel-a syen ad issesfer asebter. Asfaḍ meṛṛa n yinagan n tuqqna yezmer ad ak·am-isseḥbes tuqqna neɣ ad yenɣel tiqecwalin n tiɣtin.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Sens ma d %1$s ad yesfeḍ inagan n tuqqna sakin ad yales asali n usmel-a. Atagi ad ak-isuffeɣ neɣ ad isilem tikarḍiwin-ik n tiɣin.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s yettaɛraḍ s wudem awurman ad yagi issutar n yinagan n tuqqna deg yismal i ten-yessefraken.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Sireg %1$s ad yagi iɣarracen n yinagan n tuqqna?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s yezmer ad yagi aṭas yissutar n yiɣarracen n yinagan n tuqqna s wudem awurman.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Mačči tura</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Ad twaliḍ drus n yissutar n yinagan n tuqqna</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Sireg</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s yugi inagan n tuqqna i kečč</string>
@@ -602,6 +583,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Preference for add_ons -->
     <string name="preferences_addons">Izegrar</string>
 
+    <!-- Preference for installing a local add-on -->
+    <string name="preferences_install_local_addon">Sebded azegrir seg ufaylu</string>
     <!-- Preference for notifications -->
     <string name="preferences_notifications">Ilɣa</string>
 
@@ -711,6 +694,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="preferences_sync_bookmarks">Ticraḍ n yisebtar</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Inekcam</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Awalen uffiren</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Accaren yeldin</string>
     <!-- Preference for signing out -->
@@ -738,6 +723,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Tikarḍiwin n usmad</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Tarrayin n uxelleṣ</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Tansiwin</string>
 
@@ -1283,8 +1270,6 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Zgel</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Ur yizmir ara ad issigez</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">D awezɣi ad yettwasiggez usebtar-a</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Siggez</string>
@@ -1330,6 +1315,9 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">Mdel iccaren usligen</string>
 
+    <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
+    <string name="notification_erase_title_android_14">Mdel iccaren usligen?</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">Talzuzit</string>
 
@@ -1687,8 +1675,12 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Inekcam d wawalen uffiren</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Awalen uffiren</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Sekles inekcam d wawalen uffiren</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Sekles awalen uffiren</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Suter asekles</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1706,16 +1698,25 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Rnu anekcum</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Rnu awal uffir</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Mtawi inekcam</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Mtawi awalen uffiren</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Mtawi inekcam gqr yibenkan</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Inekcam yettwakelsen</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Awalen uffiren yettwakelsen</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Anekcum i tḥerzeḍ ɣer %s ad d-ittwasken da.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Issin ugar ɣef umtawi.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Issin ugar ɣef umtawi</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Tisuraf</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
@@ -1726,6 +1727,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="preferences_passwords_exceptions_remove_all">Kkes akk tisuraf</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Nadi inekcam</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Nadi awalen uffiren</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Asmel web</string>
     <!-- The header for the username for a login -->
@@ -1785,6 +1788,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="preferences_addresses">Tansiwin</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Tikarḍiwin n usmad</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Tarrayin n uxelleṣ</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Asekles d taččart tawurmant n tkarḍiwin</string>
     <!-- Preference summary for saving and autofilling credit card data -->
@@ -1795,14 +1800,20 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="preferences_credit_cards_sync_cards">Mtawi tikarḍiwin</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Rnu takarḍa n usmad</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Rnu takarḍa</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Sefrek tikerḍiwin yettwaskelsen</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Sefrek tikarḍiwin</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Rnu tansa</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Sefrek tansiwin</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Asekles d taččart tawurmant n tansiwin</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Sekles; teččareḍ tansiwin</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Seddu talɣut am wuṭṭunen, imayl akked tansiwin n usiweḍ</string>
 
@@ -1826,6 +1837,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="credit_cards_delete_card_button">Kkes takarḍa</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Tebɣiḍ s tidet ad tekkseḍ takarḍa-a n usmad?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Kkes takarḍa?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Kkes</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1840,8 +1853,12 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Ma ulac aɣilif sekcem uṭṭun ameɣtu n tkarḍa n usmad</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Sekcem uṭṭun n tkarḍa ameɣtu</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Ttxil-k·m ččar urti-a</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Rnu isem</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Kkes asekkeṛ i wakken ad twaliḍ tikerḍiwin-ik·im yettwaskelsen</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
@@ -1894,6 +1911,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">D tidet tebɣiḍ ad tekkseḍ tansa-a?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Kkes tansa-a?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Kkes</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2008,14 +2027,24 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="saved_login_password_description">Urti n uḍris yettusenfal i wawal uffir n unekcum.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Sekles isenfaln unekcum.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Sekles isenfal.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Ẓreg</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Ẓreg awal uffir</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Rnu anekcum amaynut</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Rnu awal uffir</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Awal uffir yettusra</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Sekcem awal uffir</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Isem n useqdac yettwasra</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Sekcem isem n useqdac</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Asenneftaɣ yettwasra</string>
     <!-- Voice search button content description  -->
@@ -2317,6 +2346,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Inactive button text on the translations dialog that indicates a translation is currently in progress. This button will be accompanied by a loading icon. -->
     <string name="translations_bottom_sheet_translating_in_progress">Suqqel</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Fren tutlayt</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Yella wugur deg usuqqel. Ttxil-k ɛreḍ tikkelt niḍen.</string>
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
@@ -2333,6 +2364,9 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Section header text that begins the section of a list of different options the user may select to adjust their translation preferences. -->
     <string name="translation_settings_translation_preference">Ismenyifen n tsuqilt</string>
 
+    <!-- Button text for the button that will take the user to the download languages dialog. On the download languages dialog, the user can manage which languages they would like to download for translations. -->
+    <string name="translation_settings_download_language">Sader tutlayin</string>
+
     <!-- Preference option for never translate. Radio button title text.-->
     <string name="automatic_translation_option_never_translate_title_preference">Werǧin attsuqleḍ</string>
 
@@ -2356,6 +2390,10 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="download_languages_available_languages_preference">Tutlayin yellan</string>
     <!-- Text that will appear beside a core or pivot language package name to show that the language is necessary for the translation feature to function. -->
     <string name="download_languages_default_system_language_require_preference">iţusra</string>
+    <!-- A text for download language preference item.
+    The first parameter is the language name, for example, "Spanish".
+    The second parameter is the language file size, for example, "(3.91 KB)" or, if the language package name is a pivot language, "(required)". -->
+    <string name="download_languages_language_item_preference">%1$s (%2$s)</string>
     <!-- The subhead of the download language preference screen will appear above the items that were not downloaded. -->
     <string name="download_language_header_preference">Sader tutlayin</string>
     <!-- All languages list item. When the user presses this item, they can download or delete all languages. -->
@@ -2369,6 +2407,10 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Content description (not visible, for screen readers etc.): For a language list item that is selected. -->
     <string name="download_languages_item_content_description_selected_state">Yettwafran</string>
 
+    <!-- Title for the dialog used by the translations feature to confirm deleting a language.
+    The dialog will be presented when the user requests deletion of a language.
+    The first parameter is the name of the language, for example, "Spanish" and the second parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_file_dialog_title">Kkes %1$s (%2$s)?</string>
     <!-- Button text on the dialog used by the translations feature to confirm deleting a language. -->
     <string name="delete_language_file_dialog_positive_button_text">Kkes</string>
     <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index d3f31dac6..a960da871 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -240,6 +240,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Үй бетін баптау</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Бастапқы экран</string>
@@ -247,6 +248,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Шолу тарихын өшіру</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Парақты аудару</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Таңдалған тіл</string>
@@ -259,8 +263,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Сканерлеу</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Іздеу жүйесі</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Іздеу жүйесінің параметрлері</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -315,14 +317,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Хабарландырулар %s арқылы көбірек жұмыс бітіруге көмектеседі</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Хабарландырулар %s арқылы көбірек жұмыс бітіруге көмектеседі</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Беттерді құрылғылар арасында синхрондаңыз, жүктемелерді басқарыңыз, %s жекелігін қорғау мүмкіндігін барынша пайдалану туралы кеңестер алыңыз және т.б.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Беттерді құрылғылар арасында синхрондаңыз, жүктемелерді басқарыңыз, %s жекелігін қорғау мүмкіндігін барынша пайдалану туралы кеңестер алыңыз және т.б.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Жалғастыру</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Жалғастыру</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Қазір емес</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Қазір емес</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -440,21 +442,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Тек-HTTPS режимі</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie баннерлерін азайту</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Cookie баннерлерін бұғаттаушы</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Жекелік шолу режиміндегі cookie баннерлерін бұғаттаушы</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie баннерлерін азайту</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Сөндірулі</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Іске қосулы</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s cookie баннерлеріндегі cookie сұрауларын автоматты түрде қабылдамау әрекетін жасайды.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Бұл сайт үшін сөндірілген</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -473,37 +465,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Сайтқа ағымдағы уақытта қолдау жоқ</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s үшін cookie баннерлерін азайту мүмкіндігін іске қосу керек пе?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">%1$s үшін cookie баннерлерін бұғаттаушын іске қосу керек пе?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s үшін cookie баннерлерін азайту мүмкіндігін сөндіру керек пе?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">%1$s үшін cookie баннерлерін бұғаттаушын сөндіру керек пе?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s бұл сайттағы cookie сұрауларын автоматты түрде қабылдамай алмайды. Болашақта осы сайтқа қолдау көрсету туралы сұраным жібере аласыз.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s осы сайттың cookie файлдарын тазартып, бетті жаңартады. Барлық cookie файлдарын тазарту салдарынан сіз сайттан шығуыңыз мүмкін немесе дүкен себеттері тазартылуы мүмкін.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Сөндіріңіз, %1$s қолданбасы cookie файлдарын тазартып, бұл сайтты қайта жүктейді. Бұл әрекет сайттардан шығуға немесе себетті босатуы мүмкін.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s қолдау көрсетілетін сайттардағы барлық cookie сұрауларын автоматты түрде қабылдамау әрекетін жасайды.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Іске қосыңыз, және де %1$s осы сайттағы барлық cookie баннерлерінен автоматты түрде бас тартуға тырысады.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s үшін cookie баннерлерін қабылдамауға рұқсат бересіз бе?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s көптеген cookie баннер сұрауларын автоматты түрде қабылдамау әрекетін жасай алады.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Қазір емес</string>
-
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Сіз азырақ cookie сұрауларын көресіз</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Рұқсат ету</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s сіз үшін жаңа ғана cookie файлдарынан бас тартты</string>
@@ -1284,8 +1256,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Тайдыру</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Баспаға шығару мүмкін емес</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Бұл бетті басып шығару мүмкін емес</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Баспаға шығару</string>
@@ -1908,7 +1878,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Бөтен адам сіздің құрылғыңызда болса, одан сақталған несиелік карталарды қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Бөтен адам сіздің құрылғыңызда болса, одан сақталған карталарды қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Бөтен адам сіздің құрылғыңызда болса, одан сақталған төлем әдістерін қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Қазір баптау</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2070,12 +2040,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Пароль опциялары</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Логиннің веб-адресі үшін түзетуге болатын мәтіндік өрісі.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Парольдің веб-адресі үшін түзетуге болатын мәтіндік өрісі.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Веб-сайт адресі үшін түзетуге болатын мәтіндік өрісі.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Логиннің пайдаланушы аты үшін түзетуге болатын мәтіндік өрісі.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Парольдің пайдаланушы аты үшін түзетуге болатын мәтіндік өрісі.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Пайдаланушы аты үшін түзетуге болатын мәтіндік өрісі.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Логиннің паролі үшін түзетуге болатын мәтіндік өрісі.</string>
 
@@ -2273,8 +2243,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Маңызды сәттер</b> %s ішінен соңғы 80 күнде алынған, біз сенімді деп ойлайтын пікірлер негізінде алынды.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">%s туралы көбірек білу.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">Mozilla ұсынған %s пікірлер сапасын қалай анықтайды</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">%s пікірлер сапасын қалай анықтайды</string>
     <!-- Text for title of settings section. -->
@@ -2461,6 +2429,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Аудару орындалуда</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Тілді таңдау</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Аудару кезінде мәселе орын алды. Қайталап көріңіз.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 157771aab..539fed7c0 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -250,6 +250,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">홈페이지 개인화</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">홈 화면</string>
@@ -257,6 +258,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">방문 기록 삭제</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">페이지 번역</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">선택된 언어</string>
@@ -268,8 +272,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">스캔</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">검색 엔진</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">검색 엔진 설정</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -325,14 +327,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">알림은 %s로 더 많은 작업을 수행하는 데 도움이 됩니다.</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">알림은 %s로 더 많은 작업을 수행하는 데 도움이 됩니다.</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">기기 간에 탭을 동기화하고, 다운로드를 관리하고, %s의 개인 정보 보호를 최대한 활용하는 방법에 대한 팁을 얻으세요.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">기기 간에 탭을 동기화하고, 다운로드를 관리하고, %s의 개인 정보 보호를 최대한 활용하는 방법에 대한 팁을 얻으세요.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">계속</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">계속</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">나중에</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">나중에</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -451,21 +453,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">HTTPS 전용 모드</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">쿠키 배너 감소</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">쿠키 배너 차단기</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">사생활 보호 모드의 쿠키 배너 차단기</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">쿠키 배너 줄이기</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">꺼짐</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">켜짐</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s는 자동으로 쿠키 배너에서 쿠키 요청을 거부하려고 시도합니다.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">이 사이트에서 꺼짐</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -483,37 +475,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">현재 지원되지 않는 사이트</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s에 대해 쿠키 배너 감소를 켜시겠습니까?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">%1$s에 쿠키 배너 차단기를 켜시겠습니까?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s에 대해 쿠키 배너 감소를 끄시겠습니까?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">%1$s에 쿠키 배너 차단기를 끄시겠습니까?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s는 이 사이트에서 쿠키 요청을 자동으로 거부할 수 없습니다. 나중에 이 사이트를 지원하도록 요청을 보낼 수 있습니다.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s는 이 사이트의 쿠키를 지우고 페이지를 새로 고침합니다. 모든 쿠키를 삭제하면 로그아웃되거나 장바구니가 비워질 수 있습니다.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">끄면 %1$s가 쿠키를 지우고 이 사이트를 다시 로드합니다. 로그아웃되거나 장바구니가 비워질 수 있습니다.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s는 지원되는 사이트에서 모든 쿠키 요청을 자동으로 거부하려고 시도합니다.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">켜면 %1$s가 이 사이트의 모든 쿠키 배너를 자동으로 거부하려고 시도합니다.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s가 쿠키 배너를 거부하도록 허용하시겠습니까?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s는 많은 쿠키 배너 요청을 자동으로 거부할 수 있습니다.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">나중에</string>
-
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">쿠키 요청이 더 적게 표시됩니다.</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">허용</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s가 쿠키를 거부했습니다</string>
@@ -1323,8 +1295,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">닫기</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">인쇄할 수 없음</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">이 페이지를 인쇄할 수 없음</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">인쇄</string>
@@ -1957,11 +1927,11 @@
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">신용 카드 보안</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">저장된 결제 수단을 보호하세요</string>
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">저장된 결제 방법을 보호하세요</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">다른 사람이 내 기기를 가지고 있는 경우, 저장된 신용 카드에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">다른 사람이 내 기기를 가지고 있는 경우, 저장된 카드에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">다른 사람이 내 기기를 가지고 있는 경우, 저장된 결제 방법에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">지금 설정</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2124,12 +2094,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">비밀번호 옵션</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">로그인 웹 주소의 편집 가능한 텍스트 필드입니다.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">비밀번호의 웹 사이트 주소에 대한 편집 가능한 텍스트 필드입니다.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">웹 사이트 주소에 대한 편집 가능한 텍스트 필드입니다.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">로그인 사용자 이름의 편집 가능한 텍스트 필드입니다.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">비밀번호의 사용자 이름에 대한 편집 가능한 텍스트 필드입니다.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">사용자 이름에 대한 편집 가능한 텍스트 필드입니다.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">로그인 비밀번호의 편집 가능한 텍스트 필드입니다.</string>
     <!--  The editable text field for a login's password. -->
@@ -2328,8 +2298,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>하이라이트</b>는 지난 80일 동안 신뢰할 수 있는 %s의 리뷰에서 나온 것입니다.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">%s에 대해 더 알아보세요.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">Mozilla의 %s이 리뷰 품질을 결정하는 방법</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">%s이 리뷰 품질을 결정하는 방법</string>
     <!-- Text for title of settings section. -->
@@ -2514,6 +2482,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">번역 진행 중</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">언어 선택</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">번역하는 중에 문제가 발생했습니다. 다시 시도하세요.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0018da0fa..27fb89c2f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -249,6 +249,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Startpagina aanpassen</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Startscherm</string>
@@ -256,6 +257,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Navigatiegeschiedenis wissen</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Pagina vertalen</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Geselecteerde taal</string>
@@ -267,8 +271,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scannen</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Zoekmachine</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Instellingen zoekmachine</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -324,14 +326,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Meldingen helpen u meer te doen met %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Meldingen helpen u meer te doen met %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synchroniseer uw tabbladen tussen apparaten, beheer downloads, ontvang tips over het optimaal benutten van de privacybescherming van %s en meer.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synchroniseer uw tabbladen tussen apparaten, beheer downloads, ontvang tips over het optimaal benutten van de privacybescherming van %s en meer.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Doorgaan</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Doorgaan</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Niet nu</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Niet nu</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -448,21 +450,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Alleen-HTTPS-modus</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reductie van cookiebanners</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blokkering van cookiebanners</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blokkering van cookiebanners tijdens privénavigatie</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookiebanners reduceren</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Uit</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Aan</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s probeert automatisch cookieverzoeken op cookiebanners te weigeren.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Uit voor deze website</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -480,35 +472,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Website wordt momenteel niet ondersteund</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Reductie van cookiebanners inschakelen voor %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Blokkering van cookiebanners inschakelen voor %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Reductie van cookiebanners uitschakelen voor %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Blokkering van cookiebanners uitschakelen voor %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s kan cookieverzoeken op deze website niet automatisch weigeren. U kunt een aanvraag sturen om deze website in de toekomst te ondersteunen.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s wist de cookies voor deze website en vernieuwt de pagina. Als alle cookies worden gewist, wordt u mogelijk afgemeld of worden winkelwagentjes geleegd.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Schakel dit uit en %1$s zal cookies wissen en deze website opnieuw laden. Dit kan u afmelden of winkelwagentjes legen.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s probeert alle cookieverzoeken op ondersteunde websites automatisch te weigeren.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Schakel dit in en %1$s zal proberen alle cookiebanners op deze website automatisch te weigeren.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s toestaan om cookiebanners te weigeren?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s kan veel cookiebannerverzoeken automatisch weigeren.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Niet nu</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">U ziet minder cookieverzoeken</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Toestaan</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s heeft zojuist cookies voor u geweigerd</string>
@@ -1297,8 +1270,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Sluiten</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Kan niet afdrukken</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Kan deze pagina niet afdrukken</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Afdrukken</string>
@@ -1921,7 +1892,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen creditcards te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen kaarten te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen betalingsmethoden te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Nu instellen</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2083,12 +2054,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Wachtwoordopties</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Het bewerkbare tekstveld voor het webadres van de aanmelding.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Het bewerkbare tekstveld voor het websiteadres van het wachtwoord.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Het bewerkbare tekstveld voor het websiteadres.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Het bewerkbare tekstveld voor de gebruikersnaam van de aanmelding.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Het bewerkbare tekstveld voor de gebruikersnaam van het wachtwoord.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Het bewerkbare tekstveld voor de gebruikersnaam.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Het bewerkbare tekstveld voor het wachtwoord van de aanmelding.</string>
     <!--  The editable text field for a login's password. -->
@@ -2286,8 +2257,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Hoogtepunten</b> zijn afkomstig van beoordelingen van %s in de afgelopen 80 dagen die volgens ons betrouwbaar zijn.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Meer info over %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">hoe %s door Mozilla de beoordelingskwaliteit bepaalt</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">hoe %s de beoordelingskwaliteit bepaalt</string>
     <!-- Text for title of settings section. -->
@@ -2474,6 +2443,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Vertaling wordt uitgevoerd</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Kies een taal</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Er is een probleem opgetreden bij het vertalen. Probeer het opnieuw.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f31b19fc6..332fdda58 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -245,6 +245,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalizar tela inicial</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Tela inicial</string>
@@ -252,6 +253,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Apagar histórico de navegação</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Traduzir página</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Selecionar idioma</string>
@@ -1884,7 +1888,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a seus cartões de crédito salvos, caso outras pessoas usem seu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a seus cartões salvos, caso outras pessoas usem seu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a seus métodos de pagamento salvos, caso outras pessoas usem seu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar agora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2047,12 +2051,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Opções de senhas</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">O campo de texto editável do endereço web da conta.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">O campo de texto editável do endereço do site da senha.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">O campo de texto editável do endereço do site.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">O campo de texto editável do nome de usuário da conta.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">O campo de texto editável do nome de usuário da senha.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">O campo de texto editável do nome de usuário.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">O campo de texto editável da senha da conta.</string>
     <!--  The editable text field for a login's password. -->
@@ -2439,6 +2443,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Tradução em andamento</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Escolha um idioma</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Houve um problema ao traduzir. Tente novamente.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 849bf639c..cfc3e91f1 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -244,6 +244,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalizar página inicial</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Ecrã inicial</string>
@@ -251,6 +252,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Apagar histórico de navegação</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Traduzir página</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Idioma selecionado</string>
@@ -1884,7 +1888,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que os seus cartões de crédito guardados sejam acedidos por outra pessoa que tenha acesso ao seu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que os seus cartões guardados sejam acedidos por outra pessoa que tenha acesso ao seu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que os seus métodos de pagamento guardados sejam acedidos por outra pessoa que tenha acesso ao seu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar agora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2046,12 +2050,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Opções de palavra-passe</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">O campo de texto editável para o endereço de Internet da credencial.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">O campo de texto editável para o endereço da palavra-passe.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">O campo de texto editável para o endereço do site.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">O campo de texto editável para o nome de utilizador da credencial.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">O campo de texto editável para o nome de utilizador da palavra-passe.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">O campo de texto editável para o nome de utilizador.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">O campo de texto editável para a palavra-passe da credencial.</string>
     <!--  The editable text field for a login's password. -->
@@ -2431,6 +2435,8 @@
     <string name="translations_bottom_sheet_translating_in_progress">Tradução</string>
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Tradução em curso</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Escolha um idioma</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Ocorreu um problema com a tradução. Por favor, tente novamente.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2e1347e28..6c1ec56f5 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -251,6 +251,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Изменить вид</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Домашний экран</string>
@@ -258,6 +259,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Удалить историю веб-сёрфинга</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Перевести страницу</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Текущий язык</string>
@@ -269,8 +273,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Считать</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Поисковая система</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Настройки поисковых систем</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -326,14 +328,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Уведомления помогают вам делать больше с %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Уведомления помогают вам делать больше с %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Синхронизируйте вкладки между устройствами, управляйте загрузками, получайте советы о том, как максимально эффективно использовать защиту конфиденциальности %s, и многое другое.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Синхронизируйте вкладки между устройствами, управляйте загрузками, получайте советы о том, как максимально эффективно использовать защиту конфиденциальности %s, и многое другое.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Продолжить</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Продолжить</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Не сейчас</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Не сейчас</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -451,22 +453,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Режим «Только HTTPS»</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Снижение числа уведомлений о куках</string>
-
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Блокировщик уведомления о куки</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Блокировщик уведомления о куки в приватном просмотре</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Снижать число уведомлений о куках</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Отключено</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Включено</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s автоматически пытается отклонить запросы кук в уведомлениях о куках.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Отключено для этого сайта</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -484,35 +475,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">В настоящее время сайт не поддерживается</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Включить Снижение количества уведомлений о куках для %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Включить блокировщик уведомления о куки для %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Отключить Снижение количества уведомлений о куках для %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Выключить блокировщик уведомления о куки для %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s не может автоматически отклонять запросы на использование кук на этом сайте. Вы можете отправить запрос на поддержку этого сайта в будущем.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s удалит куки этого сайта и обновит страницу. Удаление всех кук может привести к выходу из системы или к пропаже покупок из корзины.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Выключите, и %1$s удалит куки и перезагрузит этот сайт. Это может привести к выходу из системы или опустошению корзины покупок.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s пытается автоматически отклонить все запросы кук на поддерживаемых сайтах.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Включите, и %1$s попытается автоматически отклонить все уведомления о куки на этом сайте.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Разрешить %1$s отклонять уведомления о куках?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s может автоматически отклонять многие запросы уведомлений о куках.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Не сейчас</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Вы увидите меньше запросов на принятие кук</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Разрешить</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s только что отказался от куки для вас</string>
@@ -1313,8 +1285,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Убрать</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Невозможно распечатать</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Не удалось распечатать эту страницу</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Печать</string>
@@ -1940,7 +1910,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Настройте графический ключ, Пин-код или пароль для блокировки устройства, чтобы защитить сохранённые банковские карты, если кто-либо ещё получит доступ к вашему устройству.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Настройте графический ключ, пин-код или пароль для разблокировки устройства, чтобы защитить сохранённые карты на случай, если кто-либо ещё получит доступ к вашему устройству.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Настройте графический ключ, Пин-код или пароль для разблокировки устройства, чтобы защитить сохранённые способы оплаты, на случай, если кто-либо ещё получит доступ к вашему устройству.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Настроить сейчас</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2100,12 +2070,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Настройки пароля</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Редактируемое текстовое поле для веб-адреса логина.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Редактируемое текстовое поле для адреса веб-сайта данного пароля.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Редактируемое текстовое поле для адреса веб-сайта.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Редактируемое текстовое поле для имени пользователя логина.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Редактируемое текстовое поле для имени пользователя данного пароля.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Редактируемое текстовое поле для имени пользователя.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Редактируемое текстовое поле для пароля логина.</string>
     <!--  The editable text field for a login's password. -->
@@ -2303,8 +2273,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Основные сведения</b> взяты из отзывов на %s за последние 80 дней, которые мы считаем надежными.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Узнайте больше о %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">как %s от Mozilla определяет качество отзывов</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">как %s определяет качество обзора</string>
     <!-- Text for title of settings section. -->
@@ -2489,6 +2457,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Идёт перевод</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Выберите язык</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">При переводе возникла проблема. Пожалуйста, попробуйте ещё раз.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 18e803ffd..4cc16dd0f 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -236,6 +236,7 @@
     <string name="browser_menu_edit">සංස්කරණය</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">මුල්පිටුව අභිරුචිකරණය</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">මුල් තිරය</string>
@@ -243,6 +244,7 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">පිරික්සුම් ඉතිහාසය මකන්න</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">තෝරාගත් භාෂාව</string>
@@ -1742,9 +1744,14 @@
     <string name="preferences_addresses_manage_addresses">ලිපින කළමනාකරණය</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">ලිපින සුරැකීම හා ස්වයං පිරවීම</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">ලිපින සුරැකීම හා පිරවීම</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">අංක, වි-තැපැල් සහ බාර දීමේ ලිපින වැනි තොරතුරු ඇතුළත් කරන්න</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">දුරකථන අංක සහ වි-තැපැල් ලිපින ඇතුළත් වේ</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">පත එක් කරන්න</string>
     <!-- Title of the "Edit card" screen -->
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 0f62e84db..a7ab3de34 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -248,6 +248,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Anpassa startsidan</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Startsidan</string>
@@ -255,6 +256,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Radera webbhistorik</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Översätt sida</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valt språk</string>
@@ -1893,7 +1897,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Konfigurera enhetens låsmönster, PIN eller lösenord för att skydda dina sparade kreditkort från åtkomst om någon annan har din enhet.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Konfigurera ett enhetslåsmönster, PIN-kod eller lösenord för att skydda dina sparade kort från att användas om någon annan använder din enhet.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Konfigurera ett enhetslåsmönster, PIN-kod eller lösenord för att skydda dina sparade betalningsmetoder från att användas om någon annan har din enhet.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Konfigurera nu</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2056,12 +2060,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Lösenordsalternativ</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Det redigerbara textfältet för inloggningens webbadress.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Det redigerbara textfältet för webbplatsadressen för lösenordet.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Det redigerbara textfältet för webbplatsadressen.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Det redigerbara textfältet för inloggningens användarnamn.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Det redigerbara textfältet för användarnamnet till lösenordet.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Det redigerbara textfältet för användarnamnet.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Det redigerbara textfältet för inloggningens lösenord.</string>
     <!--  The editable text field for a login's password. -->
@@ -2442,6 +2446,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Översättning pågår</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Välj ett språk</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Det uppstod ett problem med översättningen. Försök igen.</string>
 
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 0d816d01a..927f22503 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -244,6 +244,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Giriş sayfasını özelleştir</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Ana ekran</string>
@@ -251,6 +252,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Gezinti geçmişini temizle</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Sayfayı çevir</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Seçili dil</string>
@@ -1882,7 +1886,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Cihazınız başka birinin eline geçerse kayıtlı kartlarınıza erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Cihazınız başka birinin eline geçerse kayıtlı kartlarınıza erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Cihazınız başka birinin eline geçerse kayıtlı ödeme yöntemlerinize erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Hemen ayarla</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2044,12 +2048,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Parola seçenekleri</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Hesabın web adresi için düzenlenebilir metin alanı.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Parolanın web sitesi için düzenlenebilir metin alanı.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Web sitesi adresi için düzenlenebilir metin alanı.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Hesabın kullanıcı adı için düzenlenebilir metin alanı.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Parolanın kullanıcı adı için düzenlenebilir metin alanı.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Kullanıcı adı için düzenlenebilir metin alanı.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Hesabın parolası için düzenlenebilir metin alanı.</string>
     <!--  The editable text field for a login's password. -->
@@ -2432,6 +2436,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Çeviri devam ediyor</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Dil seçin</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Çeviri sırasında bir sorun oluştu. Lütfen yeniden deneyin.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index 48fcd8d26..27f068117 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -240,6 +240,7 @@
     <string name="browser_menu_edit">تەھرىرلەش</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">باش بەتنى خاسلاشتۇر</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">باش ئېكران</string>
@@ -247,6 +248,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">توركۆرگۈ تارىخىنى ئۆچۈر</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">بەت تەرجىمىسى</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">تاللانغان تىل</string>
@@ -1864,7 +1868,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان ئىناۋەتلىك كارتىڭىزنى زىيارەت قىلالمايدۇ.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان كارتىلىرىڭىزنى زىيارەت قىلالمايدۇ.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان چىقىم قىلىش ئۇسۇلىڭىزنى زىيارەت قىلالمايدۇ.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">ھازىر تەڭشە</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2023,13 +2027,13 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">ئىم تاللانمىسى</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">كىرىشنىڭ تور ئادرېسىنى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">ئىمنىڭ تور بېكەت ئادرېسىدىكى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">تور بېكەت ئادرېسىنىڭ تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">كىرىشنىڭ ئىشلەتكۈچى ئىسمىنى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
 
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">ئىمنىڭ ئىشلەتكۈچى ئىسمىدىكى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">ئىشلەتكۈچى ئاتىنىڭ تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">كىرىشنىڭ ئىمىنى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
     <!--  The editable text field for a login's password. -->
@@ -2413,6 +2417,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">تەرجىمە قىلىنىۋاتىدۇ</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">تىل تاللىنىدۇ</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">تەرجىمە قىلىشتا مەسىلە كۆرۈلدى. قايتا سىناڭ.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index abafc50e4..d1402b96f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -250,6 +250,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">定制主页</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">主屏幕</string>
@@ -257,6 +258,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">清除浏览历史</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">翻译页面</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">选择的语言</string>
@@ -268,8 +272,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">扫码</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">搜索引擎</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">搜索引擎设置</string>
 
@@ -327,14 +329,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">允许通知可以让 %s 更贴心好用</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">允许通知可以让 %s 更贴心好用</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">在设备间同步标签页、管理下载、了解充分利用 %s 来保护隐私的窍门，还有更多实用功能。</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">在设备间同步标签页、管理下载、了解充分利用 %s 来保护隐私的窍门，还有更多实用功能。</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">继续</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">继续</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">暂时不要</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">暂时不要</string>
 
     <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
@@ -449,21 +451,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">HTTPS-Only 模式</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">减少 Cookie 横幅</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Cookie 横幅拦截器</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">隐私浏览中的 Cookie 横幅拦截器</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">减少 Cookie 横幅</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">关闭</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">开启</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s 会尝试自动拒绝 Cookie 横幅的 Cookie 请求。</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">在该网站关闭</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -481,36 +473,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">目前不支持该网站</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">要为 %1$s 开启“减少 Cookie 横幅”功能吗？</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">要为 %1$s 开启 Cookie 横幅拦截器吗？</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">要为 %1$s 关闭“减少 Cookie 横幅”功能吗？</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">要为 %1$s 关闭 Cookie 横幅拦截器吗？</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s 无法自动拒绝此站点上的 Cookie 请求。您可以请求将来对此站点的支持。</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s 将清除此网站的 Cookie 并刷新页面。清除 Cookie 可能会导致您退出登录，或清空购物车。</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">关闭后，%1$s 将清除 Cookie 并重新加载此网站。这可能导致退出登录或清空购物车。</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s 会尝试在支持的网站上尽可能拒绝所有 Cookie 请求。</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">开启后，%1$s 将尝试自动拒绝此网站上的 Cookie 横幅。</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">要允许 %1$s 拒绝 Cookie 横幅吗？</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s 可自动拒绝许多 Cookie 横幅的请求。</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">暂时不要</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">您看到的 Cookie 请求会减少</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">允许</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s 刚刚为您拒绝了 Cookie 请求</string>
@@ -1319,8 +1292,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">知道了</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">无法打印</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">无法打印此页面</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">打印</string>
@@ -1803,7 +1774,7 @@
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">保护您的登录名和密码</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">设置锁定方式、PIN 码或密码以保护您保存的登录名与密码，避免他人盗用。</string>
+    <string name="logins_warning_dialog_message">设置设备锁定图案、PIN 或密码以保护您保存的登录名与密码，避免他人盗用。</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">稍后</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1894,7 +1865,7 @@
     <string name="credit_cards_warning_dialog_title">保护您的卡片信息</string>
 
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">设置锁定方式、PIN 码或密码以保护您保存的卡片信息，避免他人盗用。</string>
+    <string name="credit_cards_warning_dialog_message">设置设备锁定图案、PIN 或密码以保护您保存的卡片信息，避免他人盗用。</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">立即设置</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2233,8 +2204,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>最有帮助的评价</b>选自我们认为可信的最近 80 天内的 %s 评价。]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">详细了解%s</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">由 Mozilla 支持的 %s 判断评价质量的方式</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">%s 判断评价质量的方式</string>
     <!-- Text for title of settings section. -->
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 1ba4d2a4a..eb86161ce 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -248,6 +248,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">自訂首頁</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">主畫面</string>
@@ -255,6 +256,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">清除瀏覽紀錄</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">翻譯頁面</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">選擇的語言</string>
@@ -266,8 +270,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">掃描</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">搜尋引擎</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">搜尋引擎設定</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -323,14 +325,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">透過通知，可幫助您使用 %s 做到更多事</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">透過通知，可幫助您使用 %s 做到更多事</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">在不同裝置間同步分頁、管理下載資料、獲得能讓 %s 的隱私權保護功能發揮到極致的使用秘訣，與更多資訊。</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">在不同裝置間同步分頁、管理下載資料、獲得能讓 %s 的隱私權保護功能發揮到極致的使用秘訣，與更多資訊。</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">繼續</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">繼續</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">現在不要</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">現在不要</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -448,21 +450,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">純 HTTPS 模式</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">減少 Cookie 橫幅</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Cookie 橫幅封鎖器</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">隱私瀏覽模式中的 Cookie 橫幅封鎖器</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">減少 Cookie 橫幅</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">關閉</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">開啟</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s 會自動嘗試拒絕網站 Cookie 橫幅上的設定請求。</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">對此網站關閉</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -480,36 +472,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">目前不支援的網站</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">要為 %1$s 開啟減少 Cookie 橫幅功能嗎？</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">要為 %1$s 開啟 Cookie 橫幅封鎖器嗎？</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">要為 %1$s 關閉減少 Cookie 橫幅功能嗎？</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">要為 %1$s 關閉 Cookie 橫幅封鎖器嗎？</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s 無法自動拒絕此網站上的 Cookie 請求。您可以請求我們未來支援此網站。</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s 將清除此網站的 Cookie 並重新載入頁面。清除 Cookie 可能會將您從網站登出，或清空購物車。</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">關閉封鎖器後，%1$s 將會清除此網站的 Cookie 並重新載入頁面。可能會導致您被登出或清空購物車。</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s 可自動在支援的網站，為您拒絕網站設定 Cookie 的請求。</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">開啟封鎖器後，%1$s 就會對此網站自動嘗試拒絕所有 Cookie 橫幅。</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">要讓 %1$s 為您拒絕 cookie 橫幅嗎？</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s 可自動為您拒絕許多網站設定 Cookie 的請求。</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">現在不要</string>
-
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">您看到的 Cookie 請求會變少</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">允許</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s 剛為您拒絕了 Cookie</string>
@@ -1314,8 +1286,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">知道了！</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">無法列印</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">無法列印此頁面</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">列印</string>
@@ -1944,7 +1914,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存的信用卡資訊，避免別人盜用。</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存的卡片資訊，避免別人盜用。</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存的付款方式資訊，避免別人盜用。</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">立即設定</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2106,12 +2076,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">密碼選項</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">登入資訊當中，網址的輸入欄位。</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">網址的輸入欄位。</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">網址的輸入欄位。</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">登入資訊當中，使用者名稱的輸入欄位。</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">使用者名稱的輸入欄位。</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">使用者名稱的輸入欄位。</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">登入資訊當中，密碼的輸入欄位。</string>
     <!--  The editable text field for a login's password. -->
@@ -2308,8 +2278,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>重點資訊</b>是根據過去 80 天中，我們相信是可靠的 %s 評論所整理出的資訊。]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">了解 %s 的更多資訊。</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">%s 如何判斷評論品質</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">%s 如何判斷評論品質</string>
     <!-- Text for title of settings section. -->
@@ -2493,6 +2461,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">翻譯中</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">選擇一種語言</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">翻譯時發生問題，請再試一次。</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->

From 8201151db6f9cea79f6ce3eddead1eb2ea510cfa Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Wed, 31 Jan 2024 21:26:16 -0500
Subject: [PATCH 074/222] Bug 1877888 - Update Adjust to version 4.38.1

---
 .../fenixdependencies/src/main/java/FenixDependenciesPlugin.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
index e4a769a07..95761c572 100644
--- a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+++ b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
@@ -28,7 +28,7 @@ object FenixVersions {
     const val androidx_datastore = "1.0.0"
     const val google_accompanist = "0.30.1"
 
-    const val adjust = "4.35.1"
+    const val adjust = "4.38.1"
     const val installreferrer = "2.2"
 
     const val junit = "5.9.3"

From ad3c92ab9d1793a75e21b29c688463702227aa93 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Wed, 31 Jan 2024 21:27:11 -0500
Subject: [PATCH 075/222] Revert "Bug 1877888 - Update Adjust to version
 4.38.1"

This reverts commit 6d10180e7bf63060768ebb07df68ed7844ed3185.
---
 .../fenixdependencies/src/main/java/FenixDependenciesPlugin.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
index 95761c572..e4a769a07 100644
--- a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+++ b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
@@ -28,7 +28,7 @@ object FenixVersions {
     const val androidx_datastore = "1.0.0"
     const val google_accompanist = "0.30.1"
 
-    const val adjust = "4.38.1"
+    const val adjust = "4.35.1"
     const val installreferrer = "2.2"
 
     const val junit = "5.9.3"

From df7f6cb4db31ffd0f2030018093cfa22d44a8352 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:07:11 +0200
Subject: [PATCH 076/222] Bug 1877440 - Use only TestHelper snack bar
 verification function in UI tests

---
 .../java/org/mozilla/fenix/helpers/TestHelper.kt      | 11 +++--------
 .../java/org/mozilla/fenix/ui/BookmarksTest.kt        |  1 +
 .../java/org/mozilla/fenix/ui/CollectionTest.kt       |  3 ++-
 .../org/mozilla/fenix/ui/ComposeCollectionTest.kt     |  2 +-
 .../org/mozilla/fenix/ui/ComposeContextMenusTest.kt   |  1 +
 .../java/org/mozilla/fenix/ui/ContextMenusTest.kt     |  1 +
 .../org/mozilla/fenix/ui/MediaNotificationTest.kt     |  1 +
 .../java/org/mozilla/fenix/ui/SettingsHomepageTest.kt |  1 +
 .../java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt   |  1 +
 .../java/org/mozilla/fenix/ui/TopSitesTest.kt         |  1 +
 .../java/org/mozilla/fenix/ui/robots/BrowserRobot.kt  |  5 -----
 .../org/mozilla/fenix/ui/robots/CollectionRobot.kt    |  3 ---
 .../org/mozilla/fenix/ui/robots/HomeScreenRobot.kt    |  4 ----
 .../fenix/ui/robots/SettingsSubMenuHomepageRobot.kt   |  7 -------
 .../org/mozilla/fenix/ui/robots/TabDrawerRobot.kt     |  3 ---
 15 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
index dedb39b2c..a1f415a5c 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
@@ -34,6 +34,8 @@ import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.Constants.TAG
+import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
+import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
@@ -103,14 +105,7 @@ object TestHelper {
         ).waitUntilGone(waitingTime)
     }
 
-    fun verifySnackBarText(expectedText: String) {
-        assertTrue(
-            mDevice.findObject(
-                UiSelector()
-                    .textContains(expectedText),
-            ).waitForExists(waitingTime),
-        )
-    }
+    fun verifySnackBarText(expectedText: String) = assertUIObjectExists(itemContainingText(expectedText))
 
     fun verifyUrl(urlSubstring: String, resourceName: String, resId: Int) {
         waitUntilObjectIsFound(resourceName)
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index e99e0fc12..f5a9bd103 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -32,6 +32,7 @@ import org.mozilla.fenix.helpers.TestHelper.appContext
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
 import org.mozilla.fenix.helpers.TestHelper.restartApp
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.ui.robots.bookmarksMenu
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.homeScreen
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
index bf73f1682..c917f4d3f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
@@ -18,6 +18,7 @@ import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.collectionRobot
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -490,7 +491,7 @@ class CollectionTest {
             selectTab(secondWebPage.title, numOfTabs = 2)
         }.clickSaveCollection {
             typeCollectionNameAndSave(collectionName)
-            verifySnackBarText("Tabs saved!")
+            verifySnackBarText("Collection saved!")
         }
 
         tabDrawer {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeCollectionTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeCollectionTest.kt
index 990b02c89..a18366cc7 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeCollectionTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeCollectionTest.kt
@@ -475,7 +475,7 @@ class ComposeCollectionTest {
             verifyTabsMultiSelectionCounter(2)
         }.clickSaveCollection {
             typeCollectionNameAndSave(collectionName)
-            verifySnackBarText("Tabs saved!")
+            verifySnackBarText("Collection saved!")
         }
 
         composeTabDrawer(composeTestRule) {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeContextMenusTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeContextMenusTest.kt
index 85a3e0c4c..5e554b49d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeContextMenusTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeContextMenusTest.kt
@@ -23,6 +23,7 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.ui.robots.clickContextMenuItem
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.downloadRobot
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
index 4e95fba11..eeeec68a7 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
@@ -22,6 +22,7 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.ui.robots.clickContextMenuItem
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.downloadRobot
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt
index 5ea9084c6..eba6aad2e 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt
@@ -20,6 +20,7 @@ import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHomepageTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHomepageTest.kt
index 4c525f096..bc4a78a9f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHomepageTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHomepageTest.kt
@@ -18,6 +18,7 @@ import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.restartApp
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
index d09ac4e0c..7072d6efa 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
@@ -23,6 +23,7 @@ import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.closeApp
 import org.mozilla.fenix.helpers.TestHelper.restartApp
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
index a8ecb1758..a45320d36 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
@@ -20,6 +20,7 @@ import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.helpers.TestHelper.waitUntilSnackbarGone
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.homeScreen
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
index d2f2e0254..c873372f2 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
@@ -163,11 +163,6 @@ class BrowserRobot {
             ),
         )
 
-    fun verifySnackBarText(expectedText: String) {
-        mDevice.waitForObjects(mDevice.findObject(UiSelector().textContains(expectedText)))
-        assertUIObjectExists(itemContainingText(expectedText))
-    }
-
     fun verifyContextMenuForLocalHostLinks(containsURL: Uri) {
         // If the link is directing to another local asset the "Download link" option is not available
         // If the link is not re-directing to an external app the "Open link in external app" option is not available
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt
index 029e5485d..94626a88e 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt
@@ -169,9 +169,6 @@ class CollectionRobot {
         Log.i(TAG, "swipeTabRight: Waited for rule to be idle")
     }
 
-    fun verifySnackBarText(expectedText: String) =
-        itemContainingText(expectedText).waitForExists(waitingTime)
-
     fun goBackInCollectionFlow() {
         backButton().click()
         Log.i(TAG, "goBackInCollectionFlow: Clicked collection creation flow back button")
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
index 286851db9..5c7bfd4cb 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
@@ -290,10 +290,6 @@ class HomeScreenRobot {
     fun swipeToTop() =
         onView(withId(R.id.sessionControlRecyclerView)).perform(ViewActions.swipeDown())
 
-    fun verifySnackBarText(expectedText: String) {
-        mDevice.waitNotNull(findObject(By.text(expectedText)), waitingTime)
-    }
-
     fun clickFirefoxLogo() = homepageWordmark().click()
 
     fun verifyThoughtProvokingStories(enabled: Boolean) {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuHomepageRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuHomepageRobot.kt
index b6c9f1c7c..6585616f2 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuHomepageRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuHomepageRobot.kt
@@ -23,8 +23,6 @@ import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.Matchers
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.Constants
-import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
-import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
 import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.mDevice
@@ -101,11 +99,6 @@ class SettingsSubMenuHomepageRobot {
     fun selectWallpaper(wallpaperName: String) =
         mDevice.findObject(UiSelector().description(wallpaperName)).click()
 
-    fun verifySnackBarText(expectedText: String) =
-        assertUIObjectExists(
-            itemContainingText(expectedText),
-        )
-
     fun verifySponsoredShortcutsCheckBox(checked: Boolean) = assertSponsoredShortcutsCheckBox(checked)
 
     class Transition {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt
index c7b833dc8..419d2799a 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt
@@ -206,9 +206,6 @@ class TabDrawerRobot {
         }
     }
 
-    fun verifySnackBarText(expectedText: String) =
-        assertUIObjectExists(itemContainingText(expectedText))
-
     fun snackBarButtonClick(expectedText: String) {
         val snackBarButton =
             mDevice.findObject(

From 693624395aec3ef8e48a18e5d21427e3d7003d90 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 1 Feb 2024 11:31:43 +0200
Subject: [PATCH 077/222] Bug 1877938 - Remove redundant assertion functions
 from BookmarksRobot

---
 .../org/mozilla/fenix/ui/BookmarksTest.kt     | 16 ++++-----
 .../mozilla/fenix/ui/ComposeBookmarksTest.kt  | 17 ++++-----
 .../mozilla/fenix/ui/robots/BookmarksRobot.kt | 36 +++++--------------
 3 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index f5a9bd103..2d2a1fc97 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -138,7 +138,7 @@ class BookmarksTest {
             clickAddFolderButton()
             addNewFolderName(bookmarksFolderName)
             navigateUp()
-            verifyKeyboardHidden()
+            verifyKeyboardHidden(isExpectedToBeVisible = false)
             verifyBookmarkFolderIsNotCreated(bookmarksFolderName)
         }
     }
@@ -210,7 +210,7 @@ class BookmarksTest {
             ) {}
         }.openThreeDotMenu(defaultWebPage.title) {
         }.clickCopy {
-            verifyCopySnackBarText()
+            verifySnackBarText(expectedText = "URL copied")
             navigateUp()
         }
 
@@ -497,7 +497,7 @@ class BookmarksTest {
         }
 
         bookmarksMenu {
-            verifyDeleteMultipleBookmarksSnackBar()
+            verifySnackBarText(expectedText = "Bookmarks deleted")
             clickUndoDeleteButton()
             verifyBookmarkedURL(firstWebPage.url.toString())
             verifyBookmarkedURL(secondWebPage.url.toString())
@@ -515,7 +515,7 @@ class BookmarksTest {
         }
 
         bookmarksMenu {
-            verifyDeleteMultipleBookmarksSnackBar()
+            verifySnackBarText(expectedText = "Bookmarks deleted")
         }
     }
 
@@ -603,7 +603,7 @@ class BookmarksTest {
                 RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list)),
             ) {
                 longTapDesktopFolder("Desktop Bookmarks")
-                verifySelectDefaultFolderSnackBarText()
+                verifySnackBarText(expectedText = "Can’t edit default folders")
             }
         }
     }
@@ -626,7 +626,7 @@ class BookmarksTest {
             cancelDeletion()
             clickDeleteInEditModeButton()
             confirmDeletion()
-            verifyDeleteSnackBarText()
+            verifySnackBarText(expectedText = "Deleted")
             verifyBookmarkIsDeleted("Test_Page_1")
         }
     }
@@ -787,13 +787,13 @@ class BookmarksTest {
         }.openThreeDotMenu("My Folder") {
         }.clickDelete {
             confirmDeletion()
-            verifyDeleteSnackBarText()
+            verifySnackBarText(expectedText = "Deleted")
             clickUndoDeleteButton()
             verifyFolderTitle("My Folder")
         }.openThreeDotMenu("My Folder") {
         }.clickDelete {
             confirmDeletion()
-            verifyDeleteSnackBarText()
+            verifySnackBarText(expectedText = "Deleted")
             verifyBookmarkIsDeleted("My Folder")
             verifyBookmarkIsDeleted("My Folder 2")
             verifyBookmarkIsDeleted("Test_Page_1")
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeBookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeBookmarksTest.kt
index dbfd9afda..26d31d920 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeBookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeBookmarksTest.kt
@@ -28,6 +28,7 @@ import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.ui.robots.bookmarksMenu
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -111,7 +112,7 @@ class ComposeBookmarksTest {
             clickAddFolderButton()
             addNewFolderName(bookmarksFolderName)
             navigateUp()
-            verifyKeyboardHidden()
+            verifyKeyboardHidden(isExpectedToBeVisible = false)
             verifyBookmarkFolderIsNotCreated(bookmarksFolderName)
         }
     }
@@ -183,7 +184,7 @@ class ComposeBookmarksTest {
             ) {}
         }.openThreeDotMenu(defaultWebPage.title) {
         }.clickCopy {
-            verifyCopySnackBarText()
+            verifySnackBarText(expectedText = "URL copied")
             navigateUp()
         }
 
@@ -469,7 +470,7 @@ class ComposeBookmarksTest {
         }
 
         bookmarksMenu {
-            verifyDeleteMultipleBookmarksSnackBar()
+            verifySnackBarText(expectedText = "Bookmarks deleted")
             clickUndoDeleteButton()
             verifyBookmarkedURL(firstWebPage.url.toString())
             verifyBookmarkedURL(secondWebPage.url.toString())
@@ -487,7 +488,7 @@ class ComposeBookmarksTest {
         }
 
         bookmarksMenu {
-            verifyDeleteMultipleBookmarksSnackBar()
+            verifySnackBarText(expectedText = "Bookmarks deleted")
         }
     }
 
@@ -575,7 +576,7 @@ class ComposeBookmarksTest {
                 RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list)),
             ) {
                 longTapDesktopFolder("Desktop Bookmarks")
-                verifySelectDefaultFolderSnackBarText()
+                verifySnackBarText(expectedText = "Can’t edit default folders")
             }
         }
     }
@@ -598,7 +599,7 @@ class ComposeBookmarksTest {
             cancelDeletion()
             clickDeleteInEditModeButton()
             confirmDeletion()
-            verifyDeleteSnackBarText()
+            verifySnackBarText(expectedText = "Deleted")
             verifyBookmarkIsDeleted("Test_Page_1")
         }
     }
@@ -764,13 +765,13 @@ class ComposeBookmarksTest {
         }.openThreeDotMenu("My Folder") {
         }.clickDelete {
             confirmDeletion()
-            verifyDeleteSnackBarText()
+            verifySnackBarText(expectedText = "Deleted")
             clickUndoDeleteButton()
             verifyFolderTitle("My Folder")
         }.openThreeDotMenu("My Folder") {
         }.clickDelete {
             confirmDeletion()
-            verifyDeleteSnackBarText()
+            verifySnackBarText(expectedText = "Deleted")
             verifyBookmarkIsDeleted("My Folder")
             verifyBookmarkIsDeleted("My Folder 2")
             verifyBookmarkIsDeleted("Test_Page_1")
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
index a8a143ae6..0176f326c 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
@@ -79,8 +79,6 @@ class BookmarksRobot {
         Log.i(TAG, "verifyCloseButton: Verified close bookmarks section button is visible")
     }
 
-    fun verifyDeleteMultipleBookmarksSnackBar() = assertSnackBarText("Bookmarks deleted")
-
     fun verifyBookmarkFavicon(forUrl: Uri) {
         bookmarkFavicon(forUrl.toString()).check(
             matches(
@@ -137,8 +135,6 @@ class BookmarksRobot {
         )
     }
 
-    fun verifyDeleteSnackBarText() = assertSnackBarText("Deleted")
-
     fun verifyUndoDeleteSnackBarButton() {
         snackBarUndoButton().check(matches(withText("UNDO")))
         Log.i(TAG, "verifyUndoDeleteSnackBarButton: Verified bookmark deletion undo snack bar button")
@@ -154,8 +150,6 @@ class BookmarksRobot {
         Log.i(TAG, "verifySnackBarHidden: Verified bookmark snack bar does not exist")
     }
 
-    fun verifyCopySnackBarText() = assertSnackBarText("URL copied")
-
     fun verifyEditBookmarksView() =
         assertUIObjectExists(
             itemWithDescription("Navigate up"),
@@ -167,7 +161,15 @@ class BookmarksRobot {
             itemWithResId("$packageName:id/bookmarkParentFolderSelector"),
         )
 
-    fun verifyKeyboardHidden() = assertKeyboardVisibility(isExpectedToBeVisible = false)
+    fun verifyKeyboardHidden(isExpectedToBeVisible: Boolean) {
+        assertEquals(
+            isExpectedToBeVisible,
+            mDevice
+                .executeShellCommand("dumpsys input_method | grep mInputShown")
+                .contains("mInputShown=true"),
+        )
+        Log.i(TAG, "assertKeyboardVisibility: Verified that the keyboard is visible: $isExpectedToBeVisible")
+    }
 
     fun verifyShareOverlay() {
         onView(withId(R.id.shareWrapper)).check(matches(isDisplayed()))
@@ -189,8 +191,6 @@ class BookmarksRobot {
         Log.i(TAG, "verifyShareBookmarkUrl: Verified shared bookmarks url is displayed")
     }
 
-    fun verifySelectDefaultFolderSnackBarText() = assertSnackBarText("Can’t edit default folders")
-
     fun verifyCurrentFolderTitle(title: String) {
         Log.i(TAG, "verifyCurrentFolderTitle: Looking for bookmark with title: $title")
         mDevice.findObject(
@@ -468,21 +468,3 @@ private fun saveBookmarkButton() = onView(withId(R.id.save_bookmark_button))
 private fun deleteInEditModeButton() = onView(withId(R.id.delete_bookmark_button))
 
 private fun syncSignInButton() = onView(withId(R.id.bookmark_folders_sign_in))
-
-private fun assertEmptyBookmarksList() =
-    onView(withId(R.id.bookmarks_empty_view)).check(matches(withText("No bookmarks here")))
-
-private fun assertSnackBarText(text: String) {
-    snackBarText().check(matches(withText(containsString(text))))
-    Log.i(TAG, "assertSnackBarText: Verified $text snack bar")
-}
-
-private fun assertKeyboardVisibility(isExpectedToBeVisible: Boolean) {
-    assertEquals(
-        isExpectedToBeVisible,
-        mDevice
-            .executeShellCommand("dumpsys input_method | grep mInputShown")
-            .contains("mInputShown=true"),
-    )
-    Log.i(TAG, "assertKeyboardVisibility: Verified that the keyboard is visible: $isExpectedToBeVisible")
-}

From 94825c0ffa3c83979f22326486d9433413991bcd Mon Sep 17 00:00:00 2001
From: JohanLorenzo <JohanLorenzo@users.noreply.github.com>
Date: Thu, 1 Feb 2024 19:32:05 +0000
Subject: [PATCH 078/222] Update Fenix initial_experiments.json based on the
 current first-run experiments in experimenter

---
 app/src/main/res/raw/initial_experiments.json | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/app/src/main/res/raw/initial_experiments.json b/app/src/main/res/raw/initial_experiments.json
index 8543827c6..9369f46a4 100644
--- a/app/src/main/res/raw/initial_experiments.json
+++ b/app/src/main/res/raw/initial_experiments.json
@@ -128,6 +128,99 @@
       "locales": null,
       "publishedDate": "2024-01-25T17:36:03.153458Z"
     },
+    {
+      "schemaVersion": "1.12.0",
+      "slug": "android-long-term-holdback-validation-first-run-sub-experiment",
+      "id": "android-long-term-holdback-validation-first-run-sub-experiment",
+      "arguments": {},
+      "application": "org.mozilla.firefox_beta",
+      "appName": "fenix",
+      "appId": "org.mozilla.firefox_beta",
+      "channel": "beta",
+      "userFacingName": "Android Long-term Holdback Validation - First-run Sub-Experiment",
+      "userFacingDescription": "This is an internal test of new experiment tooling",
+      "isEnrollmentPaused": false,
+      "isRollout": false,
+      "bucketConfig": {
+        "randomizationUnit": "nimbus_id",
+        "namespace": "fenix-nimbus-is-ready-beta-1",
+        "start": 0,
+        "count": 10000,
+        "total": 10000
+      },
+      "featureIds": [
+        "nimbus-is-ready"
+      ],
+      "probeSets": [],
+      "outcomes": [],
+      "branches": [
+        {
+          "slug": "control",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "nimbus-is-ready",
+              "enabled": true,
+              "value": {
+                "event-count": 2
+              }
+            }
+          ]
+        },
+        {
+          "slug": "treatment-a",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "nimbus-is-ready",
+              "enabled": true,
+              "value": {
+                "event-count": 5
+              }
+            }
+          ]
+        },
+        {
+          "slug": "treatment-b",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "nimbus-is-ready",
+              "enabled": true,
+              "value": {
+                "event-count": 10
+              }
+            }
+          ]
+        }
+      ],
+      "targeting": "((is_already_enrolled) || ((isFirstRun == 'true') && (app_version|versionCompare('123.!') >= 0) && (enrollments_map['android-long-term-holdback-validation'] == 'delivery')))",
+      "startDate": "2024-02-01",
+      "enrollmentEndDate": null,
+      "endDate": null,
+      "proposedDuration": 28,
+      "proposedEnrollment": 7,
+      "referenceBranch": "control",
+      "featureValidationOptOut": false,
+      "localizations": null,
+      "locales": null,
+      "publishedDate": "2024-02-01T19:06:38.368231Z"
+    },
     {
       "schemaVersion": "1.12.0",
       "slug": "beta-fx-122-android-set-to-default-notifications-timing-experiment",

From 5bc720897094edb4aa986f0cfb534e71ac4043e1 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Fri, 2 Feb 2024 00:03:25 +0000
Subject: [PATCH 079/222] Import translations from android-l10n

---
 app/src/main/res/values-ca/strings.xml     | 358 ++++++++++++++-------
 app/src/main/res/values-cy/strings.xml     |   6 +-
 app/src/main/res/values-el/strings.xml     |  64 ++--
 app/src/main/res/values-es-rCL/strings.xml |  61 +---
 app/src/main/res/values-oc/strings.xml     |  12 +-
 app/src/main/res/values-pa-rIN/strings.xml | 141 +++++---
 app/src/main/res/values-zh-rCN/strings.xml | 101 +++++-
 app/src/main/res/values-zh-rTW/strings.xml |  18 +-
 8 files changed, 496 insertions(+), 265 deletions(-)

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index faff726e0..f7c504166 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -68,11 +68,6 @@
     <!-- True Private Browsing Mode -->
     <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
     <string name="felt_privacy_desc_card_title">No deixeu rastre en aquest dispositiu</string>
-    <!-- Explanation for private browsing displayed to users on home view when they first enable
-        private mode in our new Total Private Browsing mode.
-        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
-        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
-    <string name="felt_privacy_info_card_subtitle" moz:removedIn="120" tools:ignore="UnusedResources">El %1$s suprimeix les galetes, l’historial i les dades dels llocs en tancar totes les finestres privades. %2$s</string>
     <!-- Explanation for private browsing displayed to users on home view when they first enable
         private mode in our new Total Private Browsing mode.
         The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
@@ -216,6 +211,8 @@
     <string name="resync_button_content_description">Resincronitza</string>
     <!-- Browser menu button that opens the find in page menu -->
     <string name="browser_menu_find_in_page">Cerca a la pàgina</string>
+    <!-- Browser menu button that opens the translations dialog, which has options to translate the current browser page. -->
+    <string name="browser_menu_translations">Tradueix la pàgina</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">Desa a la col·lecció</string>
     <!-- Browser menu button that open a share menu to share the current site -->
@@ -246,6 +243,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalitza la pàgina d’inici</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Pantalla d’inici</string>
@@ -253,6 +251,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Esborra l’historial de navegació</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Tradueix la pàgina</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Llengua seleccionada</string>
@@ -264,8 +265,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Escaneja</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Motor de cerca</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Paràmetres del motor de cerca</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -321,40 +320,33 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Les notificacions us ajuden a fer més coses amb el %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Les notificacions us ajuden a fer més coses amb el %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sincronitzeu les vostres pestanyes entre dispositius, gestioneu les baixades, obteniu consells per treure el màxim profit de la protecció de privadesa del %s i molt més.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sincronitzeu les vostres pestanyes entre dispositius, gestioneu les baixades, obteniu consells per treure el màxim profit de la protecció de privadesa del %s i molt més.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Continua</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Continua</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ara no</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ara no</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-        Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_title_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Feu que el Firefox sigui el vostre navegador per defecte</string>
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Avís de privadesa del Firefox</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Ens encanta mantenir-vos segur</string>
-    <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-        Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_description_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">El Firefox prioritza les persones sobre els beneficis i defensa la vostra privadesa blocant els elements de seguiment entre llocs.\n\nTrobareu més informació en l’avís de privadesa.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">El nostre navegador sense ànim de lucre ajuda a evitar que les empreses us segueixin en secret al web.\n\nObteniu més informació al nostre avís de privadesa.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">El nostre navegador sense ànim de lucre ajuda a evitar que les empreses us segueixin en secret al web.\n\nObteniu més informació al nostre avís de privadesa.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">avís de privadesa</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">avís de privadesa</string>
 
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Defineix com a navegador per defecte</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_default_browser_negative_button" tools:ignore="UnusedResources">Ara no</string>
     <!-- Title for sign in to sync screen. -->
-    <string name="juno_onboarding_sign_in_title" moz:removedIn="120" tools:ignore="UnusedResources">Salteu del telèfon al portàtil, i viceversa</string>
-    <!-- Title for sign in to sync screen. -->
     <string name="juno_onboarding_sign_in_title_2">Manteniu el xifrat quan passeu d\'un aparell a un altre</string>
-    <!-- Description for sign in to sync screen. -->
-    <string name="juno_onboarding_sign_in_description" moz:removedIn="120" tools:ignore="UnusedResources">Recupereu les pestanyes i les contrasenyes dels altres dispositius per continuar des d’on ho havíeu deixat.</string>
     <!-- Description for sign in to sync screen. Nimbus experiments do not support string placeholders.
      Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_sign_in_description_2">Si teniu la sessió iniciada i sincronitzada, esteu més segur. Firefox xifra les contrasenyes, els marcadors i molt més.</string>
@@ -362,15 +354,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Inicia la sessió</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ara no</string>
-    <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-        Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_enable_notifications_title_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Les notificacions us ajuden a fer més coses amb el Firefox</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus_2">Les notificacions us ajuden a estar més segur amb el Firefox</string>
-    <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-       Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_enable_notifications_description_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Envieu pestanyes entre dispositius, gestioneu les baixades i obteniu consells per a treure el màxim profit del Firefox.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_description_nimbus_2">Envieu pestanyes de manera segura entre els vostres dispositius i descobriu altres funcions de privadesa al Firefox.</string>
@@ -412,8 +398,6 @@
     <!-- Preference category for settings related to changing the default search engine -->
     <string name="preferences_category_select_default_search_engine">Trieu-ne un</string>
     <!-- Preference for settings related to managing search shortcuts for the quick search menu -->
-    <string name="preferences_manage_search_shortcuts" moz:removedIn="120" tools:ignore="UnusedResources">Gestioneu les dreceres de cerca</string>
-    <!-- Preference for settings related to managing search shortcuts for the quick search menu -->
     <string name="preferences_manage_search_shortcuts_2">Gestiona els motors de cerca alternatius</string>
     <!-- Summary for preference for settings related to managing search shortcuts for the quick search menu -->
     <string name="preferences_manage_search_shortcuts_summary">Editeu els motors visibles al menú de cerca</string>
@@ -427,8 +411,6 @@
     <string name="preferences_search_engines">Motors de cerca</string>
     <!-- Preference for settings related to Search engines suggestions-->
     <string name="preferences_search_engines_suggestions">Suggeriments dels motors de cerca</string>
-    <!-- Preference for settings related to Search address bar -->
-    <string name="preferences_search_address_bar" moz:removedIn="120" tools:ignore="UnusedResources">Barra d’adreces</string>
 
 
     <!-- Preference Category for settings related to Search address bar -->
@@ -463,21 +445,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Mode només HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducció de bàners de galetes</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blocador de bàners de galetes</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blocador de bàners de galetes en la navegació privada</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Redueix els bàners de galetes</string>
-
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Desactivada</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Activada</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">El %1$s intenta rebutjar automàticament les sol·licituds de galetes que es mostren com a bàners de galetes.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Desactivada en aquest lloc</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -495,35 +467,15 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Aquest lloc no és compatible ara per ara</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Voleu activar la reducció de bàners de galetes per a %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Voleu activar el blocador de bàners de galetes per a %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Voleu desactivar la reducció de bàners de galetes per a %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Voleu desactivar el blocador de bàners de galetes per a %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">El %1$s no pot rebutjar automàticament les sol·licituds de galetes d’aquest lloc. Podeu enviar una sol·licitud per a fer que aquest lloc sigui compatible en el futur.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">El %1$s esborrarà les galetes d’aquest lloc i actualitzarà la pàgina. En esborrar totes les galetes, pot ser que se us tanquin les sessions o que se us buidin els carros de la compra.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Si el desactiveu, el %1$s esborrarà les galetes i tornarà a carregar aquest lloc. Això pot fer que se us tanquin les sessions o que se us buidin els carros de la compra.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">El %1$s intenta rebutjar automàticament totes les sol·licituds de galetes de tots els llocs compatibles.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Si l\'activeu, el %1$s intentarà rebutjar automàticament tots els bàners de galetes d\'aquest lloc.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Voleu el %1$s rebutgi els bàners de galetes?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">El %1$s pot rebutjar automàticament moltes sol·licituds de bàners de galetes.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ara no</string>
-
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Veureu menys sol·licituds de galetes</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Permet</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">El %1$s ha rebutjat les galetes</string>
@@ -552,14 +504,10 @@
     <string name="errorpage_httpsonly_message_summary">Tanmateix, també és possible que hi hagi implicat un atacant. Si seguiu en el lloc web, no hi introduïu cap informació confidencial. Si continueu, el mode només HTTPS es desactivarà temporalment per al lloc.</string>
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accessibilitat</string>
-    <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidor de comptes del Firefox personalitzat</string>
     <!-- Preference to override the Mozilla account server -->
     <string name="preferences_override_account_server">Servidor de comptes de Mozilla personalitzat</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Servidor del Sync personalitzat</string>
-    <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">S’ha modificat el servidor de comptes del Firefox o del Sync. L’aplicació es tancarà per aplicar els canvis…</string>
     <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
     <string name="toast_override_account_sync_server_done">S’ha modificat el servidor de comptes de Mozilla o del Sync. L’aplicació es tancarà per aplicar els canvis…</string>
     <!-- Preference category for account information -->
@@ -577,8 +525,6 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Inicieu la sessió per sincronitzar pestanyes, adreces d’interès, contrasenyes i més.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Compte del Firefox</string>
-    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
     <string name="preferences_account_default_name_2">Compte de Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Torneu-vos a connectar per reprendre la sincronització</string>
@@ -590,8 +536,6 @@
     <string name="preferences_data_collection">Recollida de dades</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Depuració remota per USB</string>
-    <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Mostra els motors de cerca</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mostra suggeriments de cerca</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -722,12 +666,6 @@
     <!-- Button text of the Nimbus message for add-ons general availability. -->
     <string name="addon_ga_message_button" tools:ignore="UnusedResources">Explora els complements</string>
 
-    <!-- Add-on Installation from AMO-->
-    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">El complement no és compatible</string>
-    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">El complement ja està instal·lat</string>
-
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
     <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Els complements s’han desactivat temporalment</string>
@@ -754,6 +692,8 @@
     <string name="preferences_sync_bookmarks">Adreces d’interès</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Inicis de sessió</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Contrasenyes</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Pestanyes obertes</string>
     <!-- Preference for signing out -->
@@ -780,6 +720,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Targetes de crèdit</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Formes de pagament</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adreces</string>
 
@@ -1316,8 +1258,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Descarta</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">No s’ha pogut imprinir</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">No s’ha pogut imprimir aquesta pàgina</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Imprimeix</string>
@@ -1362,6 +1302,10 @@
     <!-- Notifications -->
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">Tanca les pestanyes privades</string>
+
+    <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
+    <string name="notification_erase_title_android_14">Voleu tancar les pestanyes privades?</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">Màrqueting</string>
 
@@ -1602,6 +1546,8 @@
     <string name="preference_enhanced_tracking_protection_custom_cookies_4">Totes les galetes (farà que alguns llocs web no funcionin)</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
     <string name="preference_enhanced_tracking_protection_custom_cookies_5">Aïlla les galetes entre llocs</string>
+    <!-- Preference for Global Privacy Control for the custom privacy settings for Global Privacy Control. '&amp;' is replaced with the ampersand symbol: &-->
+    <string name="preference_enhanced_tracking_protection_custom_global_privacy_control">Sol·licita als llocs web que no comparteixin ni venguin les meves dades</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content">Contingut que fa seguiment</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
@@ -1717,9 +1663,13 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Inicis de sessió i contrasenyes</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Contrasenyes</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Desa els inicis de sessió i contrasenyes</string>
 
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Desa les contrasenyes</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Demana-m’ho</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1736,16 +1686,30 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Afegeix un inici de sessió</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Afegeix una contrasenya</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronitza els inicis de sessió</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronitza les contrasenyes</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sincronitza els inicis de sessió entre dispositius</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronitza les contrasenyes entre dispositius</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Inicis de sessió desats</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Contrasenyes desades</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Aquí es mostren els inicis de sessió que deseu o sincronitzeu en el %s.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Les contrasenyes que deseu o sincronitzeu amb el %s es mostraran aquí. Totes les contrasenyes que deseu estan xifrades.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Més informació sobre el Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Més informació sobre la sincronització</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Excepcions</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
@@ -1815,6 +1779,8 @@
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Targetes de crèdit</string>
 
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Formes de pagament</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Desa i emplena automàticament les targetes</string>
     <!-- Preference summary for saving and autofilling credit card data -->
@@ -1825,8 +1791,12 @@
     <string name="preferences_credit_cards_sync_cards">Sincronitza les targetes</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Afegeix una targeta de crèdit</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Afegeix una targeta</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Gestiona les targetes desades</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gestiona les targetes</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Afegeix una adreça</string>
     <!-- Preference option for managing saved addresses -->
@@ -1834,9 +1804,14 @@
 
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Desa i emplena automàticament les adreces</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Desa i emplena automàticament les adreces</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Inclou informació com números, adreces electròniques i adreces d’enviament</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Inclou números de telèfon i adreces de correu electrònic</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Afegeix una targeta</string>
     <!-- Title of the "Edit card" screen -->
@@ -1857,6 +1832,8 @@
     <string name="credit_cards_delete_card_button">Suprimeix la targeta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Segur que voleu suprimir aquesta targeta de crèdit?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Voleu suprimir la targeta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Suprimeix</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1869,8 +1846,12 @@
     <string name="credit_cards_saved_cards">Targetes desades</string>
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Introduïu un número de targeta de crèdit vàlid</string>
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Introduïu un número de targeta vàlid</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Empleneu aquest camp</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Afegiu un nom</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloqueu per veure les targetes desades</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
@@ -1923,6 +1904,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Segur que voleu suprimir aquesta adreça?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Voleu suprimir aquesta adreça?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Suprimeix</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1938,28 +1921,18 @@
     <string name="search_engine_add_custom_search_engine_button_content_description">Afegeix un motor de cerca</string>
     <!-- Title of the Edit search engine screen -->
     <string name="search_engine_edit_custom_search_engine_title">Edita el motor de cerca</string>
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
-    <string name="search_engine_add_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Afegeix</string>
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Desa</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Edita</string>
     <!-- Text for the menu button to delete a search engine -->
     <string name="search_engine_delete">Suprimeix</string>
 
-    <!-- Text for the button to create a custom search engine on the Add search engine screen -->
-    <string name="search_add_custom_engine_label_other" moz:RemovedIn="120" tools:ignore="UnusedResources">Altres</string>
     <!-- Label for the TextField in which user enters custom search engine name -->
     <string name="search_add_custom_engine_name_label">Nom</string>
-    <!-- Placeholder text shown in the Search Engine Name TextField before a user enters text -->
-    <string name="search_add_custom_engine_name_hint" moz:RemovedIn="120" tools:ignore="UnusedResources">Nom</string>
     <!-- Placeholder text shown in the Search Engine Name text field before a user enters text -->
     <string name="search_add_custom_engine_name_hint_2">Nom del motor de cerca</string>
     <!-- Label for the TextField in which user enters custom search engine URL -->
     <string name="search_add_custom_engine_url_label">URL de la cadena de cerca</string>
     <!-- Placeholder text shown in the Search String TextField before a user enters text -->
-    <string name="search_add_custom_engine_search_string_hint" moz:RemovedIn="120" tools:ignore="UnusedResources">Cadena de cerca que s’utilitzarà</string>
-    <!-- Placeholder text shown in the Search String TextField before a user enters text -->
     <string name="search_add_custom_engine_search_string_hint_2">URL s’utilitzarà per a la cerca</string>
     <!-- Description text for the Search String TextField. The %s is part of the string -->
     <string name="search_add_custom_engine_search_string_example" formatted="false">Substituïu la consulta per «%s». Per exemple:\nhttps://www.google.com/search?q=%s</string>
@@ -2038,6 +2011,8 @@
     <string name="dialog_delete_negative">Cancel·la</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Opcions d’inici de sessió</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opcions de la contrasenya</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Camp de text editable per a l’adreça web de l’inici de sessió.</string>
     <!--  The editable text field for a login's username. -->
@@ -2046,16 +2021,28 @@
     <string name="saved_login_password_description">Camp de text editable per a la contrasenya de l’inici de sessió.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Desa els canvis de l’inici de sessió.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Desa els canvis.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Edita</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Edita la contrasenya</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Afegeix un inici de sessió nou</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Afegeix una contrasenya</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Cal una contrasenya</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Escriviu una contrasenya</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Cal el nom d’usuari</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Escriviu un nom d\'usuari</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Cal el nom del servidor</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Escriviu una adreça web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Cerca per veu</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2190,8 +2177,6 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Verificador de ressenyes</string>
-    <!-- Name for the review quality check feature used as title for the panel. -->
     <string name="review_quality_check_feature_name_2">Verificador de ressenyes</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Ressenyes fiables</string>
@@ -2205,7 +2190,7 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Valoració ajustada</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description">S’han eliminat les ressenyes poc fiables</string>
+    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">S’han eliminat les ressenyes poc fiables</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Punts destacats de les ressenyes recents</string>
     <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
@@ -2217,22 +2202,16 @@
     <string name="review_quality_check_info_review_grade_header"><![CDATA[Assignem a les ressenyes de cada producte una <b>puntuació alfabètica</b> de la A a la F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Les ressenyes són fiables. Pensem que probablement són de clients reals honestos i no estan esbiaixades.</string>
-    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
-    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Creiem que les ressenyes són fiables.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Creiem que hi ha una barreja de ressenyes fiables i poc fiables.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Les ressenyes són poc fiables. Creiem que poden ser falses o esbiaixades.</string>
-    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
-    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Creiem que les ressenyes són poc fiables.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[La <b>puntuació ajustada</b> només es basa en les ressenyes que creiem fiables.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[Els <b>destacats</b> provenen de %s ressenyes dels darrers 80 dies que creiem que són fiables.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Més informació sobre %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">com %s de Mozilla determina la qualitat de la ressenya</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">com determina %s la qualitat de la ressenya</string>
     <!-- Text for title of settings section. -->
@@ -2240,8 +2219,6 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Mostra anuncis al verificador de ressenyes</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Veureu anuncis ocasionals de productes rellevants. Tots els anuncis han de complir els nostres estàndards de qualitat de revisió. %s</string>
-    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
     <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Veureu anuncis ocasionals de productes rellevants. Només anunciem productes amb ressenyes fiables. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Més informació</string>
@@ -2264,23 +2241,21 @@
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
     <string name="review_quality_check_no_reviews_warning_body">Quan aquest producte tingui més ressenyes, podrem comprovar-ne la qualitat.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
-    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">El producte no està disponible</string>
+    <string name="review_quality_check_product_availability_warning_title">El producte no està disponible</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
-    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Si veieu que torna a haver-hi estoc del producte, informeu-nos i en comprovarem les ressenyes.</string>
-    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Informa que torna a haver-hi estoc del producte</string>
+    <string name="review_quality_check_product_availability_warning_body">Si veieu que torna a haver-hi estoc del producte, informeu-nos i en comprovarem les ressenyes.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Informa que hi ha estoc del producte</string>
+    <string name="review_quality_check_product_availability_warning_action_2">Informa que hi ha estoc del producte</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title">S\'està comprovant la qualitat de la ressenya</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">S\'està comprovant la qualitat de la ressenya</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title">S\'està comprovant la qualitat de la ressenya</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">S\'està comprovant la qualitat de la ressenya</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
     <string name="review_quality_check_analysis_in_progress_warning_body">Això pot trigar uns 60 segons.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
-    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Gràcies per informar-ne!</string>
+    <string name="review_quality_check_analysis_requested_info_title">Gràcies per informar-ne!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
-    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Hauríem de tenir informació sobre les ressenyes del producte d\'aquí a 24 hores. Torneu més tard.</string>
+    <string name="review_quality_check_analysis_requested_info_body">Hauríem de tenir informació sobre les ressenyes del producte d\'aquí a 24 hores. Torneu més tard.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
     <string name="review_quality_check_not_analyzable_info_title">No podem comprovar aquestes ressenyes</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
@@ -2318,17 +2293,17 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Més informació</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="121" tools:ignore="UnusedResources">En seleccionar «Sí, prova-ho», accepteu %1$s de %2$s i %3$s de Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption">En seleccionar «Sí, prova-ho», accepteu %1$s de %2$s i %3$s de Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
-    <string name="review_quality_check_contextual_onboarding_caption_2">En seleccionar «Sí, prova-ho», accepteu les polítiques i condicions següents de %1$s:</string>
+    <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">En seleccionar «Sí, prova-ho», accepteu les polítiques i condicions següents de %1$s:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="121" tools:ignore="UnusedResources">política de privadesa</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">política de privadesa</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy_2">Política de privadesa</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Política de privadesa</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
-    <string name="review_quality_check_contextual_onboarding_terms_use" moz:RemovedIn="121" tools:ignore="UnusedResources">condicions d\'ús</string>
+    <string name="review_quality_check_contextual_onboarding_terms_use">condicions d\'ús</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
-    <string name="review_quality_check_contextual_onboarding_terms_use_2">Condicions d\'ús</string>
+    <string name="review_quality_check_contextual_onboarding_terms_use_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Condicions d\'ús</string>
     <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_primary_button_text">Sí, prova-ho</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
@@ -2364,6 +2339,9 @@
     <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
     <string name="review_quality_check_highlights_type_competitiveness">Competitivitat</string>
 
+    <!-- Text that is surrounded by quotes. The parameter is the actual text that is in quotes. An example of that text could be: Excellent craftsmanship, and that is displayed as “Excellent craftsmanship”. The text comes from a buyer's review that the feature is highlighting"   -->
+    <string name="surrounded_with_quotes">«%s»</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">reduir</string>
@@ -2381,4 +2359,152 @@
     <string name="a11y_action_label_pocket_learn_more">obrir l’enllaç i veure més informació</string>
     <!-- Content description for headings announced by accessibility service. The first parameter is the text of the heading. Talkback will announce the first parameter and then speak the word "Heading" indicating to the user that this text is a heading for a section. -->
     <string name="a11y_heading">%s, encapçalament</string>
+
+    <!-- Title for dialog displayed when trying to access links present in a text. -->
+    <string name="a11y_links_title">Enllaços</string>
+
+    <!-- Translations feature-->
+
+    <!-- Translation request dialog -->
+    <!-- Title for the translation dialog that allows a user to translate the webpage. -->
+    <string name="translations_bottom_sheet_title">Voleu traduir aquesta pàgina?</string>
+    <!-- Text that links to additional information about the Firefox translations feature. -->
+    <string name="translations_bottom_sheet_info_message_learn_more">Més informació</string>
+    <!-- Label for the dropdown to select which language to translate from on the translations dialog. Usually the translate from language selected will be the same as the page language. -->
+    <string name="translations_bottom_sheet_translate_from">Tradueix de:</string>
+    <!-- Label for the dropdown to select which language to translate to on the translations dialog. Usually the translate to language selected will be the user's preferred language. -->
+    <string name="translations_bottom_sheet_translate_to">Tradueix a:</string>
+    <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
+    <string name="translations_bottom_sheet_negative_button">Ara no</string>
+    <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
+    <string name="translations_bottom_sheet_negative_button_error">Fet</string>
+    <!-- Button text on the translations dialog to begin a translation of the website. -->
+    <string name="translations_bottom_sheet_positive_button">Tradueix</string>
+    <!-- Inactive button text on the translations dialog that indicates a translation is currently in progress. This button will be accompanied by a loading icon. -->
+    <string name="translations_bottom_sheet_translating_in_progress">S\'està traduint</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Trieu una llengua</string>
+    <!-- The title of the warning card informs the user that a translation could not be completed. -->
+    <string name="translation_error_could_not_translate_warning_text">Hi ha hagut un problema en traduir. Torneu-ho a provar.</string>
+    <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
+    <string name="translation_error_language_not_supported_learn_more">Més informació</string>
+
+    <!-- Translations options dialog -->
+    <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
+    <string name="translation_option_bottom_sheet_title">Opcions de la traducció</string>
+    <!-- Toggle switch label that allows a user to set if they would like a given language to automatically translate or not. The first parameter is the language name, for example, "Spanish". -->
+    <string name="translation_option_bottom_sheet_always_translate_in_language">Tradueix sempre %1$s</string>
+    <!-- Toggle switch label that allows a user to set if they would like to never be offered a translation of the given language. The first parameter is the language name, for example, "Spanish". -->
+    <string name="translation_option_bottom_sheet_never_translate_in_language">No tradueixis mai %1$s</string>
+    <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
+    <string name="translation_option_bottom_sheet_never_translate_site">No tradueixis mai aquest lloc</string>
+    <!-- Button text for the button that will take the user to the translation settings dialog. -->
+    <string name="translation_option_bottom_sheet_translation_settings">Paràmetres de les traduccions</string>
+    <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translation_option_bottom_sheet_about_translations">Quant a les traduccions al %1$s</string>
+
+    <!-- Translation settings dialog -->
+    <!-- Title of the translation settings dialog that allows a user to set their preferred translation settings. -->
+    <string name="translation_settings_toolbar_title">Traduccions</string>
+
+    <!-- Section header text that begins the section of a list of different options the user may select to adjust their translation preferences. -->
+    <string name="translation_settings_translation_preference">Preferències de traducció</string>
+    <!-- Button text for the button that will take the user to the automatic translations settings dialog. On the automatic translations settings dialog, the user can set if translations should occur automatically for a given language. -->
+    <string name="translation_settings_automatic_translation">Traducció automàtica</string>
+    <!-- Button text for the button that will take the user to the never translate these sites dialog. On the never translate these sites dialog, the user can set if translations should never occur on certain websites. -->
+    <string name="translation_settings_automatic_never_translate_sites">No tradueixis mai aquests llocs</string>
+
+    <!-- Button text for the button that will take the user to the download languages dialog. On the download languages dialog, the user can manage which languages they would like to download for translations. -->
+    <string name="translation_settings_download_language">Baixa les llengües</string>
+
+    <!-- Automatic translation preference screen -->
+    <!-- Title of the automatic translation preference screen that will appear on the toolbar.-->
+    <string name="automatic_translation_toolbar_title_preference">Traducció automàtica</string>
+
+    <!-- Preference option for offering to translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_offer_to_translate_summary_preference">El %1$s oferirà traduir llocs en aquesta llengua.</string>
+    <!-- Preference option for always translate. Radio button title text. -->
+    <string name="automatic_translation_option_always_translate_title_preference">Tradueix sempre</string>
+
+    <!-- Preference option for never translate. Radio button title text.-->
+    <string name="automatic_translation_option_never_translate_title_preference">No tradueixis mai</string>
+    <!-- Preference option for never translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_never_translate_summary_preference">El %1$s no oferirà mai traduir llocs en aquesta llengua.</string>
+
+    <!-- Content description (not visible, for screen readers etc.): For a never-translated site list item that is selected.
+             The first parameter is web site url (for example:"wikipedia.com") -->
+    <string name="never_translate_site_item_list_content_description_preference">Elimina %1$s</string>
+    <!-- The Delete site dialogue title will appear when the user clicks on a list item.
+             The first parameter is web site url (for example:"wikipedia.com") -->
+    <string name="never_translate_site_dialog_title_preference">Voleu suprimir %1$s?</string>
+    <!-- The Delete site dialogue positive button will appear when the user clicks on a list item. The site will be deleted. -->
+    <string name="never_translate_site_dialog_confirm_delete_preference">Suprimeix</string>
+    <!-- The Delete site dialogue negative button will appear when the user clicks on a list item. The dialog will be dismissed. -->
+    <string name="never_translate_site_dialog_cancel_preference">Cancel·la</string>
+
+    <!-- Clickable text from the screen header that links to a website. -->
+    <string name="download_languages_header_learn_more_preference">Més informació</string>
+    <!-- The subhead of the download language preference screen will appear above the pivot language. -->
+    <string name="download_languages_available_languages_preference">Llengües disponibles</string>
+    <!-- Text that will appear beside a core or pivot language package name to show that the language is necessary for the translation feature to function. -->
+    <string name="download_languages_default_system_language_require_preference">necessari</string>
+    <!-- The subhead of the download language preference screen will appear above the items that were not downloaded. -->
+    <string name="download_language_header_preference">Baixa llengües</string>
+    <!-- All languages list item. When the user presses this item, they can download or delete all languages. -->
+    <string name="download_language_all_languages_item_preference">Totes les llengües</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item that was downloaded, the user can now delete it. -->
+    <string name="download_languages_item_content_description_downloaded_state">Suprimeix</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item, downloading is in progress. -->
+    <string name="download_languages_item_content_description_in_progress_state">En curs</string>
+
+    <!-- Content description (not visible, for screen readers etc.): For a language list item that was not downloaded. -->
+    <string name="download_languages_item_content_description_not_downloaded_state">Baixa</string>
+
+    <!-- Title for the dialog used by the translations feature to confirm deleting a language.
+    The dialog will be presented when the user requests deletion of a language.
+    The first parameter is the name of the language, for example, "Spanish" and the second parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_file_dialog_title">Voleu suprimir %1$s (%2$s)?</string>
+    <!-- Title for the dialog used by the translations feature to confirm deleting all languages file.
+    The dialog will be presented when the user requests deletion of all languages file.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_all_languages_file_dialog_title">Voleu suprimir totes les llengües (%1$s)?</string>
+    <!-- Button text on the dialog used by the translations feature to confirm deleting a language. -->
+    <string name="delete_language_file_dialog_positive_button_text">Suprimeix</string>
+    <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
+    <string name="delete_language_file_dialog_negative_button_text">Cancel·la</string>
+
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
+    <string name="download_language_file_dialog_positive_button_text">Baixa</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file and perform a translation. -->
+    <string name="download_language_file_dialog_positive_button_text_all_languages">Baixa i tradueix</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
+    <string name="download_language_file_dialog_negative_button_text">Cancel·la</string>
+
+    <!-- Debug drawer -->
+    <!-- The user-facing title of the Debug Drawer feature. -->
+    <string name="debug_drawer_title">Eines de depuració</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate back within the debug drawer. -->
+    <string name="debug_drawer_back_button_content_description">Vés enrere</string>
+    <!-- The title of the Tab Tools feature in the Debug Drawer. -->
+    <string name="debug_drawer_tab_tools_title">Eines de pestanyes</string>
+    <!-- The title of the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_title">Recompte de pestanyes</string>
+    <!-- The active tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_normal">Actives</string>
+    <!-- The inactive tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_inactive">Inactives</string>
+    <!-- The private tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_private">Privades</string>
+    <!-- The total tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_total">Total</string>
+    <!-- The title of the tab creation tool section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_title">Eina de creació de pestanyes</string>
+    <!-- The label of the text field in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_text_field_label">Nombre de pestanyes a crear</string>
+    <!-- The button text to add tabs to the active tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_active">Afegeix a les pestanyes actives</string>
+    <!-- The button text to add tabs to the inactive tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_inactive">Afegeix a les pestanyes inactives</string>
+    <!-- The button text to add tabs to the private tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_private">Afegeix a les pestanyes privades</string>
 </resources>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 4f1c27f9c..37ff8d461 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -1878,7 +1878,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Gosodwch batrwm cloi dyfais, PIN, neu gyfrinair i ddiogelu eich mewngofnodion a’ch cyfrineiriau sydd wedi’u cadw rhag i rhywun arall sydd â mynediad i’ch dyfais.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Sefydlwch batrwm clo dyfais, PIN, neu gyfrinair i amddiffyn eich dulliau talu a arbedwyd rhag cael mynediad iddynt os oes gan rywun arall eich dyfais.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Gosodwch batrwm clo dyfais, PIN, neu gyfrinair i ddiogelu eich dulliau talu rhag i rywun arall sydd â\'ch dyfais gael mynediad iddyn nhw.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Gosod nawr</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2041,11 +2041,11 @@
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Maes testun golygadwy cyfeiriad gwe’r mewngofnodi.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Y maes testun y gellir ei olygu ar gyfer cyfeiriad y wefan.</string>
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Maes testun golygadwy y wefan.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Maes testun golygadwy enw defnyddiwr y mewngofnodi.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Y maes testun y gellir ei olygu ar gyfer yr enw defnyddiwr.</string>
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Maes testun golygadwy yr enw defnyddiwr.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Maes testun golygadwy cyfrinair y mewngofnodi.</string>
     <!--  The editable text field for a login's password. -->
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 4cc2310fa..7f8b4eb65 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -249,6 +249,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Προσαρμογή αρχικής σελίδας</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Αρχική οθόνη</string>
@@ -256,6 +257,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Διαγραφή ιστορικού περιήγησης</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Μετάφραση σελίδας</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Επιλεγμένη γλώσσα</string>
@@ -268,8 +272,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Σάρωση</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Μηχανή αναζήτησης</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Ρυθμίσεις μηχανής αναζήτησης</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -324,14 +326,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Οι ειδοποιήσεις σάς βοηθούν να κάνετε περισσότερα με το %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Οι ειδοποιήσεις σάς βοηθούν να κάνετε περισσότερα με το %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Συγχρονίστε τις καρτέλες σας με τις συσκευές σας, διαχειριστείτε λήψεις, λάβετε συμβουλές για την αξιοποίηση της προστασίας απορρήτου του %s στο έπακρο και πολλά άλλα.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Συγχρονίστε τις καρτέλες σας με τις συσκευές σας, διαχειριστείτε λήψεις, λάβετε συμβουλές για την αξιοποίηση της προστασίας απορρήτου του %s στο έπακρο και πολλά άλλα.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Συνέχεια</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Συνέχεια</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Όχι τώρα</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Όχι τώρα</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -449,21 +451,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Λειτουργία «Μόνο HTTPS»</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Μείωση μηνυμάτων για cookie</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Αποκλεισμός μηνυμάτων για cookie</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Αποκλεισμός μηνυμάτων για cookie σε ιδιωτική περιήγηση</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Μείωση μηνυμάτων για cookie</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Ανενεργή</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Ενεργή</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">Το %1$s προσπαθεί να απορρίπτει αυτόματα τα μηνύματα αιτημάτων για cookie.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Ανενεργή για αυτόν τον ιστότοπο</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -481,36 +473,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Ο ιστότοπος δεν υποστηρίζεται</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Ενεργοποίηση μείωσης μηνυμάτων για cookie στο %1$s;</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Ενεργοποίηση αποκλεισμού μηνυμάτων για cookie για το %1$s;</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Απενεργοποίηση μείωσης μηνυμάτων για cookie στο %1$s;</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Απενεργοποίηση αποκλεισμού μηνυμάτων για cookie για το %1$s;</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">Το %1$s δεν μπορεί να απορρίψει αυτόματα τα αιτήματα για cookie σε αυτόν τον ιστότοπο. Μπορείτε να στείλετε ένα αίτημα για υποστήριξη αυτού του ιστοτόπου στο μέλλον.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Το %1$s θα απαλείψει τα cookie του ιστοτόπου και θα ανανεώσει τη σελίδα. Η απαλοιφή όλων των cookie ενδέχεται να σας αποσυνδέσει ή να αδειάσει τα καλάθια αγορών.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Απενεργοποιήστε το και το %1$s θα διαγράψει τα cookie και θα φορτώσει ξανά αυτόν τον ιστότοπο. Μπορεί να αποσυνδεθείτε ή να αδειάσουν τα καλάθια αγορών σας.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">Το %1$s προσπαθεί να απορρίψει αυτόματα όλα τα αιτήματα για cookie σε υποστηριζόμενους ιστοτόπους.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Ενεργοποιήστε το και το %1$s θα προσπαθεί να απορρίπτει αυτόματα όλα τα μηνύματα για cookie σε αυτόν τον ιστότοπο.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Να επιτρέπεται στο %1$s η απόρριψη μηνυμάτων για cookie;</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">Το %1$s μπορεί να απορρίπτει αυτόματα πολλά μηνύματα αιτημάτων για cookie.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Όχι τώρα</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Θα βλέπετε λιγότερα αιτήματα για cookie</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Αποδοχή</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">Το %1$s μόλις αρνήθηκε τα cookie για εσάς</string>
@@ -1299,8 +1272,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Απόρριψη</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Αδυναμία εκτύπωσης</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Δεν είναι δυνατή η εκτύπωση αυτής της σελίδας</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Εκτύπωση</string>
@@ -1829,6 +1800,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ταξινόμηση μενού σύνδεσης</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Μενού ταξινόμησης κωδικών πρόσβασης</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Αυτόματη συμπλήρωση</string>
@@ -1926,7 +1900,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Ορίστε ένα μοτίβο κλειδώματος συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για την προστασία των αποθηκευμένων πιστωτικών καρτών σας, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Ορίστε ένα μοτίβο κλειδώματος συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για την προστασία των αποθηκευμένων καρτών σας, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Ορίστε ένα μοτίβο κλειδώματος της συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για την προστασία των αποθηκευμένων καρτών σας, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Ρύθμιση τώρα</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2091,12 +2065,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Επιλογές κωδικών πρόσβασης</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Το επεξεργάσιμο πεδίο κειμένου της διεύθυνσης ιστού της σύνδεσης.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Το επεξεργάσιμο πεδίο κειμένου της διεύθυνσης ιστοτόπου του κωδικού πρόσβασης.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Το επεξεργάσιμο πεδίο κειμένου της διεύθυνσης ιστοτόπου.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Το επεξεργάσιμο πεδίο κειμένου για το όνομα χρήστη της σύνδεσης.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Το επεξεργάσιμο πεδίο κειμένου για το όνομα χρήστη του κωδικού πρόσβασης.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Το επεξεργάσιμο πεδίο κειμένου για το όνομα χρήστη.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Το επεξεργάσιμο πεδίο κειμένου για τον κωδικό πρόσβασης της σύνδεσης.</string>
     <!--  The editable text field for a login's password. -->
@@ -2294,8 +2268,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[Τα <b>σημαντικά σημεία</b> προέρχονται από κριτικές για το %s, οι οποίες γράφτηκαν τις τελευταίες 80 ημέρες και πιστεύουμε ότι είναι αξιόπιστες.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Μάθετε περισσότερα σχετικά με το %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">πώς το %s της Mozilla προσδιορίζει την ποιότητα των κριτικών</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">πώς το %s προσδιορίζει την ποιότητα των κριτικών</string>
     <!-- Text for title of settings section. -->
@@ -2480,6 +2452,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Μετάφραση σε εξέλιξη</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Επιλέξτε μια γλώσσα</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Προέκυψε πρόβλημα με τη μετάφραση. Παρακαλούμε δοκιμάστε ξανά.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index 1d017aff4..883e691fa 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -242,6 +242,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalizar página de inicio</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Pantalla de inicio</string>
@@ -249,6 +250,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Eliminar historial de navegación</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Traducir página</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Idioma seleccionado</string>
@@ -260,8 +264,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Escanear</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Motor de búsqueda</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Ajustes del motor de búsqueda</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -316,14 +318,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Las notificaciones te ayudan a hacer más con %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Las notificaciones te ayudan a hacer más con %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sincroniza tus pestañas entre dispositivos, administra descargas, obtén consejos sobre cómo aprovechar al máximo la protección de privacidad de %s y más.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sincroniza tus pestañas entre dispositivos, administra descargas, obtén consejos sobre cómo aprovechar al máximo la protección de privacidad de %s y más.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Continuar</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Continuar</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ahora no</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ahora no</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -440,21 +442,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modo solo HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducción de anuncios de cookies</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Bloqueador de anuncios de cookies</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Bloqueador de anuncios de cookies en navegación privada</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducir los anuncios de cookies</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">No</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Sí</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s intenta rechazar automáticamente las solicitudes de cookies en los anuncios de cookies.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">DESACTIVADA para este sitio</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -472,35 +464,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Sitio actualmente no soportado</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Activar la reducción de anuncios de cookies para %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">¿Activar el bloqueo de anuncios de cookies para %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Desactivar la reducción de anuncios de cookies para %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">¿Desactivar el bloqueo de anuncios de cookies para %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s no puede rechazar automáticamente las solicitudes de cookies en este sitio. Puedes enviar una solicitud para soportar este sitio en el futuro.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s borrará las cookies de este sitio y recargará la página. Borrar todas las cookies puede cerrar tu sesión o vaciar los carritos de compras.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Desactívalo y %1$s borrará las cookies y recargará este sitio. Esto podría cerrar tu sesión o vaciar tus carritos de compras.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s intenta rechazar automáticamente todas las solicitudes de cookies en sitios soportados.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Actívalo y %1$s intentará rechazar automáticamente todos los anuncios de cookies en este sitio.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Permitir que %1$s rechace los anuncios de cookies?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s puede rechazar automáticamente muchos anuncios de cookies.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ahora no</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Verás menos solicitudes de cookies</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Permitir</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s acaba de rechazar las cookies por ti</string>
@@ -1285,8 +1258,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Ocultar</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">No se pudo imprimir</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">No se puede imprimir esta página</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Imprimir</string>
@@ -1906,7 +1877,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus tarjetas de crédito guardadas, y así no sean accedidas si alguien más tiene tu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus tarjetas guardadas, y así no sean accedidas si alguien más tiene tu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus métodos de pago guardados, y así no sean accedidos si alguien más tiene tu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2067,12 +2038,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Opciones de contraseña</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">El campo de texto editable para la dirección web de la credencial.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">El campo de texto editable para la dirección del sitio web de la contraseña.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">El campo de texto editable para la dirección del sitio web.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">El campo de texto editable para el nombre de usuario de la credencial.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario de la contraseña.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">El campo de texto editable para la contraseña de la credencial.</string>
     <!--  The editable text field for a login's password. -->
@@ -2269,8 +2240,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[Los <b>puntos destacados</b> provienen de reseñas de %s de los últimos 80 días que creemos que son confiables.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Aprender más sobre %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">cómo %s de Mozilla determina la calidad de las reseñas</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">cómo %s determina la calidad de las reseñas</string>
     <!-- Text for title of settings section. -->
@@ -2455,6 +2424,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Traducción en proceso</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Elige un idioma</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Hubo un problema al traducir. Por favor, vuelve a intentarlo.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 3220d9990..8e8f92aa1 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -243,6 +243,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalizar la pagina d’acuèlh</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Ecran d’acuèlh</string>
@@ -250,6 +251,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Netejar l’istoric de navegacion</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Traduire la pagina</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Lenga seleccionada</string>
@@ -1909,8 +1913,6 @@
     <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Securizatz los metòdes de pagament enregistrats</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configuratz un esquèma de verrolhatge, un còdi PIN o un senhal per protegir vòstres identificants de cartas de crèdit enregistrats se per cas qualqu’un accedisca a vòstre periferic.</string>
-    <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configuratz un esquèma de desverrolhatge, un còdi PIN o un senhal per protegir vòstras cartas salvadas se per cas qualqu’un accedisca a vòstre aparelh.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ara</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2075,12 +2077,8 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Opcions de senhal</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Lo camp de tèxt modificable per l’adreça web de l’identificant.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Lo camp de tèxt modificable per l’adreça web del senhal.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Lo camp de tèxt modificable pel nom d’utilizaire de l’identificant.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Lo camp de tèxt modificable pel nom d’utilizaire del senhal.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Lo camp de tèxt modificable pel senhal de l’identificant.</string>
     <!--  The editable text field for a login's password. -->
@@ -2463,6 +2461,8 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Traduccion en cors</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Causir una lenga</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">I a agut un problèma al moment de traduire. Ensajatz tornamai.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml
index d4a5a7f5d..f5c180e02 100644
--- a/app/src/main/res/values-pa-rIN/strings.xml
+++ b/app/src/main/res/values-pa-rIN/strings.xml
@@ -249,6 +249,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">ਮੁੱਖ-ਸਫ਼ੇ ਨੂੰ ਕਸਟਮਾਈਜ਼ ਕਰੋ</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">ਮੁੱਖ ਸਕਰੀਨ</string>
@@ -256,6 +257,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">ਬਰਾਊਜ਼ ਕਰਨ ਦਾ ਅਤੀਤ ਮਿਟਾਓ</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">ਸਫ਼ੇ ਦਾ ਉਲੱਥਾ ਕਰੋ</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">ਚੁਣੀ ਹੋਈ ਬੋਲੀ</string>
@@ -267,8 +271,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">ਸਕੈਨ ਕਰੋ</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">ਖੋਜ ਇੰਜਣ</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">ਖੋਜ ਇੰਜਣ ਸੈਟਿੰਗਾਂ</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -324,14 +326,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">ਨੋਟੀਫ਼ਿਕੇਸ਼ਨ ਤੁਹਾਨੂੰ %s ਨਾਲ ਹੋਰ ਕਰਨ ਦੀ ਮਦਦ ਕਰਦੇ ਹਨ</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">ਨੋਟੀਫ਼ਿਕੇਸ਼ਨ ਤੁਹਾਨੂੰ %s ਨਾਲ ਹੋਰ ਕਰਨ ਦੀ ਮਦਦ ਕਰਦੇ ਹਨ</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">ਡਿਵਾਈਸਾਂ ਵਿਚਾਲੇ ਆਪਣੀਆਂ ਟੈਬਾਂ ਨੂੰ ਸਿੰਕ ਕਰੋ, ਡਾਊਨਲੋਡ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ, %s ਦੀ ਪਰਦੇਦਾਰੀ ਸੁਰੱਖਿਆ ਦਾ ਪੂਰਾ ਫ਼ਾਇਦਾ ਲੈਣ ਲਈ ਗੁਰ ਲਵੋ ਅਤੇ ਹੋਰ</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">ਡਿਵਾਈਸਾਂ ਵਿਚਾਲੇ ਆਪਣੀਆਂ ਟੈਬਾਂ ਨੂੰ ਸਿੰਕ ਕਰੋ, ਡਾਊਨਲੋਡ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ, %s ਦੀ ਪਰਦੇਦਾਰੀ ਸੁਰੱਖਿਆ ਦਾ ਪੂਰਾ ਫ਼ਾਇਦਾ ਲੈਣ ਲਈ ਗੁਰ ਲਵੋ ਅਤੇ ਹੋਰ</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">ਜਾਰੀ ਰੱਖੋ</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">ਜਾਰੀ ਰੱਖੋ</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">ਹੁਣੇ ਨਹੀਂ</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">ਹੁਣੇ ਨਹੀਂ</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -449,22 +451,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">ਸਿਰਫ਼-HTTPS ਢੰਗ</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">ਕੂਕੀਜ਼ ਬੈਨਰ ਘਟਾਉਣਾ</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">ਕੂਕੀ ਬੈਨਰ ਰੋਕੂ</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">ਪ੍ਰਾਈਵੇਟ ਬਰਾਊਜ਼ਿੰਗ ਵਿੱਚ ਕੂਕੀ ਬੈਨਰ ਰੋਕੂ</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">ਕੂਕੀਜ਼ ਬੈਨਰ ਘਟਾਓ</string>
-
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">ਬੰਦ</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">ਚਾਲੂ</string>
 
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ਕੂਕੀ ਬੈਨਰਾਂ ਤੋਂ ਕੂਕੀ ਬੇਨਤੀਆਂ ਨੂੰ ਆਪਣੇ-ਆਪਹੀ ਰੱਦ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦਾ ਹੈ।</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">ਇਸ ਸਾਈਟ ਲਈ ਬੰਦ</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -483,36 +474,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">ਸਾਈਟ ਇਸ ਵੇਲੇ ਸਹਾਇਕ ਨਹੀਂ ਹੈ</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ਲਈ ਕੁਕੀ ਬੈਨਰ ਘਟਾਉਣੇ ਚਾਲੂ ਕਰਨੇ ਹਨ?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">ਕੀ %1$s ਲਈ ਕੂਕੀ ਬੈਨਰ ਰੋਕੂ ਚਾਲੂ ਕਰਨਾ ਹੈ?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ਲਈ ਕੁਕੀ ਬੈਨਰ ਘਟਾਉਣੇ ਬੰਦ ਕਰਨੇ ਹਨ?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">ਕੀ %1$s ਲਈ ਕੂਕੀ ਬੈਨਰ ਰੋਕੂ ਬੰਦ ਕਰਨਾ ਹੈ?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s ਇਸ ਸਾਈਟ ਲਈ ਆਪਣੇ-ਆਪ ਕੂਕੀ ਬੇਨਤੀਆਂ ਨੂੰ ਰੱਦ ਨਹੀਂ ਕਰ ਸਕਦਾ ਹੈ। ਤੁਸੀਂ ਭਵਿੱਖ ਵਿੱਚ ਇਸ ਸਾਈਟ ਵਾਸਤੇ ਸਹਾਇਤਾ ਲਈ ਬੇਨਤੀ ਕਰ ਸਕਦੇ ਹੋ।</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ਇਸ ਸਾਈਟ ਦੀਆਂ ਕੁਕੀਆਂ ਨੂੰ ਸਾਫ਼ ਕਰ ਕੇ ਵਰਕੇ ਨੂੰ ਸੱਜਰਾ ਕਰ ਦੇਵੇਗਾ। ਸਾਰੀਆਂ ਕੁਕੀਆਂ ਨੂੰ ਸਾਫ਼ ਕਰਨ ਨਾਲ ਤੁਸੀਂ ਸਾਈਨ ਆਊਟ ਹੋ ਸਕਦੇ ਹੋ ਜਾਂ ਖਰੀਦਦਾਰੀ ਵਾਲੀ ਟੋਕਰੀ ਖਾਲੀ ਹੋ ਸਕਦੀ ਹੈ।</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">ਬੰਦ ਕਰਨ ਨਾਲ %1$s ਇਸ ਸਾਈਟ ਲਈ ਕੂਕੀਜ਼ ਮਿਟਾ ਕੇ ਇਸ ਨੂੰ ਮੁੜ ਲੋਡ ਕਰੇਗਾ। ਇਹ ਤੁਹਾਨੂੰ ਸਾਈਟ ਆਉਟ ਜਾਂ ਤੁਹਾਡੀ ਖਰੀਦਦਾਰੀ ਕਾਰਟਾਂ ਨੂੰ ਖਾਲੀ ਕਰੇਗਾ।</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ਸਹਾਇਤਾ ਪ੍ਰਾਪਤ ਸਾਈਟਾਂ ਉੱਤੇ ਸਾਰੀਆਂ ਕੂਕੀ ਬੇਨਤੀਆਂ ਨੂੰ ਆਪਣੇ-ਆਪ ਰੱਦ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦਾ ਹੈ।</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">ਚਾਲੂ ਕਰੋ ਅਤੇ %1$s ਇਸ ਸਾਈਟ ਵਾਸਤੇ ਕੂਕੀ ਬੈਨਰ ਨੂੰ ਆਪਣੇ-ਆਪ ਇਨਕਾਰ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੇਗਾ।</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ਨੂੰ ਕੂਕੀ ਬੈਨਰ ਰੱਦ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦੇਣੀ ਹੈ?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s ਕੂਕੀ ਬੇਨਤੀਆਂ ਨੂੰ ਆਪਣੇ-ਆਪ ਹੀ ਰੱਦ ਕਰ ਸਕਦਾ ਹੈ।</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">ਹੁਣੇ ਨਹੀਂ</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">ਤੁਸੀਂ ਬਹੁਤ ਘੱਟ ਕੂਕੀ ਬੇਨਤੀਆਂ ਵੇਖੋਗੇ</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">ਮਨਜ਼ੂਰ</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s ਨੇ ਹੁਣੇ ਤੁਹਾਡੇ ਲਈ ਕੂਕੀਜ਼ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ ਹੈ</string>
@@ -732,6 +704,8 @@
     <string name="preferences_sync_bookmarks">ਬੁੱਕਮਾਰਕ</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">ਲਾਗਇਨ</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">ਟੈਬਾਂ ਖੋਲ੍ਹੋ</string>
     <!-- Preference for signing out -->
@@ -759,6 +733,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">ਕਰੈਡਿਟ ਕਾਰਡ</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">ਭੁਗਤਾਨ ਦੇ ਢੰਗ</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">ਸਿਰਨਾਵੇਂ</string>
 
@@ -1303,8 +1279,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">ਖ਼ਾਰਜ ਕਰੋ</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">ਛਾਪਣ ਲਈ ਅਸਮਰੱਥ ਹੈ</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">ਇਹ ਸਫ਼ਾ ਛਾਪਣ ਲਈ ਅਸਮਰੱਥ ਹੈ</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">ਪਰਿੰਟ ਕਰੋ</string>
@@ -1712,8 +1686,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡ</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡ ਸੰਭਾਲੋ</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡਾਂ ਨੂੰ ਸੰਭਾਲੋ</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save"> ਸੰਭਾਲਣ ਲਈ ਪੁੱਛੋ</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1730,26 +1708,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">ਲਾਗਇਨ ਜੋੜੋ</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਜੋੜੋ</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">ਲਾਗਇਨ ਸਿੰਕ ਕਰੋ</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਸਿੰਕ ਕਰੋ</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">ਡਿਵਾਈਸਾਂ ਵਿਚਾਲੇ ਲਾਗਇਨਾਂ ਨੂੰ ਸਿੰਕ ਕਰੋ</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਡਿਵਾਈਸਾਂ ਵਿਚਾਲੇ ਸਿੰਕ ਕਰੋ</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">ਸੰਭਾਲੇ ਹੋਏ ਲਾਗਇਨ</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡ</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">ਤੁਹਾਡੇ ਵਲੋਂ ਸੰਭਾਲੇ ਲਾਗਇਨ ਜਾਂ %s ਨਾਲ ਸਿੰਕ ਕੀਤੇ ਇੱਥੇ ਵੇਖਾਏ ਜਾਣਗੇ।</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">ਤੁਹਾਡੇ ਵਲੋਂ %s ਵਿੱਚ ਸੰਭਾਲੇ ਜਾਂ ਸਿੰਕ ਕੀਤੇ ਪਾਸਵਰਡਾਂ ਨੂੰ ਇੱਥੇ ਦਿਖਾਇਆ ਜਾਵੇਗਾ। ਤੁਹਾਡੇ ਸਾਰੇ ਸੰਭਾਲੇ ਪਾਸਵਰਡ ਇੰਕ੍ਰਿਪਟ ਕੀਤੇ ਹੁੰਦੇ ਹਨ।</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">ਸਿੰਕ ਬਾਰੇ ਹੋਰ ਜਾਣੋ।</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">ਸਿੰਕ ਬਾਰੇ ਹੋਰ ਜਾਣੋ</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">ਛੋਟਾਂ</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">ਨਾ ਸੰਭਾਲੇ ਹੋਏ ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡਾਂ ਨੂੰ ਇੱਥੇ ਸੰਭਾਲਿਆ ਜਾਵੇਗਾ।</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s ਇੱਥੇ ਦਿੱਤੀਆਂ ਹੋਈਆਂ ਸਾਈਟਾਂ ਲਈ ਪਾਸਵਰਡ ਨਹੀਂ ਸੰਭਾਲੇਗਾ।</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">ਇਹਨਾਂ ਸਾਈਟਾਂ ਲਈ ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡ ਨਹੀਂ ਸੰਭਾਲੇ ਜਾਣਗੇ।</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s ਇਹਨਾਂ ਸਾਈਟਾਂ ਲਈ ਪਾਸਵਰਡ ਨਹੀਂ ਸੰਭਾਲੇਗਾ।</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">ਸਾਰੀਆਂ ਛੋਟਾਂ ਹਟਾ ਦਿਓ</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">ਲਾਗਇਨ ਖੋਜੋ</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਖੋਜੋ</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">ਸਾਈਟ</string>
     <!-- The header for the username for a login -->
@@ -1778,10 +1775,16 @@
     <string name="saved_login_hide_password">ਪਾਸਵਰਡ ਲੁਕਾਓ</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">ਆਪਣੇ ਸੰਭਾਲੇ ਲਾਗਇਨ ਵੇਖਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡ ਵੇਖਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">ਆਪਣੇ ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡ ਸੁਰੱਖਿਅਤ ਕਰੋ</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡਾਂ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰੋ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">ਆਪਣੇ ਲਾਗਇਨਾਂ ਅਤੇ ਪਾਸਵਰਡਾਂ ਨੂੰ ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਨੂੰ ਰੱਖਣ ਵਾਲੇ ਕਿਸੇ ਦੀ ਪਹੁੰਚ ਤੋਂ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਲਈ ਡਿਵਾਈਸ ਲਾਕ ਪੈਟਰਨ, ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈਟ ਅੱਪ ਕਰੋ।</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡਾਂ ਨੂੰ ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਉੱਤੇ ਕਿਸੇ ਹੋਰ ਵੱਲੋਂ ਪਹੁੰਚ ਕਰਨ ਤੋਂ ਬਚਾਉਣ ਤੋਂ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਡਿਵਾਈਸ ਲਾਕ ਪੈਟਰਨ, ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ।</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">ਬਾਅਦ \'ਚ</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1801,6 +1804,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">ਲਾਗਇਨ ਲੜੀਬਧ ਮੇਨੂ</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਮੇਨੂ ਨੂੰ ਲੜੀਬੱਧ ਕਰੋ</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">ਆਪੇ-ਭਰੋ</string>
@@ -1808,27 +1814,42 @@
     <string name="preferences_addresses">ਸਿਰਨਾਵੇਂ</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">ਕਰੈਡਿਟ ਕਾਰਡ</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">ਭੁਗਤਾਨ ਦੇ ਢੰਗ</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">ਕਾਰਡ ਸੰਭਾਲੋ ਅਤੇ ਆਪਣੇ-ਆਪ ਭਰੋ</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">ਭੁਗਤਾਨ ਦੇ ਢੰਗ ਸੰਭਾਲੋ ਅਤੇ ਭਰੋ</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">ਡਾਟਾ ਇੰਕ੍ਰਿਪਟ ਕੀਤਾ ਹੈ</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s ਤੁਹਾਡੇ ਵਲੋਂ ਸੰਭਾਲੇ ਸਾਰੇ ਭੁਗਤਾਨ ਢੰਗਾਂ ਨੂੰ ਇੰਕ੍ਰਿਪਟ ਕਰਦਾ ਹੈ</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">ਡਿਵਾਈਸਾਂ ਵਿਚਾਲੇ ਕਾਰਡਾਂ ਨੂੰ ਸਿੰਕ ਕਰੋ</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">ਕਾਰਡ ਸਿੰਕ ਕਰੋ</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">ਕਰੈਡਿਟ ਕਾਰਡ ਜੋੜੋ</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">ਕਾਰਡ ਜੋੜੋ</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">ਸੰਭਾਲੇ ਹੋਏ ਕਾਰਡਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">ਕਾਰਡਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">ਸਿਰਨਾਵਾਂ ਜੋੜੋ</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">ਸਿਰਨਾਵਿਆਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">ਸਿਰਨਾਵੇਂ ਸੰਭਾਲੋ ਅਤੇ ਆਪਣੇ-ਆਪ ਭਰੋ</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">ਸਿਰਨਾਵਿਆਂ ਨੂੰ ਸੰਭਾਲੋ ਅਤੇ ਭਰੋ</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">ਨੰਬਰ, ਈਮੇਲ ਅਤੇ ਭੇਜਣ ਵਾਲੇ ਸਿਰਨਾਵਿਆਂ ਸਮੇਤ ਜਾਣਕਾਰੀ</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">ਫ਼ੋਨ ਨੰਬਰਾਂ ਅਤੇ ਈਮੇਲ ਸਿਰਨਾਵਿਆਂ ਸਮੇਤ</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">ਕਾਰਡ ਜੋੜੋ</string>
     <!-- Title of the "Edit card" screen -->
@@ -1849,6 +1870,8 @@
     <string name="credit_cards_delete_card_button">ਕਾਰਡ ਨੂੰ ਹਟਾਓ</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">ਕੀ ਤੁਸੀਂ ਇਹ ਕਰੈਡਿਟ ਕਾਰਡ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">ਕਾਰਡ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">ਹਟਾਓ</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1864,14 +1887,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">ਵਾਜਬ ਕਰੈਡਿਟ ਕਾਰਡ ਨੰਬਰ ਦਿਓ ਜੀ</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">ਵਾਜਬ ਕਾਰਡ ਨੰਬਰ ਭਰੋ</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">ਇਹ ਖੇਤਰ ਭਰੋ</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">ਨਾਂ ਜੋੜੋ</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਕਾਰਡ ਵੇਖਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">ਆਪਣੇ ਕਰੈਡਿਟ ਕਾਰਡ ਸੁਰੱਖਿਅਤ ਕਰੋ</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਭੁਗਤਾਨ ਢੰਗਾਂ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰੋ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">ਆਪਣੀ ਡਿਵਾਇਸ ਲਈ ਲਾਕ ਪੈਟਰਨ, ਪਿੰਨ, ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ ਤਾਂ ਜੋ ਕਿਸੇ ਹੋਰ ਹੱਥ ਤੁਹਾਡਾ ਡਿਵਾਇਸ ਹੋਣ ਉੱਤੇ ਤੁਹਾਡੇ ਸੰਭਾਲੇ ਪਾਸਵਰਡ ਸੁਰੱਖਿਅਤ ਰਹਿਣ।</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡ ਢੰਗਾਂ ਨੂੰ ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਉੱਤੇ ਕਿਸੇ ਹੋਰ ਵੱਲੋਂ ਪਹੁੰਚ ਕਰਨ ਤੋਂ ਬਚਾਉਣ ਤੋਂ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਡਿਵਾਈਸ ਲਾਕ ਪੈਟਰਨ, ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ।</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">ਹੁਣੇ ਸੈਟ ਅੱਪ ਕਰੋ</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1881,6 +1912,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">ਸੰਭਾਲੀ ਕਰੈਡਿਟ ਕਾਰਡ ਜਾਣਕਾਰੀ ਵਰਤਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">ਸੰਭਾਲੇ ਹੋਏ ਭੁਗਤਾਨ ਢੰਗਾਂ ਨੂੰ ਵਰਤਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">ਸਿਰਨਾਵਾਂ ਜੋੜੋ</string>
     <!-- Title of the "Edit address" screen -->
@@ -1918,6 +1951,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">ਕੀ ਤੁਸੀਂ ਇਹ ਸਿਰਨਾਵੇਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">ਇਹ ਸਿਰਨਾਵੇਂ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">ਹਟਾਓ</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2016,6 +2051,8 @@
     <string name="login_menu_edit_button">ਸੋਧੋ</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">ਕੀ ਤੁਸੀਂ ਇਹ ਲਾਗਇਨ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">ਕੀ ਤੁਸੀਂ ਇਸ ਪਾਸਵਰਡ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">ਹਟਾਓ</string>
 
@@ -2023,24 +2060,44 @@
     <string name="dialog_delete_negative">ਰੱਦ ਕਰੋ</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">ਲਾਗਇਨ ਚੋਣਾਂ</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਚੋਣਾਂ</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">ਲਾਗਇਨ ਦੇ ਵੈੱਬ ਐਡਰੈਸ ਲਈ ਸੋਧਣਯੋਗ ਲਿਖਤ ਖੇਤਰ ਹੈ।</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">ਵੈੱਬਸਾਈਟ ਸਿਰਨਾਵਿਆਂ ਲਈ ਸੋਧ ਕਰਨ ਯੋਗ ਲਿਖਤ ਖੇਤਰ।</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">ਲਾਗਇਨ ਦੇ ਵਰਤੋਂਕਾਰ-ਨਾਂ ਲਈ ਸੋਧਣਯੋਗ ਲਿਖਤ ਖੇਤਰ ਹੈ।</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">ਵਰਤੋਂਕਾਰ-ਨਾਂ ਲਈ ਸੋਧ ਕਰਨ ਯੋਗ ਲਿਖਤ ਖੇਤਰ।</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">ਲਾਗਇਨ ਦੇ ਪਾਸਵਰਡ ਲਈ ਸੋਧਣਯੋਗ ਲਿਖਤ ਖੇਤਰ ਹੈ।</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਲਈ ਸੋਧ ਕਰਨ ਯੋਗ ਲਿਖਤ ਖੇਤਰ।</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">ਤਬਦੀਲੀਆਂ ਨੂੰ ਲਾਗਇਨ ਲਈ ਸੰਭਾਲੋ।</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">ਤਬਦੀਲੀਆਂ ਨੂੰ ਸੰਭਾਲੋ।</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">ਸੋਧੋ</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਨੂੰ ਸੋਧੋ</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">ਨਵਾਂ ਲਾਗਇਨ ਜੋੜੋ</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਜੋੜੋ</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਦਿਓ</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">ਵਰਤੋਂਕਾਰ-ਨਾਂ ਚਾਹੀਦਾ ਹੈ</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">ਵਰਤੋਂਕਾਰ-ਨਾਂ ਦਿਓ</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">ਹੋਸਟ-ਨਾਂ ਚਾਹੀਦਾ ਹੈ</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">ਵੈੱਬ ਸਿਰਨਾਵਾਂ ਦਿਓ</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">ਆਵਾਜ਼ ਰਾਹੀਂ ਖੋਜੋ</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2209,8 +2266,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[ਪਿਛਲੇ 80 ਦਿਨਾਂ ਵਿੱਚ %s ਰੀਵਿਊਆਂ ਵਿੱਚੋਂ <b>ਹਾਈਲਾਈਟ</b> ਹਨ, ਜੋ ਸਾਨੂੰ ਜਾਪਦਾ ਹੈ ਕਿ ਭਰੋਸੇਯੋਗ ਹਨ।]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">%s ਬਾਰੇ ਹੋਰ ਸਿੱਖੋ।</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">Mozilla ਵਲੋਂ %s ਰੀਵਿਊ ਦੀ ਕੁਆਲਟੀ ਕਿਵੇਂ ਪਤਾ ਕਰਦਾ ਹੈ</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">%s ਰੀਵਿਊ ਦੀ ਕੁਆਲਟੀ ਕਿਵੇਂ ਪਤਾ ਕਰਦਾ ਹੈ</string>
     <!-- Text for title of settings section. -->
@@ -2395,6 +2450,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">ਉਲੱਥਾ ਜਾਰੀ ਹੈ</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">ਭਾਸ਼ਾ ਚੁਣੋ</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">ਅਨੁਵਾਦ ਕਰਨ ਦੌਰਾਨ ਸਮੱਸਿਆ ਆਈ ਸੀ। ਬਾਅਦ ਵਿੱਚ ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2415,6 +2472,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">%1$s ਲਈ ਕਦੇ ਉਲੱਥਾ ਨਾ ਕਰੋ</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">ਇਹ ਸਾਈਟ ਦਾ ਉਲੱਥਾ ਕਦੇ ਨਾ ਕਰੋ</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">ਸਭ ਹੋਰ ਸੈਟਿੰਗਾਂ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰੋ</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">ਅਨੁਵਾਦ ਲਈ ਪੇਸ਼ਕਸ਼ਾਂ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰੋ</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">ਉਲੱਥਾ ਸੈਟਿੰਗਾਂ</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d1402b96f..8da4b77f7 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -338,10 +338,15 @@
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
     <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">暂时不要</string>
 
+    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Firefox 隐私声明</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">我们乐于为您护航</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_3">这款由非营利组织支持的浏览器会自动阻止大公司在网上偷偷跟踪您。</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">这款由非营利组织支持的浏览器会自动阻止大公司在网上偷偷跟踪您。\n\n请阅读我们的隐私声明详细了解。</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -703,6 +708,8 @@
     <string name="preferences_sync_bookmarks">书签</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">登录信息</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">密码</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">打开的标签页</string>
     <!-- Preference for signing out -->
@@ -730,6 +737,8 @@
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">信用卡</string>
 
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">付款方式</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">邮政地址</string>
 
@@ -1703,8 +1712,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">密码</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">密码</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">保存登录名和密码</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">保存密码</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">询问是否保存</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1723,26 +1736,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">添加登录信息</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">添加密码</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">同步登录信息</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">同步密码</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">跨设备同步登录信息</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">跨设备同步密码</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">保存的登录信息</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">保存的密码</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">您保存或同步到 %s 的登录信息将显示于此处。</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">保存和同步到 %s 的密码会显示在这里，所有密码均已加密保存。
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">详细了解“同步”。</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">详细了解同步功能</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">例外</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">不保存登录名和密码的网站将显示于此处。</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s 将不会保存此处所列网站的密码。</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">将不保存这些网站的登录名和密码。</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s 将不会保存这些网站的密码。</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">删除所有例外</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">搜索登录信息</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">搜索密码</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">网站</string>
     <!-- The header for the username for a login -->
@@ -1771,10 +1804,16 @@
     <string name="saved_login_hide_password">隐藏密码</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">解锁以查看您保存的登录信息</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">解锁以查看保存的密码</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">保护您的登录名和密码</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">保护您保存的密码</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">设置设备锁定图案、PIN 或密码以保护您保存的登录名与密码，避免他人盗用。</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">设置设备锁定图案、PIN 或密码以保护您保存的密码，避免他人盗用。</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">稍后</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1793,6 +1832,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">排序登录信息菜单</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">密码排序菜单</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">自动填充</string>
@@ -1800,10 +1842,16 @@
     <string name="preferences_addresses">地址</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">信用卡</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">付款方式</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">保存并自动填充信用卡信息</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">保存和填写付款方式</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">数据已加密</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s 会加密您保存的所有付款方式</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">跨设备同步信用卡信息</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1811,17 +1859,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">添加信用卡</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">添加信用卡</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">管理保存的卡片</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">管理信用卡</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">添加地址</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">管理地址</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">保存并自动填充地址</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">保存和填充地址</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">包含号码、邮箱和收货地址等信息</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">包括电话号码和邮箱地址</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">添加信用卡</string>
     <!-- Title of the "Edit card" screen -->
@@ -1842,6 +1899,8 @@
     <string name="credit_cards_delete_card_button">删除卡片</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">您确定要删除此信用卡吗？</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">确定删除信用卡吗？</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">删除</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1857,15 +1916,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">请输入有效的信用卡卡号</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">请输入有效卡号</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">请填写此栏</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">请输入持卡人姓名</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">解锁后即可查看保存的卡片信息</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">保护您的卡片信息</string>
 
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">保护您保存的付款方式</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">设置设备锁定图案、PIN 或密码以保护您保存的卡片信息，避免他人盗用。</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">设置设备锁定图案、PIN 或密码以保护您保存的付款方式，避免他人盗用。</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">立即设置</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1876,6 +1943,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">解锁以使用存储的卡片信息</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">解锁以使用保存的付款方式</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">添加地址</string>
     <!-- Title of the "Edit address" screen -->
@@ -1913,6 +1982,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">您确定要删除此地址吗？</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">确定删除此地址吗？</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">删除</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2011,30 +2082,52 @@
     <string name="login_menu_edit_button">编辑</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">您确定要删除此登录信息吗？</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">您确定要删除此密码吗？</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">删除</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">取消</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">登录选项</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">密码选项</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">登录信息中的网址输入框。</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">网址输入框。</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">登录信息中的用户名输入框。</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">用户名输入框。</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">登录信息中的密码输入框。</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">密码输入框。</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">保存编辑过的登录信息。</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">保存更改。</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">编辑</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">编辑密码</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">新建登录信息</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">添加密码</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">需要密码</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">请输入密码</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">用户名不能为空</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">请输入用户名</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">主机名不能为空</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">请输入网址</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">语音搜索</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2320,7 +2413,7 @@
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">打开核查评价</string>
 
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag">测试中</string>
+    <string name="review_quality_check_beta_flag">测试版</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
     <string name="review_quality_check_open_handle_content_description">打开核查评价</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
@@ -2397,6 +2490,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">正在翻译</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">选择语言</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">翻译时遇到问题，请重试。</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2417,6 +2512,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">永不翻译%1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">永不翻译此网站</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">将覆盖其他所有设置</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">将覆盖“询问是否翻译”</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">翻译设置</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index eb86161ce..6a8a722d6 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2439,9 +2439,9 @@
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">要翻譯此頁面嗎？</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
-    <string name="translations_bottom_sheet_title_first_time">在 %1$s 試用有隱私的翻譯功能</string>
+    <string name="translations_bottom_sheet_title_first_time">在 %1$s 試用保護隱私的翻譯功能</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
-    <string name="translations_bottom_sheet_info_message">為了保護您的隱私，要翻譯的內容不會離開您的裝置。即將支援更多新語言並改善功能！%1$s</string>
+    <string name="translations_bottom_sheet_info_message">為了保護您的隱私，要翻譯的內容不會離開您的裝置。未來將持續支援更多語言並改善功能！%1$s</string>
     <!-- Text that links to additional information about the Firefox translations feature. -->
     <string name="translations_bottom_sheet_info_message_learn_more">更多資訊</string>
     <!-- Label for the dropdown to select which language to translate from on the translations dialog. Usually the translate from language selected will be the same as the page language. -->
@@ -2478,15 +2478,15 @@
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to always offer or suggest translations when available. -->
     <string name="translation_option_bottom_sheet_always_translate">總是提供翻譯</string>
     <!-- Toggle switch label that allows a user to set if they would like a given language to automatically translate or not. The first parameter is the language name, for example, "Spanish". -->
-    <string name="translation_option_bottom_sheet_always_translate_in_language">總是翻譯 %1$s</string>
+    <string name="translation_option_bottom_sheet_always_translate_in_language">總是翻譯%1$s</string>
     <!-- Toggle switch label that allows a user to set if they would like to never be offered a translation of the given language. The first parameter is the language name, for example, "Spanish". -->
-    <string name="translation_option_bottom_sheet_never_translate_in_language">永不翻譯 %1$s</string>
+    <string name="translation_option_bottom_sheet_never_translate_in_language">永不翻譯%1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">永不翻譯此網站</string>
     <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
-    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">覆蓋所有其他設定</string>
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">蓋過其他所有設定</string>
     <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
-    <string name="translation_option_bottom_sheet_switch_description">覆蓋提供翻譯功能</string>
+    <string name="translation_option_bottom_sheet_switch_description">蓋過翻譯功能提示</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">翻譯設定</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
@@ -2518,7 +2518,7 @@
     <!-- Preference option for offering to translate. Radio button title text.-->
     <string name="automatic_translation_option_offer_to_translate_title_preference">提供翻譯（預設）</string>
     <!-- Preference option for offering to translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
-    <string name="automatic_translation_option_offer_to_translate_summary_preference">%1$s 將提供此語言的網站翻譯內容</string>
+    <string name="automatic_translation_option_offer_to_translate_summary_preference">%1$s 將提示是否要翻譯此語言的網站內容</string>
     <!-- Preference option for always translate. Radio button title text. -->
     <string name="automatic_translation_option_always_translate_title_preference">總是翻譯</string>
 
@@ -2527,7 +2527,7 @@
     <!-- Preference option for never translate. Radio button title text.-->
     <string name="automatic_translation_option_never_translate_title_preference">永不翻譯</string>
     <!-- Preference option for never translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
-    <string name="automatic_translation_option_never_translate_summary_preference">%1$s 不會提供此語言的翻譯功能</string>
+    <string name="automatic_translation_option_never_translate_summary_preference">%1$s 不會提示此語言的網站翻譯功能</string>
 
     <!-- Never translate site preference screen -->
     <!-- Title of the never translate site preference screen that will appear on the toolbar.-->
@@ -2576,7 +2576,7 @@
     <!-- Title for the dialog used by the translations feature to confirm deleting a language.
     The dialog will be presented when the user requests deletion of a language.
     The first parameter is the name of the language, for example, "Spanish" and the second parameter is the size in kilobytes or megabytes of the language file. -->
-    <string name="delete_language_file_dialog_title">要刪除 %1$s（%2$s）嗎？</string>
+    <string name="delete_language_file_dialog_title">要刪除%1$s（%2$s）嗎？</string>
     <!-- Additional information for the dialog used by the translations feature to confirm deleting a language. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="delete_language_file_dialog_message">若您刪除此語言，%1$s 將在翻譯時下載部分語言檔到您的快取空間。</string>
     <!-- Title for the dialog used by the translations feature to confirm deleting all languages file.

From f8edd00fe1b36cda369a41805c688da169d11663 Mon Sep 17 00:00:00 2001
From: sarah541 <sarahkhan1107@hotmail.com>
Date: Fri, 26 Jan 2024 13:50:41 -0500
Subject: [PATCH 080/222] Bug 1868539 - Add method of changing remote server
 url

---
 app/src/main/java/org/mozilla/fenix/components/Core.kt   | 7 +++++++
 .../org/mozilla/fenix/settings/SecretSettingsFragment.kt | 9 ++++++++-
 app/src/main/java/org/mozilla/fenix/utils/Settings.kt    | 5 +++++
 app/src/main/res/values/preference_keys.xml              | 3 +++
 app/src/main/res/values/static_strings.xml               | 2 ++
 app/src/main/res/xml/secret_settings_preferences.xml     | 5 +++++
 6 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt
index 22447bbe2..65778d279 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -329,6 +329,11 @@ class Core(
                         rootStorageDirectory = context.filesDir,
                         readJson = readJson,
                         collectionName = COLLECTION_NAME,
+                        serverUrl = if (context.settings().useProductionRemoteSettingsServer) {
+                            REMOTE_PROD_ENDPOINT_URL
+                        } else {
+                            REMOTE_STAGE_ENDPOINT_URL
+                        },
                     ).updateProviderList()
                 }
                 // Install the "ads" WebExtension to get the links in an partner page.
@@ -623,5 +628,7 @@ class Core(
 
         // collection name to fetch from server for SERP telemetry
         const val COLLECTION_NAME = "search-telemetry-v2"
+        internal const val REMOTE_PROD_ENDPOINT_URL = "https://firefox.settings.services.mozilla.com"
+        internal const val REMOTE_STAGE_ENDPOINT_URL = "https://firefox.settings.services.allizom.org"
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
index 4f5c99085..2d91285fe 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
@@ -88,7 +88,8 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
             onPreferenceChangeListener = object : Preference.OnPreferenceChangeListener {
                 override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
                     val newBooleanValue = newValue as? Boolean ?: return false
-                    val ingestionScheduler = requireContext().components.fxSuggest.ingestionScheduler
+                    val ingestionScheduler =
+                        requireContext().components.fxSuggest.ingestionScheduler
                     if (newBooleanValue) {
                         ingestionScheduler.startPeriodicIngestion()
                     } else {
@@ -129,6 +130,12 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
         requirePreference<Preference>(R.string.pref_key_custom_sponsored_stories_parameters).apply {
             isVisible = Config.channel.isNightlyOrDebug
         }
+
+        requirePreference<SwitchPreference>(R.string.pref_key_remote_server_prod).apply {
+            isVisible = true
+            isChecked = context.settings().useProductionRemoteSettingsServer
+            onPreferenceChangeListener = SharedPreferenceUpdater()
+        }
     }
 
     override fun onPreferenceTreeClick(preference: Preference): Boolean {
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 8a8bbd706..7b8f0343e 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -767,6 +767,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         true,
     )
 
+    val useProductionRemoteSettingsServer by booleanPreference(
+        key = appContext.getPreferenceKey(R.string.pref_key_remote_server_prod),
+        default = true,
+    )
+
     val enabledTotalCookieProtection: Boolean
         get() = mr2022Sections[Mr2022Section.TCP_FEATURE] == true
 
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index 59e41aebe..6c1615556 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -145,6 +145,9 @@
     <!-- Privacy Pop Window -->
     <string name="pref_key_privacy_pop_window" translatable="false">pref_key_privacy_pop_window</string>
 
+    <!-- Remote Server Settings -->
+    <string name="pref_key_remote_server_prod" translatable="false">pref_key_remote_server_prod</string>
+
     <!-- Theme Settings -->
     <string name="pref_key_light_theme" translatable="false">pref_key_light_theme</string>
     <string name="pref_key_dark_theme" translatable="false">pref_key_dark_theme</string>
diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml
index ffb95ee4e..6432c5bed 100644
--- a/app/src/main/res/values/static_strings.xml
+++ b/app/src/main/res/values/static_strings.xml
@@ -34,6 +34,8 @@
     <string name="preferences_debug_settings">Secret Settings</string>
     <!-- Label for the secret settings preference -->
     <string name="preferences_debug_info" translatable="false">Secret Debug Info</string>
+    <!-- Label for using remote settings server url -->
+    <string name="preferences_debug_settings_remote_settings_server" translatable="false">Use Remote Settings Production server \n(Staging will be used when disabled) \n(requires restart)</string>
     <!-- Label for allowing third party root certificates from the Android OS CA store preference -->
     <string name="preferences_debug_settings_allow_third_party_root_certs">Use third party CA certificates</string>
     <!-- Label for a longer description of allowing third party root certificates from the Android OS CA store preference -->
diff --git a/app/src/main/res/xml/secret_settings_preferences.xml b/app/src/main/res/xml/secret_settings_preferences.xml
index 48148593f..0a74701ce 100644
--- a/app/src/main/res/xml/secret_settings_preferences.xml
+++ b/app/src/main/res/xml/secret_settings_preferences.xml
@@ -61,4 +61,9 @@
         app:iconSpaceReserved="false"
         android:title="@string/preferences_debug_settings_custom_sponsored_stories_parameters"
         />
+    <SwitchPreference
+        android:key="@string/pref_key_remote_server_prod"
+        app:iconSpaceReserved="false"
+        android:title="@string/preferences_debug_settings_remote_settings_server"
+        />
 </PreferenceScreen>

From a36f35eebdc07b6f6c6af0557768e551268d509f Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Thu, 1 Feb 2024 11:36:01 +0000
Subject: [PATCH 081/222] Bug 1813875 - Prevent the inherited theming
 implementation being applied to Custom Tab views

---
 .../java/org/mozilla/fenix/HomeActivity.kt     | 18 +++++++++++++-----
 .../fenix/browser/BaseBrowserFragment.kt       | 13 ++++++++++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 8ea4a4d8e..659c832c5 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -233,8 +233,10 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
 
         // There is disk read violations on some devices such as samsung and pixel for android 9/10
         components.strictMode.resetAfter(StrictMode.allowThreadDiskReads()) {
-            // Theme setup should always be called before super.onCreate
-            setupThemeAndBrowsingMode(getModeFromIntentOrLastKnown(intent))
+            // Browsing mode & theme setup should always be called before super.onCreate.
+            setupBrowsingMode(getModeFromIntentOrLastKnown(intent))
+            setupTheme()
+
             super.onCreate(savedInstanceState)
         }
 
@@ -870,12 +872,18 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         return false
     }
 
-    private fun setupThemeAndBrowsingMode(mode: BrowsingMode) {
+    private fun setupBrowsingMode(mode: BrowsingMode) {
         settings().lastKnownMode = mode
         browsingModeManager = createBrowsingModeManager(mode)
+    }
+
+    private fun setupTheme() {
         themeManager = createThemeManager()
-        themeManager.setActivityTheme(this)
-        themeManager.applyStatusBarTheme(this)
+        // ExternalAppBrowserActivity handles it's own theming as it can be customized.
+        if (this !is ExternalAppBrowserActivity) {
+            themeManager.setActivityTheme(this)
+            themeManager.applyStatusBarTheme(this)
+        }
     }
 
     // Stop active media when activity is destroyed.
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index c90ccb91b..b6fbe9a52 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -13,7 +13,6 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import android.util.Log
-import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -138,6 +137,7 @@ import org.mozilla.fenix.components.toolbar.ToolbarIntegration
 import org.mozilla.fenix.components.toolbar.interactor.BrowserToolbarInteractor
 import org.mozilla.fenix.components.toolbar.interactor.DefaultBrowserToolbarInteractor
 import org.mozilla.fenix.crashes.CrashContentIntegration
+import org.mozilla.fenix.customtabs.ExternalAppBrowserActivity
 import org.mozilla.fenix.databinding.FragmentBrowserBinding
 import org.mozilla.fenix.downloads.DynamicDownloadDialog
 import org.mozilla.fenix.downloads.FirstPartyDownloadDialog
@@ -266,7 +266,11 @@ abstract class BaseBrowserFragment :
         _binding = FragmentBrowserBinding.inflate(inflater, container, false)
 
         val activity = activity as HomeActivity
-        activity.themeManager.applyStatusBarTheme(activity)
+        // ExternalAppBrowserActivity handles it's own theming as it can be customized.
+        if (activity !is ExternalAppBrowserActivity) {
+            activity.themeManager.applyStatusBarTheme(activity)
+        }
+
         val originalContext = ActivityContextWrapper.getOriginalContext(activity)
         binding.engineView.setActivityContext(originalContext)
 
@@ -1567,7 +1571,10 @@ abstract class BaseBrowserFragment :
             activity?.exitImmersiveMode()
             (view as? SwipeGestureLayout)?.isSwipeEnabled = true
             (activity as? HomeActivity)?.let { activity ->
-                activity.themeManager.applyStatusBarTheme(activity)
+                // ExternalAppBrowserActivity handles it's own theming as it can be customized.
+                if (activity !is ExternalAppBrowserActivity) {
+                    activity.themeManager.applyStatusBarTheme(activity)
+                }
             }
             if (webAppToolbarShouldBeVisible) {
                 browserToolbarView.view.isVisible = true

From c9546cef39f48d603ecde636737133593c56b452 Mon Sep 17 00:00:00 2001
From: Ben Dean-Kawamura <bdk@mozilla.com>
Date: Wed, 31 Jan 2024 17:10:06 -0500
Subject: [PATCH 082/222] Bug 1877847 - Remove Suggest error reporting

---
 .../main/java/org/mozilla/fenix/components/Components.kt   | 2 +-
 .../main/java/org/mozilla/fenix/components/FxSuggest.kt    | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt
index 40d316b8a..6a4ea2328 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Components.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt
@@ -238,7 +238,7 @@ class Components(private val context: Context) {
         )
     }
 
-    val fxSuggest by lazyMonitored { FxSuggest(context, analytics.crashReporter) }
+    val fxSuggest by lazyMonitored { FxSuggest(context) }
 }
 
 /**
diff --git a/app/src/main/java/org/mozilla/fenix/components/FxSuggest.kt b/app/src/main/java/org/mozilla/fenix/components/FxSuggest.kt
index 22a444442..05593c97f 100644
--- a/app/src/main/java/org/mozilla/fenix/components/FxSuggest.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/FxSuggest.kt
@@ -5,7 +5,6 @@
 package org.mozilla.fenix.components
 
 import android.content.Context
-import mozilla.components.concept.base.crash.CrashReporting
 import mozilla.components.feature.fxsuggest.FxSuggestIngestionScheduler
 import mozilla.components.feature.fxsuggest.FxSuggestStorage
 import org.mozilla.fenix.perf.lazyMonitored
@@ -14,12 +13,10 @@ import org.mozilla.fenix.perf.lazyMonitored
  * Component group for Firefox Suggest.
  *
  * @param context The Android application context.
- * @param crashReporter An optional [CrashReporting] instance for reporting unexpected caught
- * exceptions.
  */
-class FxSuggest(context: Context, crashReporter: CrashReporting? = null) {
+class FxSuggest(context: Context) {
     val storage by lazyMonitored {
-        FxSuggestStorage(context, crashReporter)
+        FxSuggestStorage(context)
     }
 
     val ingestionScheduler by lazyMonitored {

From bb7a66e2eda9609c4cc371d0361bed7b7f8f3ec8 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Sat, 3 Feb 2024 00:03:26 +0000
Subject: [PATCH 083/222] Import translations from android-l10n

---
 app/src/main/res/values-azb/strings.xml    | 36 +++++++++++++
 app/src/main/res/values-en-rGB/strings.xml | 61 ++++++----------------
 app/src/main/res/values-hy-rAM/strings.xml | 61 ++++++----------------
 app/src/main/res/values-sl/strings.xml     | 51 +++---------------
 app/src/main/res/values-zh-rCN/strings.xml |  2 +-
 5 files changed, 77 insertions(+), 134 deletions(-)
 create mode 100644 app/src/main/res/values-azb/strings.xml

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
new file mode 100644
index 000000000..3e4cdcd3a
--- /dev/null
+++ b/app/src/main/res/values-azb/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
+    <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="app_name_private_5">گیزلی %s</string>
+    <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="app_name_private_4">%s (گیزلی)</string>
+
+
+    <!-- Home Fragment -->
+    <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
+    <string name="content_description_menu">داها چوخ سئچه‌نک</string>
+    <!-- Content description (not visible, for screen readers etc.): "Private Browsing" menu button. -->
+    <string name="content_description_private_browsing_button">گیزلی مورورو گوجلندیر</string>
+
+
+    <!-- Content description (not visible, for screen readers etc.): "Private Browsing" menu button. -->
+    <string name="content_description_disable_private_browsing_button">گیزلی مورورو گوجدن سال</string>
+
+
+    <!-- Placeholder text shown in the search bar before a user enters text for the default engine -->
+    <string name="search_hint">آختارین یا آدرسی گیرین</string>
+    <!-- Placeholder text shown in the search bar before a user enters text for a general engine -->
+    <string name="search_hint_general_engine">وب‌ده آختارین</string>
+
+
+    <!-- Placeholder text shown in search bar when using history search -->
+    <string name="history_search_hint">مورور گئچمیشینده آختار</string>
+    <!-- Placeholder text shown in search bar when using bookmarks search -->
+    <string name="bookmark_search_hint">بوکمارک‌دا آختار</string>
+    <!-- Placeholder text shown in search bar when using tabs search -->
+    <string name="tab_search_hint">تاغ‌لاردا آختار</string>
+
+
+    <!-- Translations feature-->
+
+    </resources>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index a6c8cbcab..ea001e9be 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -241,6 +241,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Customise homepage</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Home screen</string>
@@ -248,6 +249,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Erase browsing history</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Translate page</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Selected language</string>
@@ -259,8 +263,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scan</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Search engine</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Search engine settings</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -315,14 +317,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Notifications help you do more with %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Notifications help you do more with %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synchronise your tabs between devices, manage downloads, get tips about making the most of %s’s privacy protection, and more.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synchronise your tabs between devices, manage downloads, get tips about making the most of %s’s privacy protection, and more.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Continue</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Continue</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Not now</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Not now</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -439,21 +441,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">HTTPS-Only Mode</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie Banner Reduction</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Cookie Banner Blocker</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Cookie Banner Blocker in private browsing</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduce cookie banners</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Off</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">On</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s automatically tries to reject cookie requests on cookie banners.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Off for this site</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -471,35 +463,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Site currently not supported</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Turn on Cookie Banner Reduction for %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Turn on Cookie Banner Blocker for %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Turn off Cookie Banner Reduction for %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Turn off Cookie Banner Blocker for %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s can’t automatically reject cookie requests on this site. You can send a request to support this site in the future.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s will clear this site’s cookies and refresh the page. Clearing all cookies may sign you out or empty shopping carts.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Turn off and %1$s will clear cookies and reload this site. This may sign you out or empty shopping carts.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s tries to automatically reject all cookie requests on supported sites.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Turn on and %1$s will try to automatically refuse all cookie banners on this site.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Allow %1$s to reject cookie banners?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s can automatically reject many cookie banner requests.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Not Now</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">You’ll see fewer cookie requests</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Allow</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s just refused cookies for you</string>
@@ -1283,8 +1256,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Dismiss</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Unable to print</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Unable to print this page</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Print</string>
@@ -1901,7 +1872,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Set up a device lock pattern, PIN, or password to protect your saved credit cards from being accessed if someone else has your device.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Set up a device lock pattern, PIN, or password to protect your saved cards from being accessed if someone else has your device.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Set up a device lock pattern, PIN, or password to protect your saved payment methods from being accessed if someone else has your device.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Set up now</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2062,12 +2033,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Password options</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">The editable text field for the web address of the login.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">The editable text field for the web site address of the password.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">The editable text field for the web site address.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">The editable text field for the username of the login.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">The editable text field for the username of the password.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">The editable text field for the username.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">The editable text field for the password of the login.</string>
     <!--  The editable text field for a login's password. -->
@@ -2264,8 +2235,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Highlights</b> are from %s reviews within the last 80 days that we believe to be reliable.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Learn more about %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">how %s by Mozilla determines review quality</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">how %s determines review quality</string>
     <!-- Text for title of settings section. -->
@@ -2449,6 +2418,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Translation in Progress</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Choose a language</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">There was a problem translating. Please try again.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml
index 033294777..50cd8346f 100644
--- a/app/src/main/res/values-hy-rAM/strings.xml
+++ b/app/src/main/res/values-hy-rAM/strings.xml
@@ -242,6 +242,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Հարմարեցնել տնայինը</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Հիմնական էկրան</string>
@@ -249,6 +250,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Ջնջել դիտարկման պատմությունը</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Թարգմանել էջը</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Ընտրված լեզուն</string>
@@ -260,8 +264,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Սկանավորել</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Որոնիչ</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Որոնիչի կարգավորումներ</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -315,14 +317,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Ծանուցումներն օգնում են ձեզ ավելին անել %s-ի հետ</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Ծանուցումներն օգնում են ձեզ ավելին անել %s-ի հետ</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Համաժամացրեք ձեր ներդիրները սարքերի միջև, կառավարեք ներբեռնումները, ստացեք խորհուրդներ %s-ի գաղտնիության պաշտպանությունից առավելագույնս օգտագործելու մասին և այլն:</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Համաժամացրեք ձեր ներդիրները սարքերի միջև, կառավարեք ներբեռնումները, ստացեք խորհուրդներ %s-ի գաղտնիության պաշտպանությունից առավելագույնս օգտագործելու մասին և այլն:</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Շարունակել</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Շարունակել</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ոչ հիմա</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ոչ հիմա</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -439,21 +441,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">HTTPS կերպ միայն</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Թխուկների դրոշակի կրճատում</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Թխուկների ազդերիզի արգելափակիչ</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Թխուկների ազդերիզի արգելափակիչ մասնավոր զննարկումում</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Նվազեցնել թխուկների պաստառները</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Անջ.</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Միաց.</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s-ն ինքնաբար փորձում է մերժել թխուկների հարցումները թխուկների ցուցանակների վրա:</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Անջատված է այս կայքի համար</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -471,35 +463,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Կայքը ներկայումս չի աջակցվում</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Միացնե՞լ Cookie Banner կրճատումը %1$s-ի համար:</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Միացնե՞լ Թխուկների ազդերիզի արգելափակիչը %1$s-ում:</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Անջատե՞լ Cookie Banner կրճատումը %1$s-ի համար:</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Անջատե՞լ Թխուկների ազդերիզի արգելափակիչը %1$s-ում:</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s-ը չի կարող ինքնաշխատ մերժել թխուկների հարցումներն այս կայքում: Դուք կարող եք հարցում ուղարկել այս կայքին ապագայում աջակցելու համար:</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s-ը կջնջի այս կայքի թխուկները և կթարմացնի էջը: Բոլոր թխուկները մաքրելը կարող է դուրս գրել Ձեզ կամ դատարկել գնումների զամբյուղները:</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Անջատեք և %1$s-ը կմաքրի թխուկները և կրկին կբեռնի այս կայքը: Դա կարող է ձեզ դուրս գրել կամ դատարկել գնումների զամբյուղը:</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s-ը փորձում է ինքնաբար մերժել թխուկների հարցումները աջակցվող կայքերում:</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Միացրեք և %1$s-ը ինքնաբար կմերժի թխուկների բոլոր ազդերիզները այս կայքում:</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Թույլատրե՞լ %1$s-ին մերժել թխուկների պաստառները:</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s-ը կարող է ինքնաբար մերժել թխուկների պաստառների հարցումները:</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ոչ հիմա</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Դուք կտեսնեք ավելի քիչ թխուկների հարցումներ</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Թույլատրել</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s-ը հենց նոր մերժեց թխուկները ձեզ համար</string>
@@ -1284,8 +1257,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Բաց թողնել</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Անհնար է տպել</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Չհաջողվեց տպել այս էջը</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Տպել</string>
@@ -1905,7 +1876,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Տեղակայեք սարքի կողպման նախշ, PIN կամ գաղտնաբառ՝ պաշտպանելու պահված բանկային քարտերը այն դեպքում, եթե որևէ մեկը ևս մուտք ունի Ձեր սարքին:</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Տեղակայեք սարքի կողպման նախշ, PIN կամ գաղտնաբառ՝ պաշտպանելու ձեր քարտերն այն դեպքում, եթե որևէ մեկը ևս մուտք ունենա Ձեր սարքին:</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Տեղակայեք սարքի կողպման նախշ, PIN կամ գաղտնաբառ՝ պաշտպանելու ձեր քարտերն այն դեպքում, եթե որևէ մեկը ևս մուտք ունենա Ձեր սարքին:</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Տեղակայել հիմա</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2064,12 +2035,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Գաղտնաբառի ընտրանքներ</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Խմբագրելի տեքստի դաշտը մուտքի վեբ հասցեի համար:</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Խմբագրելի տեքստի դաշտ գաղտնաբառի վեբ հասցեի համար:</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Խմբագրելի տեքստի դաշտ կայքի հասցեի համար:</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Խմբագրելի տեքստի դաշտը մուտք գործողի համար:</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Խմբագրելի տեքստի դաշտ գաղտնաբառի օգտվողի համար:</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Խմբագրելի տեքստի դաշտ օգտվողի անվան համար:</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Խմբագրելի տեքստի դաշտը մուտքի գաղտնաբառի համար:</string>
     <!--  The editable text field for a login's password. -->
@@ -2268,8 +2239,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Գունանշումները</b> վերջին 80 օրվա ընթացքում %s կարծիքներից են, որոնք, մեր կարծիքով, հուսալի են:]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Իմացեք ավելին %s-ի մասին:</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">ինչպես %s-ը  է Mozilla-ի կողմից որոշում կարծիքների որակը</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">ինչպես է %s-ը որոշում կարծիքների որակը</string>
     <!-- Text for title of settings section. -->
@@ -2454,6 +2423,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Թարգմանությունն ընթացքի մեջ է</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Ընտրեք  լեզուն</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Թարգմանության հետ կապված խնդիր։ Կրկին փորձեք;</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index dcb16bbaa..8f3a2ebfd 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -244,6 +244,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Prilagodi domačo stran</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Domači zaslon</string>
@@ -251,6 +252,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Počisti zgodovino brskanja</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Prevedi stran</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Izbrani jezik</string>
@@ -262,8 +266,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skeniraj</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Iskalnik</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Nastavitve iskalnika</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -318,14 +320,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Obvestila vam pomagajo pri delu s programom %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Obvestila vam pomagajo pri delu s programom %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sinhronizirajte zavihke med napravami, upravljajte prenose, pridobite nasvete za kar najboljši izkoristek %sovih zmožnosti in še več.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sinhronizirajte zavihke med napravami, upravljajte prenose, pridobite nasvete za kar najboljši izkoristek %sovih zmožnosti in še več.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Nadaljuj</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Nadaljuj</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ne zdaj</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ne zdaj</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -443,20 +445,10 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Način &quot;samo HTTPS&quot;</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Zmanjšanje števila pasic s piškotki</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Zavračanje pasic s piškotki</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Zavračanje pasic s piškotki v zasebnem brskanju</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Zmanjšaj število pasic s piškotki</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Izključeno</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Vključeno</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s poskuša samodejno zavrniti zahteve pasic po shranjevanju piškotkov.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Izključeno na tem spletnem mestu</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -474,35 +466,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Spletno mesto trenutno ni podprto</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Vključim zmanjšanje števila pasic s piškotki za %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Vključim zavračanje pasic s piškotki za %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Izključim zmanjšanje števila pasic s piškotki za %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Izključim zavračanje pasic s piškotki za %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s na tem spletnem mestu ni mogel samodejno zavrniti zahtev za shranjevanje piškotkov. Pošljete lahko zahtevek, naj se v prihodnosti uvede podpora za to spletno mesto.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s bo počistil piškotke tega spletnega mesta in osvežil stran. Če počistite vse piškotke, boste morda odjavljeni ali se bo izpraznila vaša nakupovalna košarica.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Izklopite in %1$s bo izbrisal piškotke ter znova naložil stran, kar vas lahko odjavi in izprazni vaš nakupovalni voziček.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s poskuša samodejno zavrniti vse zahteve za shranjevanje piškotkov na spletnih mestih, ki so podprta.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Vklopite to možnost in %1$s bo skušal na tem spletnem mestu samodejno zavrniti pasice s piškotki.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Dovolite %1$su, da zavrača pasice s piškotki?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s lahko samodejno zavrne številne zahteve za shranjevanje piškotkov.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ne zdaj</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Prikazovalo se vam bo manj zahtev za shranjevanje piškotkov</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Dovoli</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s je pravkar zavrnil piškotke v vašem imenu</string>
@@ -1297,8 +1270,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Zapri</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Tiskanje ni mogoče</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Te strani ni mogoče natisniti</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Natisni</string>
@@ -2049,12 +2020,8 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Možnosti gesel</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Besedilno polje za urejanje spletnega naslova prijave.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Besedilno polje za urejanje naslova spletnega mesta, ki mu pripada geslo.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Besedilno polje za urejanje uporabniškega imena prijave.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Besedilno polje za urejanje uporabniškega imena, ki pripada geslu.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Besedilno polje za urejanje gesla prijave.</string>
     <!--  The editable text field for a login's password. -->
@@ -2252,8 +2219,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Poudarki</b> so vzeti iz mnenj v trgovini %s v zadnjih 80 dneh, za katera menimo, da so zanesljiva.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Več o %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">kako Mozilla %s določa kakovost mnenj</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">kako %s določa kakovost mnenj</string>
     <!-- Text for title of settings section. -->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8da4b77f7..247d17f85 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2467,7 +2467,7 @@
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">要翻译此页面吗？</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
-    <string name="translations_bottom_sheet_title_first_time">试用 %1$s 注重隐私的翻译功能</string>
+    <string name="translations_bottom_sheet_title_first_time">试试 %1$s 注重隐私的翻译功能</string>
 
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
     <string name="translations_bottom_sheet_info_message">为保护隐私，翻译过程只会在本地进行。我们很快会支持更多语言并带来改进！%1$s</string>

From 4d3d19aaf39e56b5c364f39629dd6d6431243b3e Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Sun, 4 Feb 2024 00:03:39 +0000
Subject: [PATCH 084/222] Import translations from android-l10n

---
 app/src/main/res/values-br/strings.xml  | 48 ++++---------------
 app/src/main/res/values-bs/strings.xml  | 58 ++++++-----------------
 app/src/main/res/values-fur/strings.xml | 16 +++++--
 app/src/main/res/values-oc/strings.xml  |  6 +++
 app/src/main/res/values-vi/strings.xml  | 61 +++++++------------------
 5 files changed, 56 insertions(+), 133 deletions(-)

diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 25c988085..f9fc661f1 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -230,6 +230,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personelaat an degemer</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Skramm degemer</string>
@@ -237,6 +238,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Skarzhañ ar roll istor</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Treiñ ar bajenn</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Yezh dibabet</string>
@@ -248,8 +252,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Cʼhwilerviñ</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Lusker enklask</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Arventennoù al lusker klask</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -302,14 +304,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Gant ar rebuzadurioù e c’hallit ober muioc’h a draoù gant %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Gant ar rebuzadurioù e c’hallit ober muioc’h a draoù gant %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Goubredit hoc’h ivinelloù etre ho trevnadoù, merit ho pellgargadurioù, lennit alioù evit tapout seizh gwellañ gwarez buhez prevez %s ha muioc’h c’hoazh.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Goubredit hoc’h ivinelloù etre ho trevnadoù, merit ho pellgargadurioù, lennit alioù evit tapout seizh gwellañ gwarez buhez prevez %s ha muioc’h c’hoazh.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Kenderc’hel</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Kenderc’hel</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ket bremañ</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ket bremañ</string>
 
     <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
@@ -399,17 +401,6 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Mod HTTPS-hepken</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Bihanadur banniel an toupinoù</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Bihanaat banniel an toupinoù</string>
-
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Diweredekaet</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Gweredekaet</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s a glask nac’hañ ar goulennoù toupinoù ent emgefreek pa vez skrammet ur banniel toupinoù.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Diweredekaet evit al lec’hienn-mañ</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -426,28 +417,9 @@
     <string name="reduce_cookie_banner_unsupported_site_request_submitted_2">Goulenn skor kaset</string>
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">N’eo ket skoret al lec’hienn-mañ c’hoazh</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Gweredekaat bihanaat banniel an toupinoù evit %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Diweredekaat bihanaat banniel an toupinoù evit %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s n’hall ket nac’hañ ar goulennoù toupinoù war al lec’hienn-mañ. Gallout a rit goulenn e vefe skoret al lec’hienn-mañ en dazont.</string>
 
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s a skarzho toupinoù al lec’hienn-mañ hag adkargañ a raio ar bajenn. Skarzhañ an holl doupinoù a c’hallfe digennaskañ ac’hanoc’h pe goullonderiñ ho panerioù.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s a c’hall klask nac’hañ ent emgefreek ar goulennoù toupinoù war al lec’hiennoù skoret.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Aotren %1$s da nac’hañ ar goulennoù toupinoù?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s a c’hall nac’hañ ent emgefreek goulennoù ar bannieloù toupinoù.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ket bremañ</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Nebeutoc’h a c’houlennoù toupinoù a vo gwelet ganeoc’h</string>
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Aotren</string>
-
     <!-- Description of the preference to enable "HTTPS-Only" mode. -->
     <string name="preferences_https_only_summary">Klask kennaskañ ent emgefreek gant ar c’homenad HTTPS evit muioc’h a surentez.</string>
     <!-- Summary of https only preference if https only is set to off -->
@@ -1211,8 +1183,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Argas</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">N’haller ket moullañ</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">N’haller ket moullañ ar bajenn-mañ</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Moullañ</string>
@@ -2139,8 +2109,6 @@
     <string name="review_quality_check_explanation_title">Penaos e termenomp perzhded an alioù</string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Gouzout muioc’h diwar-benn %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">penaos e termen %s gant Mozilla perzhded an alioù</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">penaos e vez priziet perzhded an alioù gant  %s</string>
     <!-- Text for title of settings section. -->
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 777059a7b..819e7f7a9 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -235,12 +235,16 @@
     <string name="browser_menu_edit">Uredi</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Prilagodi početnu stranicu</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Početni ekran</string>
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Izbriši historiju pretraživanja</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Prevedi stranicu</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Izabrani jezik</string>
@@ -253,8 +257,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skeniraj</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Pretraživač</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Postavke pretraživača</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -304,14 +306,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Obavještenja vam pomažu da učinite više sa %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Obavještenja vam pomažu da učinite više sa %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sinhronizujte svoje tabove između uređaja, upravljajte preuzimanjima, primajte savjete o tome kako maksimalno iskoristiti %s zaštitu privatnosti i još mnogo toga.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sinhronizujte svoje tabove između uređaja, upravljajte preuzimanjima, primajte savjete o tome kako maksimalno iskoristiti %s zaštitu privatnosti i još mnogo toga.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Nastavi</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Nastavi</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ne sada</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ne sada</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -430,20 +432,10 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Način rada samo za HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Smanjivanje pojavljivanja dijaloga kolačića</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blokiranje pojavljivanja dijaloga kolačića</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Smanjivanje pojavljivanja dijaloga kolačića u privatnom pretraživanju</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Smanji pojavljivanje dijaloga kolačića</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Isključeno</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Uključeno</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s automatski pokušava odbiti zahtjeve za kolačiće na dijalozima kolačića.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Isključeno za ovu stranicu</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -461,34 +453,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Stranica trenutno nije podržana</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Uključiti smanjenje dijaloga kolačića za %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Uključiti blokiranje dijaloga kolačića za %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Isključiti smanjenje dijaloga kolačića za %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Isključiti blokiranje dijaloga kolačića za %1$s?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s ne može automatski odbiti zahtjeve za kolačiće na ovoj stranici. Možete poslati zahtjev za podršku ovoj stranici u budućnosti.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s će očistiti kolačiće ove stranice i osvježiti stranicu. Čišćenje svih kolačića može vas odjaviti ili isprazniti kolica za kupovinu.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Isključite i %1$s će očistiti kolačiće i ponovo učitati ovu stranicu. Ovo vas može odjaviti ili isprazniti korpe za kupovinu.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s pokušava automatski odbiti sve zahtjeve za kolačiće na podržanim web stranicama.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Uključite i %1$s će pokušati automatski odbiti sve banere kolačića na ovoj stranici.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Dozvoliti %1$s da odbije banere kolačića?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s može automatski odbiti mnoge zahtjeve za kolačićima.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ne sada</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Vidjet ćete manje zahtjeva za kolačiće</string>
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Dozvoli</string>
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s je upravo odbio kolačiće umjesto vas</string>
     <!--Message for the cookie banner re-engagement CFR -->
@@ -1266,8 +1240,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Odbaci</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Nije moguće štampati</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Nije moguće štampati ovu stranicu</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Štampaj</string>
@@ -1884,7 +1856,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Postavite obrazac za zaključavanje uređaja, PIN ili lozinku da zaštitite svoje sačuvane kreditne kartice od pristupa ako neko drugi ima vaš uređaj.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Postavite obrazac za zaključavanje uređaja, PIN ili lozinku da zaštitite svoje sačuvane kartice od pristupa ako neko drugi ima vaš uređaj.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Postavite obrazac za zaključavanje uređaja, PIN ili lozinku da zaštitite sačuvane načine plaćanja od pristupa ako neko drugi ima vaš uređaj.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Podesi odmah</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2044,12 +2016,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Opcije lozinke</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Izmjenjivo tekstualno polje za web adresu prijave.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Tekstualno polje koje se može uređivati za adresu web stranice lozinke.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Tekstualno polje koje se može uređivati za adresu web stranice.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Izmjenjivo tekstualno polje za korisničko ime prijave.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Tekstualno polje koje se može uređivati za korisničko ime lozinke.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Tekstualno polje koje se može uređivati za korisničko ime.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Izmjenjivo tekstualno polje za lozinku prijave.</string>
     <!--  The editable text field for a login's password. -->
@@ -2244,8 +2216,6 @@
 
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Saznajte više o %su.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">kako %s od Mozilla određuje kvalitet recenzije</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">kako %s određuje kvalitet recenzije</string>
     <!-- Text for title of settings section. -->
@@ -2430,6 +2400,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Prevođenje u toku</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Odaberi jezik</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Došlo je do problema pri prevođenju. Molimo pokušajte ponovo.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-fur/strings.xml b/app/src/main/res/values-fur/strings.xml
index 94313f628..c01770abe 100644
--- a/app/src/main/res/values-fur/strings.xml
+++ b/app/src/main/res/values-fur/strings.xml
@@ -242,6 +242,7 @@
     <string name="browser_menu_edit">Modifiche</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalize pagjine iniziâl</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Schermade principâl</string>
@@ -249,6 +250,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Scancele la cronologjie di navigazion</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Tradûs pagjine</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Lenghe selezionade</string>
@@ -1879,7 +1883,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configure une secuence di bloc, PIN o password par protezi lis tôs cjartis di credit salvadis, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâlis.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Configure une secuence di bloc, PIN o password par protezi lis tôs cjartis salvadis, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâlis.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Configure une secuence di bloc, PIN o password par protezi i tiei metodis di paiament salvâts, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâju.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configure cumò</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2038,12 +2042,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Opzions password</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Il cjamp di test modificabil pe direzion web de credenziâl.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Il cjamp di test che si pues modificâ pe direzion dal sît web de password.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Il cjamp di test che si pues modificâ pe direzion dal sît web.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Il cjamp di test modificabil pal non utent de credenziâl.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Il cjamp di test che si pues modificâ pal non utent de password.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Il cjamp di test che si pues modificâ pal non utent.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Il cjamp di test modificabil pe password de credenziâl.</string>
     <!--  The editable text field for a login's password. -->
@@ -2426,6 +2430,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Traduzion in cors</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Sielç une lenghe</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Al è vignût fûr un probleme tal tradusi. Torne prove.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 8e8f92aa1..25873903b 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -1913,6 +1913,8 @@
     <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Securizatz los metòdes de pagament enregistrats</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configuratz un esquèma de verrolhatge, un còdi PIN o un senhal per protegir vòstres identificants de cartas de crèdit enregistrats se per cas qualqu’un accedisca a vòstre periferic.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Configuratz un esquèma de desverrolhatge, un còdi PIN o un senhal per protegir vòstres mejans de pagament se per cas qualqu’un accedisca a vòstre aparelh.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ara</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2077,8 +2079,12 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Opcions de senhal</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Lo camp de tèxt modificable per l’adreça web de l’identificant.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Lo camp de tèxt modificable per l’adreça del site web.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Lo camp de tèxt modificable pel nom d’utilizaire de l’identificant.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Lo camp de tèxt modificable pel nom d’utilizaire.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Lo camp de tèxt modificable pel senhal de l’identificant.</string>
     <!--  The editable text field for a login's password. -->
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index abfc03fa7..736a82c33 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -242,6 +242,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Tùy biến trang chủ</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Màn hình chính</string>
@@ -249,6 +250,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Xóa lịch sử duyệt web</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Dịch trang</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Ngôn ngữ được chọn</string>
@@ -260,8 +264,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Quét</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Công cụ tìm kiếm</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Cài đặt công cụ tìm kiếm</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -316,14 +318,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Thông báo giúp bạn làm được nhiều việc hơn với %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Thông báo giúp bạn làm được nhiều việc hơn với %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Đồng bộ hóa các thẻ của bạn giữa các thiết bị, quản lý tải xuống, nhận các mẹo về cách tận dụng tối đa khả năng bảo vệ quyền riêng tư của %s và nhiều hơn nữa.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Đồng bộ hóa các thẻ của bạn giữa các thiết bị, quản lý tải xuống, nhận các mẹo về cách tận dụng tối đa khả năng bảo vệ quyền riêng tư của %s và nhiều hơn nữa.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Tiếp tục</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Tiếp tục</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Không phải bây giờ</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Không phải bây giờ</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -441,21 +443,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Chế độ chỉ HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Giảm biểu ngữ cookie</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Trình chặn biểu ngữ cookie</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Trình chặn biểu ngữ cookie trong trình duyệt riêng tư</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Giảm biểu ngữ cookie</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Tắt</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Bật</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s tự động cố gắng từ chối yêu cầu cookie trên biểu ngữ cookie.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Tắt cho trang web này</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -473,35 +465,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Trang web hiện tại không được hỗ trợ</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Bật giảm biểu ngữ cookie cho %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Bật trình chặn biểu ngữ cookie cho %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Tắt giảm biểu ngữ cookie cho %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Tắt trình chặn biểu ngữ cookie cho %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s không thể tự động từ chối yêu cầu cookie trên trang web này. Bạn có thể gửi yêu cầu hỗ trợ trang web này trong tương lai.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s sẽ xóa cookie của trang web này và làm mới trang. Xóa tất cả cookie có thể khiến bạn đăng xuất hoặc làm trống giỏ hàng.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Tắt và %1$s sẽ xóa cookie và tải lại trang web này. Điều này có thể khiến bạn bị đăng xuất hoặc bị xóa sạch giỏ hàng.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s thử tự động từ chối tất cả các yêu cầu cookie trên các trang web được hỗ trợ.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Bật và %1$s sẽ thử tự động từ chối tất cả các biểu ngữ cookie trên trang web này.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Cho phép %1$s từ chối biểu ngữ cookie?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s có thể tự động từ chối nhiều yêu cầu biểu ngữ cookie.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Không phải bây giờ</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Bạn sẽ thấy ít yêu cầu cookie hơn</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Cho phép</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s vừa từ chối cookie cho bạn</string>
@@ -1283,8 +1256,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Bỏ qua</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Không thể in</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Không thể in trang này</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">In</string>
@@ -1900,7 +1871,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Thiết lập màn hình khóa thiết bị với mẫu hình, mã PIN hoặc mật khẩu để bảo vệ thẻ tín dụng đã lưu của bạn không bị truy cập nếu người khác có thiết bị của bạn.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Đặt mật khẩu thiết bị dạng mẫu hình, mã PIN hoặc mật khẩu để bảo vệ thẻ đã lưu của bạn không bị truy cập nếu người khác lấy đuọc thiết bị của bạn.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Đặt mật khẩu thiết bị dạng mẫu hình, mã PIN hoặc mật khẩu để bảo vệ phương thức thanh toán đã lưu của bạn không bị truy cập nếu người khác lấy đuọc thiết bị của bạn.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Thiết lập ngay</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2061,12 +2032,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Cài đặt mật khẩu</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Trường văn bản có thể chỉnh sửa cho địa chỉ web của thông tin đăng nhập.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Trường văn bản có thể chỉnh sửa cho địa chỉ trang web của mật khẩu.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Trường văn bản có thể chỉnh sửa cho địa chỉ trang web.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Trường văn bản có thể chỉnh sửa cho tên người dùng của thông tin đăng nhập.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Trường văn bản có thể chỉnh sửa cho tên người dùng của mật khẩu.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Trường văn bản có thể chỉnh sửa cho tên người dùng.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Trường văn bản có thể chỉnh sửa cho mật khẩu của thông tin đăng nhập.</string>
     <!--  The editable text field for a login's password. -->
@@ -2263,8 +2234,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Điểm nổi bật</b> từ %s đánh giá trong vòng 80 ngày qua mà chúng tôi tin là đáng tin cậy.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Tìm hiểu thêm về %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">cách %s bởi Mozilla xác định chất lượng đánh giá</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">cách %s xác định chất lượng đánh giá</string>
     <!-- Text for title of settings section. -->
@@ -2449,6 +2418,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Đang dịch trang</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Chọn ngôn ngữ</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Đã xảy ra sự cố khi dịch. Hãy thử lại.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->

From 7969a62aafaf1c62d447e2e034b348447a0c2f0e Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Mon, 5 Feb 2024 00:03:30 +0000
Subject: [PATCH 085/222] Import translations from android-l10n

---
 app/src/main/res/values-azb/strings.xml | 30 ++++++++++
 app/src/main/res/values-cs/strings.xml  | 20 +++++++
 app/src/main/res/values-kab/strings.xml | 26 ++++++++
 app/src/main/res/values-sk/strings.xml  | 80 ++++++++-----------------
 app/src/main/res/values-sl/strings.xml  |  9 +++
 app/src/main/res/values-th/strings.xml  | 54 +++++++++++++++++
 app/src/main/res/values-uk/strings.xml  | 16 +++--
 7 files changed, 176 insertions(+), 59 deletions(-)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index 3e4cdcd3a..eee28262e 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -31,6 +31,36 @@
     <string name="tab_search_hint">تاغ‌لاردا آختار</string>
 
 
+    <!-- Placeholder text shown in the search bar when using application search engines -->
+    <string name="application_search_hint">آختاریش شرطلرینی گیر</string>
+    <!-- No Open Tabs Message Description -->
+    <string name="no_open_tabs_description">آچیق تاغ‌لاریز بوردا گؤستریله‌جک</string>
+    <!-- No Private Tabs Message Description -->
+    <string name="no_private_tabs_description">سیزین گیزلی تاغ‌لاریز بوردا گؤستریله‌جک</string>
+
+
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">%1$d سئچیلیدی</string>
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">یئنی مجموعه اکله</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">آد</string>
+
+
+    <!-- Label of button in save to collection dialog for selecting a current collection  -->
+    <string name="tab_tray_select_collection">مجموعه سئچین</string>
+    <!-- Content description for close button while in multiselect mode in tab tray -->
+    <string name="tab_tray_close_multiselect_content_description">چوخ‌سئچیم مودوندان چیخ</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">سئچیلن تاغلاری مجموعه‌ده ساخلا</string>
+    <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
+    <string name="tab_tray_multiselect_selected_content_description">سئچیلدی</string>
+
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_title">سون ساخلانان‌لار</string>
+
+
     <!-- Translations feature-->
 
     </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 00d156123..d257bf7c0 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -249,6 +249,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Přizpůsobit</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Domovská obrazovka</string>
@@ -256,6 +257,10 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Vymazat historii prohlížení</string>
+
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Přeložit stránku</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Vybraný jazyk</string>
@@ -1716,6 +1721,8 @@
     <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Uložená hesla</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Uložené nebo synchronizované údaje aplikace %s se zobrazí tady.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Hesla, která uložíte nebo synchronizujete s aplikací %s, budou uvedena zde. Všechna uložená hesla jsou šifrována.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Zjistit více o službě Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
@@ -1772,6 +1779,8 @@
     <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Zabezpečte svá uložená hesla</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Nastavte si gesto, PIN nebo heslo zámku obrazovky, který ochrání vaše uložené přihlašovací údaje, pokud by se vaše zařízení dostalo do ruky někomu jinému.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Nastavte si gesto, PIN nebo heslo zámku obrazovky, který ochrání vaše uložená hesla, pokud by se vaše zařízení dostalo do ruky někomu jinému.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Později</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1792,6 +1801,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Seřadit podle</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Nabídka pro řazení hesel</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Automatické vyplňování</string>
@@ -1897,6 +1909,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Odemkněte pro použití informací o platební kartě</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Odemknout pro použití uložených způsobů platby</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Přidat adresu</string>
     <!-- Title of the "Edit address" screen -->
@@ -2052,6 +2066,8 @@
     <string name="saved_login_username_description">Textové pole pro uživatelské jméno z přihlašovacích údajů.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Textové pole pro heslo z přihlašovacích údajů.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Upravitelné textové pole pro heslo.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Uložit změny přihlašovacích údajů.</string>
     <!--  The button description to save changes to an edited password. -->
@@ -2428,6 +2444,8 @@
     <string name="translations_bottom_sheet_translating_in_progress">Probíhá překlad</string>
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Právě probíhá překlad</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Vyberte jazyk</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Při překladu došlo k chybě. Zkuste to prosím znovu.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2450,6 +2468,8 @@
     <string name="translation_option_bottom_sheet_never_translate_site">Nikdy nepřekládat tuto stránku</string>
     <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
     <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Přepíše všechna ostatní nastavení</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Přepíše nabídky k překladu</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Nastavení překladu</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index cce974e94..780162870 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -2019,6 +2019,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="dialog_delete_negative">Sefsex</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Iɣewwaren n unekcum</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Tixtiṛiyin n wawal uffir</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Urti n uḍris yettusenfal i tansa n unekcum n web.</string>
     <!--  The editable text field for a login's username. -->
@@ -2234,6 +2236,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Adenqed n tɣara n yilɣa</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
     <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Adenqed n tɣara n yilɣa</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
+    <string name="review_quality_check_analysis_in_progress_warning_title_2">Adenqed n tɣara n yilɣa (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
     <string name="review_quality_check_analysis_in_progress_warning_body">Aya yezmer ad yeṭṭef 60 tsinin.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
@@ -2355,9 +2359,18 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
 
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to always offer or suggest translations when available. -->
     <string name="translation_option_bottom_sheet_always_translate">Sumer yal tikkelt tasuqqilt</string>
+    <!-- Toggle switch label that allows a user to set if they would like a given language to automatically translate or not. The first parameter is the language name, for example, "Spanish". -->
+    <string name="translation_option_bottom_sheet_always_translate_in_language">Sueqqel yal tikkelt %1$s</string>
+    <!-- Toggle switch label that allows a user to set if they would like to never be offered a translation of the given language. The first parameter is the language name, for example, "Spanish". -->
+    <string name="translation_option_bottom_sheet_never_translate_in_language">Ur suqqul ara %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Werǧin asuqel n usmel-a</string>
 
+    <!-- Button text for the button that will take the user to the translation settings dialog. -->
+    <string name="translation_option_bottom_sheet_translation_settings">Iɣewwaren n usuqqel</string>
+    <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translation_option_bottom_sheet_about_translations">Γef tsuqqilin deg %1$s</string>
+
     <!-- Translation settings dialog -->
     <!-- Title of the translation settings dialog that allows a user to set their preferred translation settings. -->
     <string name="translation_settings_toolbar_title">Tisuqilin</string>
@@ -2367,9 +2380,14 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Button text for the button that will take the user to the download languages dialog. On the download languages dialog, the user can manage which languages they would like to download for translations. -->
     <string name="translation_settings_download_language">Sader tutlayin</string>
 
+    <!-- Preference option for always translate. Radio button title text. -->
+    <string name="automatic_translation_option_always_translate_title_preference">Sueqqel yal tikkelt</string>
     <!-- Preference option for never translate. Radio button title text.-->
     <string name="automatic_translation_option_never_translate_title_preference">Werǧin attsuqleḍ</string>
 
+    <!-- Never translate site preference screen -->
+    <!-- Title of the never translate site preference screen that will appear on the toolbar.-->
+    <string name="never_translate_site_toolbar_title_preference">Ur suqqul ara ismal-a</string>
     <!-- Content description (not visible, for screen readers etc.): For a never-translated site list item that is selected.
              The first parameter is web site url (for example:"wikipedia.com") -->
     <string name="never_translate_site_item_list_content_description_preference">Kkes %1$s</string>
@@ -2411,6 +2429,10 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     The dialog will be presented when the user requests deletion of a language.
     The first parameter is the name of the language, for example, "Spanish" and the second parameter is the size in kilobytes or megabytes of the language file. -->
     <string name="delete_language_file_dialog_title">Kkes %1$s (%2$s)?</string>
+    <!-- Title for the dialog used by the translations feature to confirm deleting all languages file.
+    The dialog will be presented when the user requests deletion of all languages file.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_all_languages_file_dialog_title">Kkes akk tutlayin (%1$s)?</string>
     <!-- Button text on the dialog used by the translations feature to confirm deleting a language. -->
     <string name="delete_language_file_dialog_positive_button_text">Kkes</string>
     <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
@@ -2418,6 +2440,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
 
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
     <string name="download_language_file_dialog_positive_button_text">Sader</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file and perform a translation. -->
+    <string name="download_language_file_dialog_positive_button_text_all_languages">Sader syen suqqel</string>
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
     <string name="download_language_file_dialog_negative_button_text">Sefsex</string>
 
@@ -2425,6 +2449,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="debug_drawer_back_button_content_description">Inig ar deffir</string>
     <!-- The title of the Tab Tools feature in the Debug Drawer. -->
     <string name="debug_drawer_tab_tools_title">Ifecka n yiccer</string>
+    <!-- The title of the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_title">Amḍan n waccaren</string>
     <!-- The active tab count category in the tab count section in Tab Tools. -->
     <string name="debug_drawer_tab_tools_tab_count_normal">Urmid</string>
     <!-- The inactive tab count category in the tab count section in Tab Tools. -->
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 8dcbb001c..03d13eb44 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -247,6 +247,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Upraviť domovskú stránku</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Úvodná obrazovka</string>
@@ -254,6 +255,10 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Vymazať históriu prehliadania</string>
+
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Preložiť stránku</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Vybraný jazyk</string>
@@ -265,8 +270,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skenovať</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Vyhľadávač</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Nastavenia vyhľadávania</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -323,14 +326,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Upozornenia vám pomôžu vyťažiť z prehliadača %s ešte viac</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Upozornenia vám pomôžu vyťažiť z prehliadača %s ešte viac</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synchronizujte svoje karty medzi zariadeniami, spravujte sťahovanie, získajte tipy, ako čo najlepšie využiť ochranu súkromia prehliadača %s a ďalšie.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synchronizujte svoje karty medzi zariadeniami, spravujte sťahovanie, získajte tipy, ako čo najlepšie využiť ochranu súkromia prehliadača %s a ďalšie.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Pokračovať</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Pokračovať</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Teraz nie</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Teraz nie</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -449,21 +452,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Režim &quot;Len HTTPS&quot;</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Zníženie počtu bannerov k súborom cookie</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blokovanie bannerov k súborom cookie</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blokovať bannery k súborom cookie v súkromnom prehliadaní</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Znižovať počet bannerov k súborom cookie</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Vypnuté</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Zapnuté</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s sa automaticky pokúša odmietnuť žiadosti o súbory cookie na banneroch k súborom cookie.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Vypnuté pre túto stránku</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -481,36 +474,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Stránka momentálne nie je podporovaná</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Zapnúť znižovanie počtu bannerov k súborom cookie pre %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Zapnúť blokovanie bannerov k súborom cookie pre %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Vypnúť znižovanie počtu bannerov k súborom cookie pre %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Vypnúť blokovanie bannerov k súborom cookie pre %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s nemôže automaticky odmietnuť žiadosti o súbory cookie na tejto stránke. Môžete však poslať žiadosť o podporu tejto stránky v budúcnosti.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s vymaže súbory cookie tohto webu a obnoví stránku. Vymazanie všetkých súborov cookie vás môže odhlásiť zo stránky alebo vyprázdniť nákupné košíky.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Po vypnutí %1$s vymaže súbory cookie a znova načíta túto lokalitu. Môže vás to odhlásiť alebo vyprázdniť nákupné košíky.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s sa pokúša automaticky odmietnuť všetky žiadosti o súbory cookie na podporovaných stránkach.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Po zapnutí sa %1$s pokúsi automaticky odmietnuť všetky bannery k súborom cookie na tejto stránke.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Povoliť prehliadaču %1$s odmietnuť bannery k súborom cookie?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s môže automaticky odmietnuť mnoho žiadostí o povolenie súborov cookie.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Teraz nie</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Uvidíte menej žiadostí o súbory cookie</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Povoliť</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s pre vás práve odmietol súbory cookie</string>
@@ -1299,8 +1273,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Zavrieť</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Chyba tlače</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Túto stránku nie je možné vytlačiť</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Tlačiť</string>
@@ -1920,7 +1892,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené kreditné karty v prípade, že vaše zariadenie bude používať niekto iný.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené karty v prípade, že vaše zariadenie bude používať niekto iný.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené spôsoby platby v prípade, že vaše zariadenie bude používať niekto iný.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Nastaviť teraz</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2081,12 +2053,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Možnosti hesiel</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Upraviteľné textové pole pre webovú adresu.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Upraviteľné textové pole pre webovú stránku, kde používate toto heslo.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Upraviteľné textové pole pre webovú adresu.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Upraviteľné textové pole pre používateľské meno.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Upraviteľné textové pole pre používateľské meno, ktoré používate s týmto heslom.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Upraviteľné textové pole pre používateľské meno.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Upraviteľné textové pole pre heslo.</string>
     <!--  The editable text field for a login's password. -->
@@ -2284,8 +2256,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Najdôležitejšie informácie</b> pochádzajú z recenzií v obchode %s uverejnených za posledných 80 dní, ktoré považujeme za spoľahlivé.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Ďalšie informácie o tom, %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">ako %s od Mozilly určuje kvalitu recenzie</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">ako %s určuje kvalitu recenzie</string>
     <!-- Text for title of settings section. -->
@@ -2470,6 +2440,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Práve prebieha preklad</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Zvoľte jazyk</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Pri preklade sa vyskytol problém. Prosím skúste to znova.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2483,19 +2455,19 @@
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Nastavenia prekladov</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to always offer or suggest translations when available. -->
-    <string name="translation_option_bottom_sheet_always_translate">Vždy ponúkať preklad</string>
+    <string name="translation_option_bottom_sheet_always_translate">Vždy ponúknuť preklad</string>
     <!-- Toggle switch label that allows a user to set if they would like a given language to automatically translate or not. The first parameter is the language name, for example, "Spanish". -->
-    <string name="translation_option_bottom_sheet_always_translate_in_language">Vždy prekladať jazyk %1$s</string>
+    <string name="translation_option_bottom_sheet_always_translate_in_language">Vždy prekladať z jazyka %1$s</string>
     <!-- Toggle switch label that allows a user to set if they would like to never be offered a translation of the given language. The first parameter is the language name, for example, "Spanish". -->
     <string name="translation_option_bottom_sheet_never_translate_in_language">Nikdy neprekladať z jazyka %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Nikdy neprekladať túto stránku</string>
     <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
-    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Prepíše všetky ostatné nastavenia</string>
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Má prednosť pred ostatnými nastaveniami</string>
     <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
-    <string name="translation_option_bottom_sheet_switch_description">Prepíše ponuky na preklad</string>
+    <string name="translation_option_bottom_sheet_switch_description">Nebude ponúkať preklad</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
-    <string name="translation_option_bottom_sheet_translation_settings">Nastavenia prekladu</string>
+    <string name="translation_option_bottom_sheet_translation_settings">Nastavenia prekladov</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translation_option_bottom_sheet_about_translations">Informácie o prekladoch v aplikácii %1$s</string>
 
@@ -2505,13 +2477,13 @@
     <!-- Toggle switch label that indicates that the browser should signal or indicate when a translation is possible for any page. -->
     <string name="translation_settings_offer_to_translate">Ak je to možné, ponúknuť preklad</string>
     <!-- Toggle switch label that indicates that downloading files required for translating is permitted when using data saver mode in Android. -->
-    <string name="translation_settings_always_download">Vždy sťahovať jazyky v režime šetrenia dát</string>
+    <string name="translation_settings_always_download">Sťahovať jazyky aj v režime šetrenia dát</string>
     <!-- Section header text that begins the section of a list of different options the user may select to adjust their translation preferences. -->
     <string name="translation_settings_translation_preference">Nastavenia prekladania obsahu</string>
     <!-- Button text for the button that will take the user to the automatic translations settings dialog. On the automatic translations settings dialog, the user can set if translations should occur automatically for a given language. -->
     <string name="translation_settings_automatic_translation">Automatický preklad</string>
     <!-- Button text for the button that will take the user to the never translate these sites dialog. On the never translate these sites dialog, the user can set if translations should never occur on certain websites. -->
-    <string name="translation_settings_automatic_never_translate_sites">Nikdy neprekladať tieto stránky</string>
+    <string name="translation_settings_automatic_never_translate_sites">Neprekladať tieto stránky</string>
     <!-- Button text for the button that will take the user to the download languages dialog. On the download languages dialog, the user can manage which languages they would like to download for translations. -->
     <string name="translation_settings_download_language">Stiahnuť jazyky</string>
 
@@ -2520,7 +2492,7 @@
     <string name="automatic_translation_toolbar_title_preference">Automatický preklad</string>
 
     <!-- Screen header presenting the automatic translation preference feature. It will appear under the toolbar. -->
-    <string name="automatic_translation_header_preference">Vyberte jazyk, pre ktorý chcete spravovať predvoľby „vždy prekladať“ a „nikdy neprekladať“.</string>
+    <string name="automatic_translation_header_preference">Vyberte jazyk, pre ktorý chcete spravovať predvoľby „Vždy prekladať“ a „Nikdy neprekladať“.</string>
 
     <!-- Automatic translation options preference screen -->
     <!-- Preference option for offering to translate. Radio button title text.-->
@@ -2557,7 +2529,7 @@
     <!-- Title of the download languages preference screen toolbar.-->
     <string name="download_languages_toolbar_title_preference">Stiahnite si jazyky</string>
     <!-- Screen header presenting the download language preference feature. It will appear under the toolbar.The first parameter is "Learn More," a clickable text with a link. Talkback will append this to say "Double tap to open link to learn more". -->
-    <string name="download_languages_header_preference">Stiahnite si kompletné jazyky pre rýchlejšie preklady a preklady offline. %1$s</string>
+    <string name="download_languages_header_preference">Ak chcete rýchlejšie preklady alebo preklady offline, musíte si stiahnuť kompletné jazykové balíky. %1$s</string>
     <!-- Clickable text from the screen header that links to a website. -->
     <string name="download_languages_header_learn_more_preference">Ďalšie informácie</string>
     <!-- The subhead of the download language preference screen will appear above the pivot language. -->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 8f3a2ebfd..403d88a38 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -1790,6 +1790,8 @@
     <string name="preferences_credit_cards">Kreditne kartice</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Shrani in samodejno izpolni kartice</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Shranjuj in izpolnjuj načine plačila</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Podatki so šifrirani</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
@@ -1816,6 +1818,9 @@
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Vključi podatke, kot so številke, e-poštni naslovi in naslovi za dostavo</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Vključuje telefonske številke in e-poštne naslove</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Dodaj kartico</string>
     <!-- Title of the "Edit card" screen -->
@@ -2402,6 +2407,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Prevajanje poteka</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Izberite jezik</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Pri prevajanju je prišlo do težave. Poskusite znova.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2498,6 +2505,8 @@
     <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
     <string name="delete_language_file_dialog_negative_button_text">Prekliči</string>
 
+    <!-- Checkbox label text on the data saving mode warning dialog used by the translations feature. This checkbox allows users to ignore the data usage warnings. -->
+    <string name="download_language_file_dialog_checkbox_text">Vedno prenesi tudi ob varčevanju s podatki</string>
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
     <string name="download_language_file_dialog_positive_button_text">Prenesi</string>
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file and perform a translation. -->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 5dbb20346..152ab7fc3 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -241,6 +241,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">ปรับแต่งหน้าแรก</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">หน้าแรก</string>
@@ -248,6 +249,7 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">ล้างประวัติการเรียกดู</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">ภาษาที่เลือก</string>
@@ -1304,6 +1306,8 @@
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
     <string name="notification_erase_title_android_14">ปิดแท็บส่วนตัว?</string>
 
+    <string name="notification_erase_text_android_14">แตะหรือปัดการแจ้งเตือนนี้เพื่อปิดแท็บส่วนตัว</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">การตลาด</string>
 
@@ -2283,8 +2287,18 @@
     <string name="review_quality_check_no_analysis_link">ตรวจสอบคุณภาพบทวิจารณ์</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">ลองใช้คำแนะนำที่เชื่อถือได้ของเราเกี่ยวกับบทวิจารณ์ผลิตภัณฑ์</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">ดูว่าบทวิจารณ์ผลิตภัณฑ์น่าเชื่อถือแค่ไหนใน %1$s ก่อนตัดสินใจซื้อ ตัวตรวจสอบบทวิจารณ์ ซึ่งเป็นคุณลักษณะทดลองจาก %2$s ถูกบรรจุไว้ภายในตัวเบราว์เซอร์โดยตรง ซึ่งสามารถใช้ใน %3$s และ %4$s ได้ด้วย</string>
+    <!-- Description for review quality check contextual onboarding card. The first parameters is for retailer name (e.g. Amazon). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description_one_vendor">ดูว่าบทวิจารณ์ผลิตภัณฑ์น่าเชื่อถือแค่ไหนใน %1$s ก่อนตัดสินใจซื้อ ตัวตรวจสอบบทวิจารณ์ ซึ่งเป็นคุณลักษณะทดลองจาก %2$s ถูกบรรจุไว้ภายในตัวเบราว์เซอร์โดยตรง</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">ด้วยการใช้พลังของ %1$s โดย Mozilla เราช่วยให้คุณหลีกเลี่ยงบทวิจารณ์ที่มีอคติและไม่น่าไว้วางใจได้ โมเดล AI ของเราจะปรับปรุงอยู่เสมอเพื่อปกป้องคุณในขณะที่คุณซื้อของ %2$s</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">เรียนรู้เพิ่มเติม</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">การเลือก “ใช่ ลองใช้เลย” ถือว่าคุณยอมรับ%2$sและ%3$sของ %1$s โดย Mozilla</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
+    <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">การเลือก “ใช่ ลองใช้เลย” ถือว่าคุณยอมรับข้อตกลงต่อไปนี้จาก %1$s:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy">นโยบายความเป็นส่วนตัว</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
@@ -2297,6 +2311,8 @@
     <string name="review_quality_check_contextual_onboarding_primary_button_text">ใช่ลองดู</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_secondary_button_text">ไม่ใช่ตอนนี้</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">ค้นพบว่าคุณสามารถเชื่อถือบทวิจารณ์ของผลิตภัณฑ์นี้ได้หรือไม่ ก่อนที่คุณจะตัดสินใจซื้อ</string>
     <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">ลองตัวตรวจสอบบทวิจารณ์</string>
     <!-- Text for the second CFR presenting the review quality check feature. -->
@@ -2357,6 +2373,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">แปลหน้านี้?</string>
+    <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translations_bottom_sheet_title_first_time">ลองใช้การแปลแบบส่วนตัวใน %1$s</string>
+    <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
+    <string name="translations_bottom_sheet_info_message">เพื่อความเป็นส่วนตัวของคุณ ข้อมูลการแปลจะไม่ออกไปนอกอุปกรณ์ของคุณ ภาษาและการปรับปรุงใหม่ๆ จะมาในเร็วๆ นี้! %1$s</string>
     <!-- Text that links to additional information about the Firefox translations feature. -->
     <string name="translations_bottom_sheet_info_message_learn_more">เรียนรู้เพิ่มเติม</string>
     <!-- Label for the dropdown to select which language to translate from on the translations dialog. Usually the translate from language selected will be the same as the page language. -->
@@ -2378,6 +2398,13 @@
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">เกิดปัญหาในการแปล โปรดลองอีกครั้ง</string>
 
+    <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
+    <string name="translation_error_could_not_load_languages_warning_text">ไม่สามารถโหลดภาษาได้ โปรดตรวจสอบการเชื่อมต่ออินเทอร์เน็ตของคุณแล้วลองอีกครั้ง</string>
+    <!-- The title of the warning card informs the user that a language is not supported. The first parameter is the name of the language that is not supported. -->
+    <string name="translation_error_language_not_supported_warning_text">ขออภัย เรายังไม่รองรับภาษา%1$s</string>
+    <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
+    <string name="translation_error_language_not_supported_learn_more">เรียนรู้เพิ่มเติม</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">ตัวเลือกการแปล</string>
@@ -2476,11 +2503,30 @@
     <!-- Content description (not visible, for screen readers etc.): For a language list item that is selected. -->
     <string name="download_languages_item_content_description_selected_state">เลือกแล้ว</string>
 
+    <!-- Title for the dialog used by the translations feature to confirm deleting a language.
+    The dialog will be presented when the user requests deletion of a language.
+    The first parameter is the name of the language, for example, "Spanish" and the second parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_file_dialog_title">ลบ %1$s (%2$s) หรือไม่?</string>
+    <!-- Additional information for the dialog used by the translations feature to confirm deleting a language. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="delete_language_file_dialog_message">หากคุณลบภาษานี้ %1$s จะดาวน์โหลดภาษาบางส่วนลงในแคชของคุณในขณะที่คุณแปล</string>
+    <!-- Title for the dialog used by the translations feature to confirm deleting all languages file.
+    The dialog will be presented when the user requests deletion of all languages file.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_all_languages_file_dialog_title">ลบทุกภาษา (%1$s) หรือไม่?</string>
+    <!-- Additional information for the dialog used by the translations feature to confirm deleting all languages file. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="delete_language_all_languages_file_dialog_message">หากคุณลบทุกภาษา %1$s จะดาวน์โหลดภาษาบางส่วนลงในแคชของคุณในขณะที่คุณแปล</string>
     <!-- Button text on the dialog used by the translations feature to confirm deleting a language. -->
     <string name="delete_language_file_dialog_positive_button_text">ลบ</string>
     <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
     <string name="delete_language_file_dialog_negative_button_text">ยกเลิก</string>
 
+    <!-- Title for the data saving mode warning dialog used by the translations feature.
+    This dialog will be presented when the user attempts to download a language or perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file.-->
+    <string name="download_language_file_dialog_title">ดาวน์โหลดขณะอยู่ในโหมดประหยัดข้อมูล (%1$s) หรือไม่?</string>
+    <!-- Additional information for the data saving mode warning dialog used by the translations feature. This text explains the reason a download is required for a translation. -->
+    <string name="download_language_file_dialog_message_all_languages">เราดาวน์โหลดภาษาบางส่วนลงในแคชของคุณเพื่อให้การแปลเป็นส่วนตัว</string>
     <!-- Checkbox label text on the data saving mode warning dialog used by the translations feature. This checkbox allows users to ignore the data usage warnings. -->
     <string name="download_language_file_dialog_checkbox_text">ดาวน์โหลดในโหมดประหยัดข้อมูลเสมอ</string>
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
@@ -2495,6 +2541,10 @@
     <string name="debug_drawer_title">เครื่องมือดีบัก</string>
     <!-- Content description (not visible, for screen readers etc.): Navigate back within the debug drawer. -->
     <string name="debug_drawer_back_button_content_description">นำทางย้อนกลับ</string>
+    <!-- The title of the Tab Tools feature in the Debug Drawer. -->
+    <string name="debug_drawer_tab_tools_title">เครื่องมือแท็บ</string>
+    <!-- The title of the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_title">จำนวนแท็บ</string>
     <!-- The active tab count category in the tab count section in Tab Tools. -->
     <string name="debug_drawer_tab_tools_tab_count_normal">ใช้งานอยู่</string>
     <!-- The inactive tab count category in the tab count section in Tab Tools. -->
@@ -2503,6 +2553,10 @@
     <string name="debug_drawer_tab_tools_tab_count_private">ส่วนตัว</string>
     <!-- The total tab count category in the tab count section in Tab Tools. -->
     <string name="debug_drawer_tab_tools_tab_count_total">รวมทั้งหมด</string>
+    <!-- The title of the tab creation tool section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_title">เครื่องมือสร้างแท็บ</string>
+    <!-- The label of the text field in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_text_field_label">จำนวนแท็บที่จะสร้าง</string>
     <!-- The button text to add tabs to the active tab group in the tab creation tool. -->
     <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_active">เพิ่มไปยังแท็บที่ใช้งานอยู่</string>
     <!-- The button text to add tabs to the inactive tab group in the tab creation tool. -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index fededc1bb..90504d5da 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -244,6 +244,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Налаштувати домівку</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Домашній екран</string>
@@ -251,6 +252,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Стерти історію перегляду</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Перекласти сторінку</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Обрана мова</string>
@@ -1887,7 +1891,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених банківських карток від інших, хто може отримати доступ до вашого пристрою.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених банківських карток від інших, хто може отримати доступ до вашого пристрою.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених способів оплати від інших, хто може отримати доступ до вашого пристрою.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Встановити</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2050,12 +2054,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Параметри пароля</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Текстове поле для редагування вебадреси запису.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Текстове поле для редагування адреси вебсайту.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Текстове поле для редагування адреси вебсайту.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Текстове поле для редагування імені користувача запису.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Текстове поле для редагування імені користувача.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Текстове поле для редагування імені користувача.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Текстове поле для редагування пароля запису.</string>
     <!--  The editable text field for a login's password. -->
@@ -2436,6 +2440,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Виконується переклад</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Вибрати мову</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Виникла проблема з перекладом. Повторіть спробу.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->

From b98ddf8a46f2f2b0c1ddb0fcdf1523b8098f5845 Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Mon, 11 Dec 2023 18:51:12 +0200
Subject: [PATCH 086/222] Bug 1870050 - Upgrade AGP and kotlin dsl version.

Also sync lint version.
---
 plugins/apksize/build.gradle           | 2 +-
 plugins/fenixdependencies/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/apksize/build.gradle b/plugins/apksize/build.gradle
index 77b077a8b..5a38f6a8b 100644
--- a/plugins/apksize/build.gradle
+++ b/plugins/apksize/build.gradle
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 plugins {
-    id "org.gradle.kotlin.kotlin-dsl" version "4.1.2"
+    id "org.gradle.kotlin.kotlin-dsl" version "4.2.1"
 }
 
 repositories {
diff --git a/plugins/fenixdependencies/build.gradle b/plugins/fenixdependencies/build.gradle
index 7e8043a2a..f74423c7a 100644
--- a/plugins/fenixdependencies/build.gradle
+++ b/plugins/fenixdependencies/build.gradle
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 plugins {
-    id "org.gradle.kotlin.kotlin-dsl" version "4.1.2"
+    id "org.gradle.kotlin.kotlin-dsl" version "4.2.1"
 }
 
 repositories {

From 030332e0c7427c9fcca416b30a576822d3e1fae0 Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Tue, 12 Dec 2023 10:58:48 +0200
Subject: [PATCH 087/222] Bug 1870050 - Suppress RestrictedApi lint

---
 app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt | 2 +-
 app/src/main/java/org/mozilla/fenix/ext/Toolbar.kt              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt b/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt
index 9bbc4d0b6..3909a52c0 100644
--- a/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt
@@ -121,7 +121,7 @@ class FenixSnackbar private constructor(
          * Suppressing ComplexCondition. Yes it's unfortunately complex but that's the nature
          * of the snackbar handling by Android. It will be simpler once dynamic toolbar is always on.
          */
-        @Suppress("ComplexCondition")
+        @Suppress("ComplexCondition", "RestrictedApi")
         fun make(
             view: View,
             duration: Int = LENGTH_LONG,
diff --git a/app/src/main/java/org/mozilla/fenix/ext/Toolbar.kt b/app/src/main/java/org/mozilla/fenix/ext/Toolbar.kt
index b7e9b953b..c7b6325db 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/Toolbar.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/Toolbar.kt
@@ -33,6 +33,7 @@ fun Toolbar.setToolbarColors(@ColorInt foreground: Int, @ColorInt background: In
     }
 }
 
+@Suppress("RestrictedApi")
 private fun themeActionMenuView(item: ActionMenuView, colorFilter: ColorFilter?) {
     item.forEach { innerChild ->
         if (innerChild is ActionMenuItemView) {

From 1407f921714dbe8a61904e9b43dff04fbaef7b62 Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Tue, 12 Dec 2023 10:59:07 +0200
Subject: [PATCH 088/222] Bug 1870050 - Suppress false positive DiffUtilEquals
 lint

---
 .../java/org/mozilla/fenix/home/topsites/TopSitesPagerAdapter.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/org/mozilla/fenix/home/topsites/TopSitesPagerAdapter.kt b/app/src/main/java/org/mozilla/fenix/home/topsites/TopSitesPagerAdapter.kt
index 0a56a0c9c..a480f861a 100644
--- a/app/src/main/java/org/mozilla/fenix/home/topsites/TopSitesPagerAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/topsites/TopSitesPagerAdapter.kt
@@ -97,6 +97,7 @@ class TopSitesPagerAdapter(
         }
 
         override fun areContentsTheSame(oldItem: List<TopSite>, newItem: List<TopSite>): Boolean {
+            @Suppress("DiffUtilEquals")
             return newItem.zip(oldItem).all { (new, old) -> new == old }
         }
 

From a92d52af807c8b046227dd117f3439a6ad79a726 Mon Sep 17 00:00:00 2001
From: DreVla <vlad.dreghici@gmail.com>
Date: Fri, 2 Feb 2024 12:22:02 +0200
Subject: [PATCH 089/222] Bug 1840969 - Add title for homepage default browser
 info card

Title for the card info to set Firefox as default browser was
missing, "Switch your default browser" is the title now, to
match with iOS.
---
 app/messaging-evergreen-messages.fml.yaml                  | 1 +
 app/src/main/java/org/mozilla/fenix/compose/MessageCard.kt | 4 ++--
 app/src/main/res/values/strings.xml                        | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/messaging-evergreen-messages.fml.yaml b/app/messaging-evergreen-messages.fml.yaml
index a09773ac5..36e7d2b15 100644
--- a/app/messaging-evergreen-messages.fml.yaml
+++ b/app/messaging-evergreen-messages.fml.yaml
@@ -25,6 +25,7 @@ import:
         - value:
             messages:
               default-browser:
+                title: default_browser_experiment_card_title
                 text: default_browser_experiment_card_text
                 surface: homescreen
                 action: "MAKE_DEFAULT_BROWSER"
diff --git a/app/src/main/java/org/mozilla/fenix/compose/MessageCard.kt b/app/src/main/java/org/mozilla/fenix/compose/MessageCard.kt
index d5a6cc1d8..d3669470c 100644
--- a/app/src/main/java/org/mozilla/fenix/compose/MessageCard.kt
+++ b/app/src/main/java/org/mozilla/fenix/compose/MessageCard.kt
@@ -208,7 +208,7 @@ private fun MessageCardPreview() {
         ) {
             MessageCard(
                 messageText = stringResource(id = R.string.default_browser_experiment_card_text),
-                titleText = stringResource(id = R.string.bookmark_empty_title_error),
+                titleText = stringResource(id = R.string.default_browser_experiment_card_title),
                 onClick = {},
                 onCloseButtonClick = {},
             )
@@ -245,7 +245,7 @@ private fun MessageCardWithButtonLabelPreview() {
         ) {
             MessageCard(
                 messageText = stringResource(id = R.string.default_browser_experiment_card_text),
-                titleText = stringResource(id = R.string.bookmark_empty_title_error),
+                titleText = stringResource(id = R.string.default_browser_experiment_card_title),
                 buttonText = stringResource(id = R.string.preferences_set_as_default_browser),
                 onClick = {},
                 onCloseButtonClick = {},
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ad5d9588a..119fb2d1d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2089,6 +2089,9 @@
     <string name="other_default_search_engine_suggestion_header">%s search</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Switch your default browser</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Set links from websites, emails, and messages to open automatically in Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->

From a1c7fca0d376d66679c2a57ffb95717f52643013 Mon Sep 17 00:00:00 2001
From: RebecaTudor <rebecatudor273@gmail.com>
Date: Wed, 31 Jan 2024 17:25:55 +0200
Subject: [PATCH 090/222] Bug 1809798 - Loads the right wallpaper when changing
 orientation

Because of the android:configChanges from Manifest that disable the
automate Activity recreation, the responsibility of handling the
configuration changes is transferred to Activity. When configurations
changes, onConfigurationChanged() is called.

So now when this function called, the correct orientation is sent
forward as parameter of applyWallpaper.
---
 .../org/mozilla/fenix/home/HomeFragment.kt    | 23 ++++++++++----
 .../fenix/wallpapers/WallpapersUseCases.kt    | 21 +++++++------
 .../wallpapers/WallpapersUseCasesTest.kt      | 30 ++++++++++++++-----
 3 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 056677d96..588737e35 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -248,7 +248,11 @@ class HomeFragment : Fragment() {
         val components = requireComponents
 
         val currentWallpaperName = requireContext().settings().currentWallpaperName
-        applyWallpaper(wallpaperName = currentWallpaperName, orientationChange = false)
+        applyWallpaper(
+            wallpaperName = currentWallpaperName,
+            orientationChange = false,
+            orientation = requireContext().resources.configuration.orientation,
+        )
 
         components.appStore.dispatch(AppAction.ModeChange(browsingModeManager.mode))
 
@@ -454,7 +458,11 @@ class HomeFragment : Fragment() {
         homeMenuView?.dismissMenu()
 
         val currentWallpaperName = requireContext().settings().currentWallpaperName
-        applyWallpaper(wallpaperName = currentWallpaperName, orientationChange = true)
+        applyWallpaper(
+            wallpaperName = currentWallpaperName,
+            orientationChange = true,
+            orientation = newConfig.orientation,
+        )
     }
 
     /**
@@ -999,7 +1007,7 @@ class HomeFragment : Fragment() {
     internal fun shouldEnableWallpaper() =
         (activity as? HomeActivity)?.themeManager?.currentTheme?.isPrivate?.not() ?: false
 
-    private fun applyWallpaper(wallpaperName: String, orientationChange: Boolean) {
+    private fun applyWallpaper(wallpaperName: String, orientationChange: Boolean, orientation: Int) {
         when {
             !shouldEnableWallpaper() ||
                 (wallpaperName == lastAppliedWallpaperName && !orientationChange) -> return
@@ -1012,8 +1020,7 @@ class HomeFragment : Fragment() {
                     // loadBitmap does file lookups based on name, so we don't need a fully
                     // qualified type to load the image
                     val wallpaper = Wallpaper.Default.copy(name = wallpaperName)
-                    val wallpaperImage =
-                        context?.let { requireComponents.useCases.wallpaperUseCases.loadBitmap(it, wallpaper) }
+                    val wallpaperImage = requireComponents.useCases.wallpaperUseCases.loadBitmap(wallpaper, orientation)
                     wallpaperImage?.let {
                         it.scaleToBottomOfView(binding.wallpaperImageView)
                         binding.wallpaperImageView.isVisible = true
@@ -1059,7 +1066,11 @@ class HomeFragment : Fragment() {
                 .distinctUntilChanged()
                 .collect {
                     if (it.name != lastAppliedWallpaperName) {
-                        applyWallpaper(wallpaperName = it.name, orientationChange = false)
+                        applyWallpaper(
+                            wallpaperName = it.name,
+                            orientationChange = false,
+                            orientation = requireContext().resources.configuration.orientation,
+                        )
                     }
                 }
         }
diff --git a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpapersUseCases.kt b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpapersUseCases.kt
index 8d9eb7077..cdb70c163 100644
--- a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpapersUseCases.kt
+++ b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpapersUseCases.kt
@@ -5,14 +5,13 @@
 package org.mozilla.fenix.wallpapers
 
 import android.content.Context
+import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import androidx.annotation.UiContext
 import androidx.annotation.VisibleForTesting
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import mozilla.components.concept.fetch.Client
-import mozilla.components.support.utils.ext.isLandscape
 import org.mozilla.fenix.components.AppStore
 import org.mozilla.fenix.components.appstate.AppAction
 import org.mozilla.fenix.ext.settings
@@ -160,25 +159,25 @@ class WallpapersUseCases(
         /**
          * Load the bitmap for a [wallpaper], if available.
          *
-         * @param context The context used to get wallpaper orientation.
          * @param wallpaper The wallpaper to load a bitmap for.
+         * @param orientation The orientation of wallpaper.
          */
-        suspend operator fun invoke(@UiContext context: Context, wallpaper: Wallpaper): Bitmap?
+        suspend operator fun invoke(wallpaper: Wallpaper, orientation: Int): Bitmap?
     }
 
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     internal class DefaultLoadBitmapUseCase(
         private val getFilesDir: suspend () -> File,
     ) : LoadBitmapUseCase {
-        override suspend fun invoke(@UiContext context: Context, wallpaper: Wallpaper): Bitmap? =
-            loadWallpaperFromDisk(context, wallpaper)
+        override suspend fun invoke(wallpaper: Wallpaper, orientation: Int): Bitmap? =
+            loadWallpaperFromDisk(wallpaper, orientation)
 
         @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
         internal suspend fun loadWallpaperFromDisk(
-            @UiContext context: Context,
             wallpaper: Wallpaper,
+            orientation: Int,
         ): Bitmap? = Result.runCatching {
-            val path = wallpaper.getLocalPathFromContext(context)
+            val path = wallpaper.getLocalPathFromContext(orientation)
             withContext(Dispatchers.IO) {
                 val file = File(getFilesDir(), path)
                 BitmapFactory.decodeStream(file.inputStream())
@@ -189,13 +188,13 @@ class WallpapersUseCases(
          * Get the expected local path on disk for a wallpaper. This will differ depending
          * on orientation and app theme.
          */
-        private fun Wallpaper.getLocalPathFromContext(@UiContext context: Context): String {
-            val orientation = if (context.isLandscape()) {
+        private fun Wallpaper.getLocalPathFromContext(orientation: Int): String {
+            val orientationWallpaper = if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
                 Wallpaper.ImageType.Landscape
             } else {
                 Wallpaper.ImageType.Portrait
             }
-            return Wallpaper.getLocalPath(name, orientation)
+            return Wallpaper.getLocalPath(name, orientationWallpaper)
         }
     }
 
diff --git a/app/src/test/java/org/mozilla/fenix/wallpapers/WallpapersUseCasesTest.kt b/app/src/test/java/org/mozilla/fenix/wallpapers/WallpapersUseCasesTest.kt
index e2716f300..858f2c2db 100644
--- a/app/src/test/java/org/mozilla/fenix/wallpapers/WallpapersUseCasesTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/wallpapers/WallpapersUseCasesTest.kt
@@ -4,7 +4,7 @@
 
 package org.mozilla.fenix.wallpapers
 
-import android.content.Context
+import android.content.res.Configuration
 import io.mockk.Runs
 import io.mockk.coEvery
 import io.mockk.coVerify
@@ -31,7 +31,8 @@ import org.mozilla.fenix.wallpapers.LegacyWallpaperMigration.Companion.TURNING_R
 import org.mozilla.fenix.wallpapers.LegacyWallpaperMigration.Companion.TURNING_RED_PANDA_WALLPAPER_NAME
 import org.mozilla.fenix.wallpapers.LegacyWallpaperMigration.Companion.TURNING_RED_WALLPAPER_TEXT_COLOR
 import java.io.File
-import java.util.*
+import java.util.Calendar
+import java.util.Date
 import kotlin.random.Random
 
 class WallpapersUseCasesTest {
@@ -496,18 +497,33 @@ class WallpapersUseCasesTest {
     }
 
     @Test
-    fun `GIVEN the context WHEN bitmap is loaded THEN loadWallpaperFromDisk method is called with the correct context and wallpaper`() =
+    fun `GIVEN the portrait orientation WHEN bitmap is loaded THEN loadWallpaperFromDisk method is called with the correct wallpaper and orientation`() =
         runTest {
             val wallpaper: Wallpaper = mockk {
                 every { name } returns "test"
             }
-            val context = mockk<Context>(relaxed = true)
+            val orientation = Configuration.ORIENTATION_PORTRAIT
             val defaultLoadBitmapUseCase = spyk(WallpapersUseCases.DefaultLoadBitmapUseCase { mockFolder })
-            coEvery { defaultLoadBitmapUseCase.loadWallpaperFromDisk(context, wallpaper) } returns mockk()
+            coEvery { defaultLoadBitmapUseCase.loadWallpaperFromDisk(wallpaper, orientation) } returns mockk()
 
-            defaultLoadBitmapUseCase.invoke(context, wallpaper)
+            defaultLoadBitmapUseCase.invoke(wallpaper, orientation)
 
-            coVerify { defaultLoadBitmapUseCase.loadWallpaperFromDisk(context, wallpaper) }
+            coVerify { defaultLoadBitmapUseCase.loadWallpaperFromDisk(wallpaper, orientation) }
+        }
+
+    @Test
+    fun `GIVEN the landscape orientation WHEN bitmap is loaded THEN loadWallpaperFromDisk method is called with the correct wallpaper and orientation`() =
+        runTest {
+            val wallpaper: Wallpaper = mockk {
+                every { name } returns "test"
+            }
+            val orientation = Configuration.ORIENTATION_LANDSCAPE
+            val defaultLoadBitmapUseCase = spyk(WallpapersUseCases.DefaultLoadBitmapUseCase { mockFolder })
+            coEvery { defaultLoadBitmapUseCase.loadWallpaperFromDisk(wallpaper, orientation) } returns mockk()
+
+            defaultLoadBitmapUseCase.invoke(wallpaper, orientation)
+
+            coVerify { defaultLoadBitmapUseCase.loadWallpaperFromDisk(wallpaper, orientation) }
         }
 
     private enum class TimeRelation {

From 9c687b88c9ad714463c513d0ba96997f7458fffd Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Fri, 2 Feb 2024 15:56:11 -0500
Subject: [PATCH 091/222] Bug 1878409 - Update Gradle to version 8.6

---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 gradlew.bat                              | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e0930..a80b22ce5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85be..7101f8e46 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

From 13adc68342de4544d40c2c0645031671d54520b0 Mon Sep 17 00:00:00 2001
From: Titouan Thibaud <tthibaud@mozilla.com>
Date: Mon, 5 Feb 2024 11:36:09 +0100
Subject: [PATCH 092/222] Bug 1807080 - Fix PTR dark theme colors

Co-authored-by: Jonathan Almeida <git@jonalmeida.com>
---
 .../org/mozilla/fenix/browser/BaseBrowserFragment.kt     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index b6fbe9a52..ae27629bb 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -942,9 +942,12 @@ abstract class BaseBrowserFragment :
         binding.swipeRefresh.isEnabled = shouldPullToRefreshBeEnabled(false)
 
         if (binding.swipeRefresh.isEnabled) {
-            val primaryTextColor =
-                ThemeManager.resolveAttribute(R.attr.textPrimary, context)
-            binding.swipeRefresh.setColorSchemeColors(primaryTextColor)
+            val primaryTextColor = ThemeManager.resolveAttribute(R.attr.textPrimary, context)
+            val primaryBackgroundColor = ThemeManager.resolveAttribute(R.attr.layer2, context)
+            binding.swipeRefresh.apply {
+                setColorSchemeResources(primaryTextColor)
+                setProgressBackgroundColorSchemeResource(primaryBackgroundColor)
+            }
             swipeRefreshFeature.set(
                 feature = SwipeRefreshFeature(
                     requireComponents.core.store,

From 68e0b8e621251e544724712da9a266a6fb83adf3 Mon Sep 17 00:00:00 2001
From: ohall-m <ohall@mozilla.com>
Date: Wed, 31 Jan 2024 10:09:30 -0500
Subject: [PATCH 093/222] Bug 1877712 - Update Mock Translations Languages

Bug updates mock display languages to match the current engine support.
---
 .../TranslationsDialogBottomSheet.kt          | 30 +++++------
 .../AutomaticTranslationPreference.kt         |  8 +--
 .../DownloadLanguagesPreference.kt            | 51 ++++---------------
 3 files changed, 25 insertions(+), 64 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogBottomSheet.kt b/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogBottomSheet.kt
index 6934d32d6..18b1f11cf 100644
--- a/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogBottomSheet.kt
+++ b/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogBottomSheet.kt
@@ -568,14 +568,14 @@ internal fun getTranslateFromLanguageList(): List<Language> {
     return mutableListOf<Language>().apply {
         add(
             Language(
-                code = Locale.CHINA.toLanguageTag(),
-                localizedDisplayName = Locale.CHINA.displayLanguage,
+                code = Locale.ENGLISH.toLanguageTag(),
+                localizedDisplayName = Locale.ENGLISH.displayLanguage,
             ),
         )
         add(
             Language(
-                code = Locale.ENGLISH.toLanguageTag(),
-                localizedDisplayName = Locale.ENGLISH.displayLanguage,
+                code = Locale.FRENCH.toLanguageTag(),
+                localizedDisplayName = Locale.FRENCH.displayLanguage,
             ),
         )
         add(
@@ -586,8 +586,8 @@ internal fun getTranslateFromLanguageList(): List<Language> {
         )
         add(
             Language(
-                code = Locale.JAPANESE.toLanguageTag(),
-                localizedDisplayName = Locale.JAPANESE.displayLanguage,
+                code = Locale.ITALIAN.toLanguageTag(),
+                localizedDisplayName = Locale.ITALIAN.displayLanguage,
             ),
         )
     }
@@ -598,14 +598,8 @@ internal fun getTranslateToLanguageList(): List<Language> {
     return mutableListOf<Language>().apply {
         add(
             Language(
-                code = Locale.KOREAN.toLanguageTag(),
-                localizedDisplayName = Locale.KOREAN.displayLanguage,
-            ),
-        )
-        add(
-            Language(
-                code = Locale.CANADA.toLanguageTag(),
-                localizedDisplayName = Locale.CANADA.displayLanguage,
+                code = Locale.ENGLISH.toLanguageTag(),
+                localizedDisplayName = Locale.ENGLISH.displayLanguage,
             ),
         )
         add(
@@ -616,14 +610,14 @@ internal fun getTranslateToLanguageList(): List<Language> {
         )
         add(
             Language(
-                code = Locale.ITALY.toLanguageTag(),
-                localizedDisplayName = Locale.ITALY.displayLanguage,
+                code = Locale.GERMAN.toLanguageTag(),
+                localizedDisplayName = Locale.GERMAN.displayLanguage,
             ),
         )
         add(
             Language(
-                code = Locale.GERMAN.toLanguageTag(),
-                localizedDisplayName = Locale.GERMAN.displayLanguage,
+                code = Locale.ITALIAN.toLanguageTag(),
+                localizedDisplayName = Locale.ITALIAN.displayLanguage,
             ),
         )
     }
diff --git a/app/src/main/java/org/mozilla/fenix/translations/preferences/automatic/AutomaticTranslationPreference.kt b/app/src/main/java/org/mozilla/fenix/translations/preferences/automatic/AutomaticTranslationPreference.kt
index 0cc3ffa2e..4ce45c4e2 100644
--- a/app/src/main/java/org/mozilla/fenix/translations/preferences/automatic/AutomaticTranslationPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/translations/preferences/automatic/AutomaticTranslationPreference.kt
@@ -78,25 +78,25 @@ internal fun getAutomaticTranslationListPreferences(): List<AutomaticTranslation
     return mutableListOf<AutomaticTranslationItemPreference>().apply {
         add(
             AutomaticTranslationItemPreference(
-                displayName = Locale.CANADA.displayLanguage,
+                displayName = Locale.ENGLISH.displayLanguage,
                 automaticTranslationOptionPreference = AutomaticTranslationOptionPreference.AlwaysTranslate(),
             ),
         )
         add(
             AutomaticTranslationItemPreference(
-                displayName = Locale.FRANCE.displayLanguage,
+                displayName = Locale.FRENCH.displayLanguage,
                 automaticTranslationOptionPreference = AutomaticTranslationOptionPreference.OfferToTranslate(),
             ),
         )
         add(
             AutomaticTranslationItemPreference(
-                displayName = Locale.GERMANY.displayLanguage,
+                displayName = Locale.GERMAN.displayLanguage,
                 automaticTranslationOptionPreference = AutomaticTranslationOptionPreference.NeverTranslate(),
             ),
         )
         add(
             AutomaticTranslationItemPreference(
-                displayName = Locale.CHINA.displayLanguage,
+                displayName = Locale.ITALIAN.displayLanguage,
                 automaticTranslationOptionPreference = AutomaticTranslationOptionPreference.AlwaysTranslate(),
             ),
         )
diff --git a/app/src/main/java/org/mozilla/fenix/translations/preferences/downloadlanguages/DownloadLanguagesPreference.kt b/app/src/main/java/org/mozilla/fenix/translations/preferences/downloadlanguages/DownloadLanguagesPreference.kt
index 7089d3d1e..aaf9976e7 100644
--- a/app/src/main/java/org/mozilla/fenix/translations/preferences/downloadlanguages/DownloadLanguagesPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/translations/preferences/downloadlanguages/DownloadLanguagesPreference.kt
@@ -386,11 +386,11 @@ internal fun getLanguageListPreference(): List<DownloadLanguageItemPreference> {
             DownloadLanguageItemPreference(
                 languageModel = TranslationsController.RuntimeTranslation.LanguageModel(
                     TranslationsController.Language(
-                        Locale.CHINA.toLanguageTag(),
-                        Locale.CHINA.displayLanguage,
+                        Locale.FRENCH.toLanguageTag(),
+                        Locale.FRENCH.displayLanguage,
                     ),
                     false,
-                    4000,
+                    30000000,
                 ),
                 state = DownloadLanguageItemStatePreference(
                     type = DownloadLanguageItemTypePreference.GeneralLanguage,
@@ -402,28 +402,11 @@ internal fun getLanguageListPreference(): List<DownloadLanguageItemPreference> {
             DownloadLanguageItemPreference(
                 languageModel = TranslationsController.RuntimeTranslation.LanguageModel(
                     TranslationsController.Language(
-                        Locale.KOREAN.toLanguageTag(),
-                        Locale.KOREAN.displayLanguage,
+                        Locale.GERMAN.toLanguageTag(),
+                        Locale.GERMAN.displayLanguage,
                     ),
                     false,
-                    3000,
-                ),
-                state = DownloadLanguageItemStatePreference(
-                    type = DownloadLanguageItemTypePreference.GeneralLanguage,
-                    status = DownloadLanguageItemStatusPreference.NotDownloaded,
-                ),
-            ),
-        )
-
-        add(
-            DownloadLanguageItemPreference(
-                languageModel = TranslationsController.RuntimeTranslation.LanguageModel(
-                    TranslationsController.Language(
-                        Locale.FRANCE.toLanguageTag(),
-                        Locale.FRANCE.displayLanguage,
-                    ),
-                    false,
-                    2000,
+                    30000000,
                 ),
                 state = DownloadLanguageItemStatePreference(
                     type = DownloadLanguageItemTypePreference.GeneralLanguage,
@@ -439,7 +422,7 @@ internal fun getLanguageListPreference(): List<DownloadLanguageItemPreference> {
                         Locale.ITALIAN.displayLanguage,
                     ),
                     false,
-                    1000,
+                    30000000,
                 ),
                 state = DownloadLanguageItemStatePreference(
                     type = DownloadLanguageItemTypePreference.GeneralLanguage,
@@ -455,7 +438,7 @@ internal fun getLanguageListPreference(): List<DownloadLanguageItemPreference> {
                         Locale.ENGLISH.displayLanguage,
                     ),
                     true,
-                    3000,
+                    30000000,
                 ),
                 state = DownloadLanguageItemStatePreference(
                     type = DownloadLanguageItemTypePreference.PivotLanguage,
@@ -463,22 +446,6 @@ internal fun getLanguageListPreference(): List<DownloadLanguageItemPreference> {
                 ),
             ),
         )
-        add(
-            DownloadLanguageItemPreference(
-                languageModel = TranslationsController.RuntimeTranslation.LanguageModel(
-                    TranslationsController.Language(
-                        Locale.JAPANESE.toLanguageTag(),
-                        Locale.JAPANESE.displayLanguage,
-                    ),
-                    true,
-                    3000,
-                ),
-                state = DownloadLanguageItemStatePreference(
-                    type = DownloadLanguageItemTypePreference.GeneralLanguage,
-                    status = DownloadLanguageItemStatusPreference.NotDownloaded,
-                ),
-            ),
-        )
         add(
             DownloadLanguageItemPreference(
                 languageModel = TranslationsController.RuntimeTranslation.LanguageModel(
@@ -487,7 +454,7 @@ internal fun getLanguageListPreference(): List<DownloadLanguageItemPreference> {
                         stringResource(id = R.string.download_language_all_languages_item_preference),
                     ),
                     true,
-                    300000,
+                    90000000,
                 ),
                 state = DownloadLanguageItemStatePreference(
                     type = DownloadLanguageItemTypePreference.AllLanguages,

From 376ce3083156224a3227cb6a6e2baa54279e63bf Mon Sep 17 00:00:00 2001
From: Noah Bond <nbond@mozilla.com>
Date: Fri, 2 Feb 2024 09:24:23 -0800
Subject: [PATCH 094/222] Bug 1877123 - Fix number localization in `TabCounter`
 and `TabTools`

---
 .../org/mozilla/fenix/compose/TabCounter.kt   | 17 ++++++++++----
 .../java/org/mozilla/fenix/compose/ext/Int.kt | 15 +++++++++++++
 .../fenix/debugsettings/tabs/TabTools.kt      | 17 +++++++-------
 .../org/mozilla/fenix/compose/ext/IntTest.kt  | 22 +++++++++++++++++++
 4 files changed, 59 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/java/org/mozilla/fenix/compose/ext/Int.kt
 create mode 100644 app/src/test/java/org/mozilla/fenix/compose/ext/IntTest.kt

diff --git a/app/src/main/java/org/mozilla/fenix/compose/TabCounter.kt b/app/src/main/java/org/mozilla/fenix/compose/TabCounter.kt
index a2f2d0709..b35235f2f 100644
--- a/app/src/main/java/org/mozilla/fenix/compose/TabCounter.kt
+++ b/app/src/main/java/org/mozilla/fenix/compose/TabCounter.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.compose
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Icon
@@ -21,9 +22,11 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.mozilla.fenix.R
 import org.mozilla.fenix.compose.annotation.LightDarkPreview
+import org.mozilla.fenix.compose.ext.toLocaleString
 import org.mozilla.fenix.tabstray.TabsTrayTestTag
 import org.mozilla.fenix.theme.FirefoxTheme
 
@@ -48,19 +51,20 @@ private const val TAB_TEXT_BOTTOM_PADDING_RATIO = 4
 
 @Composable
 fun TabCounter(tabCount: Int) {
+    val formattedTabCount = tabCount.toLocaleString()
     val normalTabCountText: String
     val tabCountTextRatio: Float
     val needsBottomPaddingForInfiniteTabs: Boolean
 
     when (tabCount) {
         in MIN_SINGLE_DIGIT..MAX_SINGLE_DIGIT -> {
-            normalTabCountText = tabCount.toString()
+            normalTabCountText = formattedTabCount
             tabCountTextRatio = ONE_DIGIT_SIZE_RATIO
             needsBottomPaddingForInfiniteTabs = false
         }
 
         in TWO_DIGIT_THRESHOLD..MAX_VISIBLE_TABS -> {
-            normalTabCountText = tabCount.toString()
+            normalTabCountText = formattedTabCount
             tabCountTextRatio = TWO_DIGITS_SIZE_RATIO
             needsBottomPaddingForInfiniteTabs = false
         }
@@ -77,7 +81,7 @@ fun TabCounter(tabCount: Int) {
     } else {
         stringResource(
             id = R.string.mozac_tab_counter_open_tab_tray_plural,
-            tabCount.toString(),
+            formattedTabCount,
         )
     }
 
@@ -119,9 +123,14 @@ fun TabCounter(tabCount: Int) {
 }
 
 @LightDarkPreview
+@Preview(locale = "ar")
 @Composable
 private fun TabCounterPreview() {
     FirefoxTheme {
-        TabCounter(tabCount = 55)
+        Box(
+            modifier = Modifier.background(color = FirefoxTheme.colors.layer1),
+        ) {
+            TabCounter(tabCount = 55)
+        }
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/compose/ext/Int.kt b/app/src/main/java/org/mozilla/fenix/compose/ext/Int.kt
new file mode 100644
index 000000000..7d09419cc
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/compose/ext/Int.kt
@@ -0,0 +1,15 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.compose.ext
+
+import androidx.compose.ui.text.intl.Locale
+import java.text.NumberFormat
+import java.util.Locale as JavaLocale
+
+/**
+ * Returns a localized string representation of the value.
+ */
+fun Int.toLocaleString(): String =
+    NumberFormat.getNumberInstance(JavaLocale(Locale.current.language)).format(this)
diff --git a/app/src/main/java/org/mozilla/fenix/debugsettings/tabs/TabTools.kt b/app/src/main/java/org/mozilla/fenix/debugsettings/tabs/TabTools.kt
index c6daa5d80..5fa97b7c0 100644
--- a/app/src/main/java/org/mozilla/fenix/debugsettings/tabs/TabTools.kt
+++ b/app/src/main/java/org/mozilla/fenix/debugsettings/tabs/TabTools.kt
@@ -43,6 +43,7 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.compose.Divider
 import org.mozilla.fenix.compose.annotation.LightDarkPreview
 import org.mozilla.fenix.compose.button.PrimaryButton
+import org.mozilla.fenix.compose.ext.toLocaleString
 import org.mozilla.fenix.debugsettings.ui.DebugDrawer
 import org.mozilla.fenix.ext.maxActiveTime
 import org.mozilla.fenix.tabstray.ext.isNormalTabInactive
@@ -152,19 +153,19 @@ private fun TabCounter(
 
         TabCountRow(
             tabType = stringResource(R.string.debug_drawer_tab_tools_tab_count_normal),
-            count = activeTabCount.toString(),
+            count = activeTabCount,
         )
 
         if (inactiveTabsEnabled) {
             TabCountRow(
                 tabType = stringResource(R.string.debug_drawer_tab_tools_tab_count_inactive),
-                count = inactiveTabCount.toString(),
+                count = inactiveTabCount,
             )
         }
 
         TabCountRow(
             tabType = stringResource(R.string.debug_drawer_tab_tools_tab_count_private),
-            count = privateTabCount.toString(),
+            count = privateTabCount,
         )
 
         Spacer(modifier = Modifier.height(8.dp))
@@ -175,7 +176,7 @@ private fun TabCounter(
 
         TabCountRow(
             tabType = stringResource(R.string.debug_drawer_tab_tools_tab_count_total),
-            count = totalTabCount.toString(),
+            count = totalTabCount,
         )
     }
 }
@@ -183,7 +184,7 @@ private fun TabCounter(
 @Composable
 private fun TabCountRow(
     tabType: String,
-    count: String,
+    count: Int,
 ) {
     Row(
         modifier = Modifier
@@ -198,14 +199,14 @@ private fun TabCountRow(
         )
 
         Text(
-            text = count,
+            text = count.toLocaleString(),
             color = FirefoxTheme.colors.textSecondary,
             style = FirefoxTheme.typography.headline6,
         )
     }
 }
 
-private const val DEFAULT_TABS_TO_ADD = "1"
+private const val DEFAULT_TABS_TO_ADD = 1
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
@@ -213,7 +214,7 @@ private fun TabCreationTool(
     inactiveTabsEnabled: Boolean,
     onCreateTabsClick: ((quantity: Int, isInactive: Boolean, isPrivate: Boolean) -> Unit),
 ) {
-    var tabQuantityToCreate by rememberSaveable { mutableStateOf(DEFAULT_TABS_TO_ADD) }
+    var tabQuantityToCreate by rememberSaveable { mutableStateOf(DEFAULT_TABS_TO_ADD.toLocaleString()) }
     var hasError by rememberSaveable { mutableStateOf(false) }
     val keyboardController = LocalSoftwareKeyboardController.current
 
diff --git a/app/src/test/java/org/mozilla/fenix/compose/ext/IntTest.kt b/app/src/test/java/org/mozilla/fenix/compose/ext/IntTest.kt
new file mode 100644
index 000000000..c7c68f7eb
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/compose/ext/IntTest.kt
@@ -0,0 +1,22 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.compose.ext
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import java.util.Locale as JavaLocale
+
+class IntTest {
+
+    @Test
+    fun `WHEN the language is Arabic THEN translate the number to the proper symbol of that locale`() {
+        val expected = "٥"
+        val numberUnderTest = 5
+
+        JavaLocale.setDefault(JavaLocale("ar"))
+
+        assertEquals(expected, numberUnderTest.toLocaleString())
+    }
+}

From 86c0e8156de04a8b574a278e7e3c43249dafbcbb Mon Sep 17 00:00:00 2001
From: Matthew Tighe <matthewdtighe@gmail.com>
Date: Tue, 19 Dec 2023 16:13:10 -0800
Subject: [PATCH 095/222] Bug 1861459 - Update AppState.mode based on selected
 tab changes

---
 .../fenix/bindings/BrowserStoreBinding.kt     | 37 +++++++++
 .../fenix/components/appstate/AppAction.kt    |  8 ++
 .../fenix/components/appstate/AppState.kt     |  2 +
 .../components/appstate/AppStoreReducer.kt    |  5 ++
 .../fenix/bindings/BrowserStoreBindingTest.kt | 79 +++++++++++++++++++
 .../appstate/AppStoreReducerTest.kt           | 47 +++++++++++
 6 files changed, 178 insertions(+)
 create mode 100644 app/src/main/java/org/mozilla/fenix/bindings/BrowserStoreBinding.kt
 create mode 100644 app/src/test/java/org/mozilla/fenix/bindings/BrowserStoreBindingTest.kt

diff --git a/app/src/main/java/org/mozilla/fenix/bindings/BrowserStoreBinding.kt b/app/src/main/java/org/mozilla/fenix/bindings/BrowserStoreBinding.kt
new file mode 100644
index 000000000..85242e93c
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/bindings/BrowserStoreBinding.kt
@@ -0,0 +1,37 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.bindings
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import mozilla.components.browser.state.selector.selectedTab
+import mozilla.components.browser.state.state.BrowserState
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.lib.state.helpers.AbstractBinding
+import org.mozilla.fenix.components.AppStore
+import org.mozilla.fenix.components.appstate.AppAction
+
+/**
+ * Binding to update the [AppStore] based on changes to [BrowserState].
+ */
+class BrowserStoreBinding(
+    browserStore: BrowserStore,
+    private val appStore: AppStore,
+) : AbstractBinding<BrowserState>(browserStore) {
+    override suspend fun onState(flow: Flow<BrowserState>) {
+        // Update the AppStore with the latest selected tab
+        flow.distinctUntilChangedBy { it.selectedTabId }
+            .collectLatest { state ->
+                state.selectedTab?.let { tab ->
+                    // Ignore re-observations due to lifecycle events, or other pieces of state like
+                    // [mode] may get overwritten
+                    if (appStore.state.selectedTabId != tab.id) {
+                        appStore.dispatch(AppAction.SelectedTabChanged(tab))
+                    }
+                }
+            }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/components/appstate/AppAction.kt b/app/src/main/java/org/mozilla/fenix/components/appstate/AppAction.kt
index eae237c46..07eb907e7 100644
--- a/app/src/main/java/org/mozilla/fenix/components/appstate/AppAction.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/appstate/AppAction.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.components.appstate
 
+import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.feature.tab.collections.TabCollection
 import mozilla.components.feature.top.sites.TopSite
 import mozilla.components.lib.crash.Crash.NativeCodeCrash
@@ -128,6 +129,13 @@ sealed class AppAction : Action {
      */
     data class RemoveRecentSyncedTab(val syncedTab: RecentSyncedTab) : AppAction()
 
+    /**
+     * Action indicating that the selected tab has been changed.
+     *
+     * @property tab The tab that has been selected.
+     */
+    data class SelectedTabChanged(val tab: TabSessionState) : AppAction()
+
     /**
      * [Action]s related to interactions with the Messaging Framework.
      */
diff --git a/app/src/main/java/org/mozilla/fenix/components/appstate/AppState.kt b/app/src/main/java/org/mozilla/fenix/components/appstate/AppState.kt
index 77edd2d01..a056a00e7 100644
--- a/app/src/main/java/org/mozilla/fenix/components/appstate/AppState.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/appstate/AppState.kt
@@ -38,6 +38,7 @@ import org.mozilla.fenix.wallpapers.WallpaperState
  * @property expandedCollections A set containing the ids of the [TabCollection] that are expanded
  * in the [HomeFragment].
  * @property mode Whether the app is in private browsing mode.
+ * @property selectedTabId The currently selected tab ID. This should be bound to [BrowserStore].
  * @property topSites The list of [TopSite] in the [HomeFragment].
  * @property showCollectionPlaceholder If true, shows a placeholder when there are no collections.
  * @property recentTabs The list of recent [RecentTab] in the [HomeFragment].
@@ -64,6 +65,7 @@ data class AppState(
     val collections: List<TabCollection> = emptyList(),
     val expandedCollections: Set<Long> = emptySet(),
     val mode: BrowsingMode = BrowsingMode.Normal,
+    val selectedTabId: String? = null,
     val topSites: List<TopSite> = emptyList(),
     val showCollectionPlaceholder: Boolean = false,
     val recentTabs: List<RecentTab> = emptyList(),
diff --git a/app/src/main/java/org/mozilla/fenix/components/appstate/AppStoreReducer.kt b/app/src/main/java/org/mozilla/fenix/components/appstate/AppStoreReducer.kt
index e17530153..bf0ab3245 100644
--- a/app/src/main/java/org/mozilla/fenix/components/appstate/AppStoreReducer.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/appstate/AppStoreReducer.kt
@@ -8,6 +8,7 @@ import androidx.annotation.VisibleForTesting
 import mozilla.components.service.pocket.PocketStory.PocketRecommendedStory
 import mozilla.components.service.pocket.PocketStory.PocketSponsoredStory
 import mozilla.components.service.pocket.ext.recordNewImpression
+import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.components.AppStore
 import org.mozilla.fenix.components.appstate.shopping.ShoppingStateReducer
 import org.mozilla.fenix.ext.filterOutTab
@@ -100,6 +101,10 @@ internal object AppStoreReducer {
                 else -> state.recentSyncedTabState
             },
         )
+        is AppAction.SelectedTabChanged -> state.copy(
+            selectedTabId = action.tab.id,
+            mode = BrowsingMode.fromBoolean(action.tab.content.private),
+        )
         is AppAction.DisbandSearchGroupAction -> state.copy(
             recentHistory = state.recentHistory.filterNot {
                 it is RecentHistoryGroup && it.title.equals(action.searchTerm, true)
diff --git a/app/src/test/java/org/mozilla/fenix/bindings/BrowserStoreBindingTest.kt b/app/src/test/java/org/mozilla/fenix/bindings/BrowserStoreBindingTest.kt
new file mode 100644
index 000000000..0aaf57ca0
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/bindings/BrowserStoreBindingTest.kt
@@ -0,0 +1,79 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.bindings
+
+import mozilla.components.browser.state.action.TabListAction
+import mozilla.components.browser.state.state.BrowserState
+import mozilla.components.browser.state.state.createTab
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.support.test.ext.joinBlocking
+import mozilla.components.support.test.rule.MainCoroutineRule
+import mozilla.components.support.test.rule.runTestOnMain
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.Mockito.never
+import org.mockito.Mockito.spy
+import org.mockito.Mockito.verify
+import org.mozilla.fenix.components.AppStore
+import org.mozilla.fenix.components.appstate.AppAction
+import org.mozilla.fenix.components.appstate.AppState
+
+class BrowserStoreBindingTest {
+
+    @get:Rule
+    val coroutineRule = MainCoroutineRule()
+
+    lateinit var browserStore: BrowserStore
+    lateinit var appStore: AppStore
+
+    private val tabId1 = "1"
+    private val tabId2 = "2"
+    private val tab1 = createTab(url = tabId1, id = tabId1)
+    private val tab2 = createTab(url = tabId2, id = tabId2)
+
+    @Test
+    fun `WHEN selected tab changes THEN app action dispatched with update`() = runTestOnMain {
+        appStore = spy(AppStore())
+        browserStore = BrowserStore(
+            BrowserState(
+                tabs = listOf(tab1, tab2),
+                selectedTabId = tabId1,
+            ),
+        )
+
+        val binding = BrowserStoreBinding(browserStore, appStore)
+        binding.start()
+        browserStore.dispatch(TabListAction.SelectTabAction(tabId2)).joinBlocking()
+
+        // consume initial state
+        verify(appStore).dispatch(AppAction.SelectedTabChanged(tab1))
+        // verify response to Browser Store dispatch
+        verify(appStore).dispatch(AppAction.SelectedTabChanged(tab2))
+    }
+
+    @Test
+    fun `GIVEN selected tab id is set WHEN update is observed with same id THEN update is ignored`() {
+        appStore = spy(
+            AppStore(
+                AppState(
+                    selectedTabId = tabId2,
+                ),
+            ),
+        )
+        browserStore = BrowserStore(
+            BrowserState(
+                tabs = listOf(tab1, tab2),
+                selectedTabId = tabId2,
+            ),
+        )
+
+        val binding = BrowserStoreBinding(browserStore, appStore)
+        binding.start()
+        browserStore.dispatch(TabListAction.SelectTabAction(tabId2)).joinBlocking()
+
+        // the selected tab should only be dispatched on initialization
+        verify(appStore, never()).dispatch(AppAction.SelectedTabChanged(tab2))
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/components/appstate/AppStoreReducerTest.kt b/app/src/test/java/org/mozilla/fenix/components/appstate/AppStoreReducerTest.kt
index 7be038c02..2997e14c0 100644
--- a/app/src/test/java/org/mozilla/fenix/components/appstate/AppStoreReducerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/appstate/AppStoreReducerTest.kt
@@ -5,10 +5,12 @@
 package org.mozilla.fenix.components.appstate
 
 import io.mockk.mockk
+import mozilla.components.browser.state.state.createTab
 import mozilla.components.lib.crash.Crash.NativeCodeCrash
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
+import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.components.appstate.AppAction.AddNonFatalCrash
 import org.mozilla.fenix.components.appstate.AppAction.RemoveAllNonFatalCrashes
 import org.mozilla.fenix.components.appstate.AppAction.RemoveNonFatalCrash
@@ -69,4 +71,49 @@ class AppStoreReducerTest {
 
         assertTrue(updatedState.nonFatalCrashes.isEmpty())
     }
+
+    @Test
+    fun `GIVEN mode is private WHEN selected tab changes to normal mode THEN state is updated to normal mode`() {
+        val initialState = AppState(
+            selectedTabId = null,
+            mode = BrowsingMode.Private,
+        )
+
+        val updatedState = AppStoreReducer.reduce(
+            initialState,
+            AppAction.SelectedTabChanged(createTab("", private = false)),
+        )
+
+        assertFalse(updatedState.mode.isPrivate)
+    }
+
+    @Test
+    fun `GIVEN mode is normal WHEN selected tab changes to private mode THEN state is updated to private mode`() {
+        val initialState = AppState(
+            selectedTabId = null,
+            mode = BrowsingMode.Normal,
+        )
+
+        val updatedState = AppStoreReducer.reduce(
+            initialState,
+            AppAction.SelectedTabChanged(createTab("", private = true)),
+        )
+
+        assertTrue(updatedState.mode.isPrivate)
+    }
+
+    @Test
+    fun `WHEN selected tab changes to a tab in the same mode THEN mode is unchanged`() {
+        val initialState = AppState(
+            selectedTabId = null,
+            mode = BrowsingMode.Normal,
+        )
+
+        val updatedState = AppStoreReducer.reduce(
+            initialState,
+            AppAction.SelectedTabChanged(createTab("", private = false)),
+        )
+
+        assertFalse(updatedState.mode.isPrivate)
+    }
 }

From dd0e9e1918b7820781e7c4f4e7929a37e17f8d6e Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Tue, 6 Feb 2024 00:03:32 +0000
Subject: [PATCH 096/222] Import translations from android-l10n

---
 app/src/main/res/values-azb/strings.xml | 131 +++++
 app/src/main/res/values-sc/strings.xml  | 614 ++++++++++++++++++++----
 app/src/main/res/values-si/strings.xml  |  52 ++
 app/src/main/res/values-sl/strings.xml  |  23 +
 app/src/main/res/values-tg/strings.xml  |  51 +-
 5 files changed, 743 insertions(+), 128 deletions(-)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index eee28262e..b375ebffe 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -61,6 +61,137 @@
     <string name="recently_saved_title">سون ساخلانان‌لار</string>
 
 
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description_2">بوتون ساخلانمیش بوکمارک‌لاری گؤستر</string>
+    <!-- Text for the menu button to remove a recently saved bookmark from the user's home screen -->
+    <string name="recently_saved_menu_item_remove">قالدیر</string>
+
+    <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
+    <string name="about_content">%1$s موزیلا طرفیندن دوزه‌دیلمیش.</string>
+
+    <!-- Private Browsing -->
+    <!-- Explanation for private browsing displayed to users on home view when they first enable private mode
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="private_browsing_placeholder_description_2">
+        %1$s گیزلی تاغلاری باغلادیغینیز زامان ویا اپ‌دن چیخدیغینیز زامان آختاریش و مورور گئچمیشی پوزولار. بو سیزی سایتلارا ویا اینترنت خیدمت وئرنلره گیزلی ائتمه‌سه‌ده، بو جهازدان ایستیفاده ائدن هرکسدن آنلاین اولاراق نه ائتدیگینیزی گیزلی ساخلاماغی آسانلاشدیریر.</string>
+    <string name="private_browsing_common_myths">
+       گیزلی مورور حاقیندا یایقین اینانجلار
+    </string>
+
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">بو جهازدا هئچ بیر ایز قویمایین.</string>
+
+
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle_2">%1$s بوتون گیزلی تاغ‌لارینیزی باغلادیغینیز زامان، کوکی‌لری، گئچمیش‌لری و سایت بیلگی‌لرینیزی سیلیر. %2$s</string>
+    <!-- Clickable portion of the explanation for private browsing that links the user to our
+        about privacy page.
+        This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
+    <string name="felt_privacy_info_card_subtitle_link_text">منیم فعالیتلریمی کیم گؤره بیلر؟</string>
+
+
+    <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
+    <!-- Text for the Private mode shortcut CFR message for adding a private mode shortcut to open private tabs from the Home screen -->
+    <string name="private_mode_cfr_message_2">سونراکی گیزلی تاغلاریزی بیر توخونوشلا باشلادین.</string>
+    <!-- Text for the positive button to accept adding a Private Browsing shortcut to the Home screen -->
+    <string name="private_mode_cfr_pos_button_text">آناصفحه‌یه آرتیر</string>
+    <!-- Text for the negative button to decline adding a Private Browsing shortcut to the Home screen -->
+    <string name="cfr_neg_button_text">یوخ ممنون</string>
+
+    <!-- Open in App "contextual feature recommendation" (CFR) -->
+    <!-- Text for the info message. The first parameter is the name of the application.-->
+    <string name="open_in_app_cfr_info_message_2">سیز %1$s اپ‌لرده باغلانتی‌لاری اوتوماتیک آچماغی تنظیم ائلیه بیلرسیز.</string>
+    <!-- Text for the positive action button -->
+    <string name="open_in_app_cfr_positive_button_text">تنظیم‌لره گئدین</string>
+    <!-- Text for the negative action button -->
+    <string name="open_in_app_cfr_negative_button_text">باغلا</string>
+
+
+    <!-- Total cookie protection "contextual feature recommendation" (CFR) -->
+    <!-- Text for the message displayed in the contextual feature recommendation popup promoting the total cookie protection feature. -->
+    <string name="tcp_cfr_message">ایندیه قدر لاب گوجلو گیزلیلیک اؤزللیگیمیز، سایتلار آراسی ایزله‌ییجی‌لرین قاباغینی آلار.</string>
+    <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
+    <string name="tcp_cfr_learn_more">بوتون کوکی قوروما حاقیندا بیلگی آلین</string>
+
+    <!-- Private browsing erase action "contextual feature recommendation" (CFR) -->
+    <!-- Text for the message displayed in the contextual feature recommendation popup promoting the erase private browsing feature. -->
+    <string name="erase_action_cfr_message">یئنی بیر گیزلی اوتورم باشلادماق اوچون بورایا توخونون. گئچمیشینیزی، کوکی‌لرینیزی، هرشئیی سیلین.</string>
+
+
+    <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
+    <string name="camera_permissions_needed_message">کامئرا ال چاتماسی لازیم.اندروید تنظیم‌لرینه گئدین، ایجازه‌لره توخونون و ایجازه وئرین.</string>
+    <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
+    <string name="camera_permissions_needed_positive_button_text">تنظیم‌لره گئدین</string>
+    <!-- Text for the negative action button to dismiss the dialog. -->
+    <string name="camera_permissions_needed_negative_button_text">باغلا</string>
+
+    <!-- Text for the banner message to tell users about our auto close feature. -->
+    <string name="tab_tray_close_tabs_banner_message">گئچن گون، هفته و یا آی ایچینده باخیلمامیش آچیق تاغ‌لاری اوتوماتیک باغلاماغا قویون.</string>
+    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
+    <string name="tab_tray_close_tabs_banner_positive_button_text">سئچه‌نک‌لره باخ</string>
+    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
+    <string name="tab_tray_close_tabs_banner_negative_button_text">باغلا</string>
+
+
+    <!-- Text for the banner message to tell users about our inactive tabs feature. -->
+    <string name="tab_tray_inactive_onboarding_message">ایکی هفته‌ده باخمادیغینیز تاغلار بورایا داشینیر.</string>
+    <!-- Text for the action link to go to Settings for inactive tabs. -->
+    <string name="tab_tray_inactive_onboarding_button_text">تنظیم‌لردن باغلا</string>
+
+
+    <!-- Text for title for the auto-close dialog of the inactive tabs. -->
+    <string name="tab_tray_inactive_auto_close_title">بیر آیدان سونرا اوتوماتیک باغلانسین؟</string>
+    <!-- Text for the body for the auto-close dialog of the inactive tabs.
+        The first parameter is the name of the application.-->
+    <string name="tab_tray_inactive_auto_close_body_2">%1$s سون بر آی ایچینده باخدیغینیز تاغلاری باغلایا بیلر.</string>
+    <!-- Content description for close button in the auto-close dialog of the inactive tabs. -->
+    <string name="tab_tray_inactive_auto_close_button_content_description">باغلا</string>
+
+    <!-- Text for turn on auto close tabs button in the auto-close dialog of the inactive tabs. -->
+    <string name="tab_tray_inactive_turn_on_auto_close_button_2">اتوماتیک باغلامانی آچ</string>
+
+
+    <!-- Home screen icons - Long press shortcuts -->
+    <!-- Shortcut action to open new tab -->
+    <string name="home_screen_shortcut_open_new_tab_2">یئنی تاغ</string>
+    <!-- Shortcut action to open new private tab -->
+    <string name="home_screen_shortcut_open_new_private_tab_2">یئنی گیزلی تاغ</string>
+
+
+    <!-- Shortcut action to open Passwords screens -->
+    <string name="home_screen_shortcut_open_password_screen">رمزلر شورتکاتی</string>
+
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">دالیا قاییت</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">هامیسینی گؤستر</string>
+    <!-- Content description for the button which navigates the user to show all recent tabs in the tabs tray. -->
+    <string name="recent_tabs_show_all_content_description_2">بوتون سون تاغلاری گؤستر دویمه‌سی</string>
+    <!-- Text for button in synced tab card that opens synced tabs tray -->
+    <string name="recent_tabs_see_all_synced_tabs_button_text">بوتون دؤنگل اولموش تاغلارا باخین</string>
+    <!-- Accessibility description for device icon used for recent synced tab -->
+    <string name="recent_tabs_synced_device_icon_content_description">دؤنگل ائدیلمیش جهاز</string>
+    <!-- Text for the dropdown menu to remove a recent synced tab from the homescreen -->
+    <string name="recent_synced_tab_menu_item_remove">قالدیر</string>
+    <!-- Text for the menu button to remove a grouped highlight from the user's browsing history
+         in the Recently visited section -->
+    <string name="recent_tab_menu_item_remove">قالدیر</string>
+
+
+    <!-- History Metadata -->
+    <!-- Header text for a section on the home screen that displays grouped highlights from the
+         user's browsing history, such as topics they have researched or explored on the web -->
+    <string name="history_metadata_header_2">سون باخیلان‌لار</string>
+    <!-- Text for the menu button to remove a grouped highlight from the user's browsing history
+         in the Recently visited section -->
+    <string name="recently_visited_menu_item_remove">قالدیر</string>
+
+
     <!-- Translations feature-->
 
     </resources>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 989794579..8b93e08ae 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -61,6 +61,19 @@
        Mitos fitianos subra de sa navigatzione privada
     </string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Non lasses rastros in custu dispositivu</string>
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle_2">%1$s cantzellat testimòngios, cronologia e datos de is sitos cando serras totu is ventanas privadas. %2$s</string>
+    <!-- Clickable portion of the explanation for private browsing that links the user to our
+        about privacy page.
+        This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
+    <string name="felt_privacy_info_card_subtitle_link_text">Chie diat pòdere bìdere s’atividade mia?</string>
+
     <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
     <!-- Text for the Private mode shortcut CFR message for adding a private mode shortcut to open private tabs from the Home screen -->
     <string name="private_mode_cfr_message_2">Aberi s’ischeda privada imbeniente cun unu tocu ebbia.</string>
@@ -80,6 +93,7 @@
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">Leghe àteru subra de s’amparu totale contra is testimòngios</string>
 
+
     <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
     <string name="camera_permissions_needed_message">Atzessu rechestu a sa fotocàmera. Bae a sa cunfiguratzione de Android, toca is permissos e sèbera permite.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -169,6 +183,8 @@
     <string name="browser_menu_library">Biblioteca</string>
     <!-- Browser menu toggle that requests a desktop site -->
     <string name="browser_menu_desktop_site">Situ de iscrivania</string>
+    <!-- Browser menu button that reopens a private tab as a regular tab -->
+    <string name="browser_menu_open_in_regular_tab">Aberi in un’ischeda normale</string>
     <!-- Browser menu toggle that adds a shortcut to the site on the device home screen. -->
     <string name="browser_menu_add_to_homescreen">Agiunghe a s’ischermu printzipale</string>
     <!-- Browser menu toggle that installs a Progressive Web App shortcut to the site on the device home screen. -->
@@ -177,6 +193,8 @@
     <string name="resync_button_content_description">Torra a sincronizare</string>
     <!-- Browser menu button that opens the find in page menu -->
     <string name="browser_menu_find_in_page">Chirca in sa pàgina</string>
+    <!-- Browser menu button that opens the translations dialog, which has options to translate the current browser page. -->
+    <string name="browser_menu_translations">Tradue sa pàgina</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">Sarva in una colletzione</string>
     <!-- Browser menu button that open a share menu to share the current site -->
@@ -210,6 +228,12 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Ischermu printzipale</string>
 
+    <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
+         history and go back to the home screen. -->
+    <string name="browser_toolbar_erase">Cantzella sa cronologia de navigatzione</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Tradue sa pàgina</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Lìngua seletzionada</string>
@@ -221,8 +245,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Iscansiona</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button">Motore de chirca</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Cunfiguratzione de su motore de chirca</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -254,6 +276,8 @@
     <string name="onboarding_home_welcome_title_2">Ti donamus su benebènnidu a un’internet mègius</string>
     <!-- Home onboarding dialog welcome screen description text. -->
     <string name="onboarding_home_welcome_description">Prus colores. Una mègius riservadesa. Su matessi impinnu de pònnere is persones prima de is profitos.</string>
+    <!-- Home onboarding dialog sign into sync screen title text. -->
+    <string name="onboarding_home_sync_title_3">Passare de un’ischermu a s’àteru est fàtzile comente mai</string>
     <!-- Text for the button to continue the onboarding on the home onboarding dialog. -->
     <string name="onboarding_home_get_started_button">Cumintza</string>
     <!-- Text for the button to navigate to the sync sign in screen on the home onboarding dialog. -->
@@ -266,23 +290,47 @@
     <string name="onboarding_home_content_description_close_button">Serra</string>
 
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Sighi</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Sighi</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Immoe nono</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Immoe nono</string>
 
+    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Avisu de riservadesa de Firefox</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_2">Nos praghet a t’amparare</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Su navigadore nostru isvilupadu chena iscopu de lucru agiudat a blocare is aziendas chi iscrocant is fainas tuas in su web.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Su navigadore nostru isvilupadu chena iscopu de lucru agiudat a blocare is aziendas chi iscrocant is fainas tuas in su web.\n\nÀteras informatziones in s’avisu de riservadesa nostru.</string>
+    <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
+    This is part of the string with the key "juno_onboarding_default_browser_description". -->
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">avisu de riservadesa</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Cunfigura comente navigadore predefinidu</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_default_browser_negative_button" tools:ignore="UnusedResources">Immoe nono</string>
+    <!-- Title for sign in to sync screen. -->
+    <string name="juno_onboarding_sign_in_title_2">Abarra amparadu cun su tzifradu cando passas dae unu dispositivu a s’àteru</string>
     <!-- Text for the button to sign in to sync on the device -->
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Identìfica·ti</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Immoe nono</string>
+    <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_enable_notifications_title_nimbus_2">Is notìficas t’agiudant a èssere prus amparadu cun Firefox</string>
+    <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+       Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_enable_notifications_description_nimbus_2">Imbia in manera segura ischedas intre is dispositivos tuos e iscoberi àteras optziones de riservadesa in Firefox.</string>
     <!-- Text for the button to request notification permission on the device -->
     <string name="juno_onboarding_enable_notifications_positive_button" tools:ignore="UnusedResources">Ativa is notìficas</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Immoe nono</string>
 
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Immoe nono</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. The first parameter is the name of the application.-->
     <string name="search_widget_content_description_2">Aberi in un’ischeda de %1$s noa</string>
@@ -303,7 +351,7 @@
     <!-- Preference category for settings related to changing the default search engine -->
     <string name="preferences_category_select_default_search_engine">Seletziona·nde unu</string>
     <!-- Preference for settings related to managing search shortcuts for the quick search menu -->
-    <string name="preferences_manage_search_shortcuts">Gesti is curtzadòrgios de chirca</string>
+    <string name="preferences_manage_search_shortcuts_2">Gesti motores de chirca alternativos</string>
     <!-- Summary for preference for settings related to managing search shortcuts for the quick search menu -->
     <string name="preferences_manage_search_shortcuts_summary">Modìfica is motores visìbiles in su menù de chirca</string>
     <!-- Preference category for settings related to managing search shortcuts for the quick search menu -->
@@ -312,8 +360,16 @@
     <string name="preferences_default_search_engine">Motore de chirca predefinidu</string>
     <!-- Preference for settings related to Search -->
     <string name="preferences_search">Chirca</string>
-    <!-- Preference for settings related to Search address bar -->
-    <string name="preferences_search_address_bar">Barra de indiritzos</string>
+    <!-- Preference for settings related to Search engines -->
+    <string name="preferences_search_engines">Motores de chirca</string>
+    <!-- Preference for settings related to Search engines suggestions-->
+    <string name="preferences_search_engines_suggestions">Cussìgios dae àteros motores de chirca</string>
+    <!-- Preference Category for settings related to Search address bar -->
+    <string name="preferences_settings_address_bar">Preferèntzias de sa barra de indiritzos</string>
+    <!-- Preference Category for settings to Firefox Suggest -->
+    <string name="preference_search_address_bar_fx_suggest">Barra de indiritzos - Cussìgios de Firefox</string>
+    <!-- Preference link to Learn more about Firefox Suggest -->
+    <string name="preference_search_learn_about_fx_suggest">Àteras informatziones in pitzus de is cussìgios de Firefox</string>
     <!-- Preference link to rating Fenix on the Play Store -->
     <string name="preferences_rate">Avalora in Google Play</string>
     <!-- Preference linking to about page for Fenix
@@ -338,31 +394,36 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modalidade «isceti HTTPS»</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction">Ismenguada de is avisos de testimòngios</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option">Ismèngua is avisos de testimòngios</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off">Disativadu</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on">Ativu</string>
+    <!-- Label for cookie banner section in quick settings panel. -->
+    <string name="cookie_banner_blocker">Blocu de is avisos de testimòngios</string>
+    <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
+    <string name="preferences_cookie_banner_reduction_private_mode">Blocu de is avisos de testimòngios in sa navigatzione privada</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Disativadu pro custu situ</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
     <string name="cookie_banner_handling_details_site_is_not_supported_cancel_button">Annulla</string>
+    <!-- Text for request support button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
+    <string name="cookie_banner_handling_details_site_is_not_supported_request_support_button_2">Imbia una rechesta</string>
+    <!-- Text for title indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
+    <string name="cookie_banner_handling_details_site_is_not_supported_title_2">Boles preguntare agiudu pro custu situ?</string>
+    <!-- Label for the snackBar, after the user reports with success a website where cookie banner reducer did not work -->
+    <string name="cookie_banner_handling_report_site_snack_bar_text_2">Rechesta imbiada</string>
     <!-- Text for indicating cookie banner handling is on this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_on_for_site">Ativu pro custu situ</string>
 
+    <!-- Text for indicating that a request for unsupported site was sent to Nimbus (it's a Mozilla library for experiments), this is shown as part of the protections panel with the tracking protection toggle -->
+    <string name="reduce_cookie_banner_unsupported_site_request_submitted_2">Rechesta de agiudu imbiada</string>
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Situ non cumpatìbile</string>
+
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site">Boles ativare s’ismèngua de is avisos de testimòngios pro %1$s?</string>
+    <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Boles ativare su blocu de is avisos de testimòngios pro %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site">Boles disativare s’ismèngua de is avisos de testimòngios pro %1$s?</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site">%1$s at a limpiare is testimòngios de custu situ e at a atualizare sa pàgina. Sa limpiesa de totu is testimòngios ti diat pòdere serrare sa sessione o isboidare is carrellos de s’ispesa.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button">Immoe nono</string>
+    <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Boles disativare su blocu de is avisos de testimòngios pro %1$s?</string>
+    <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
+    <string name="cookie_banner_cfr_title">%1$s at refudadu testimòngios</string>
+    <!--Message for the cookie banner re-engagement CFR -->
+    <string name="cookie_banner_cfr_message">Prus pagas distratziones, prus pagos testimòngios sighende·ti in custu situ.</string>
 
     <!-- Summary of https only preference if https only is set to off -->
     <string name="preferences_https_only_off">Disativadu</string>
@@ -382,8 +443,8 @@
     <string name="errorpage_httpsonly_message_title">Est probàbile chi su situ web non siat cumpatìbile cun HTTPS.</string>
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Atzessibilidade</string>
-    <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Serbidore de contos de Firefox personalizadu</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Serbidore de contos de Mozilla personalizadu</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Serbidore de Sync personalizadu</string>
     <!-- Preference category for account information -->
@@ -401,7 +462,7 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Intra pro sincronizare ischedas, sinnalibros, craes e àteru.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Contu de Firefox</string>
+    <string name="preferences_account_default_name_2">Contu de Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Torra a connètere pro sighire cun sa sincronizatzione</string>
     <!-- Preference for language -->
@@ -412,8 +473,6 @@
     <string name="preferences_data_collection">Còllida de datos</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Curretzione de faddinas pro mèdiu de USB</string>
-    <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Ammustra is motores de chirca</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Ammustra cussìgios de chirca</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -432,13 +491,33 @@
     <string name="preferences_account_settings">Cunfiguratzione de su contu</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Cumpletamentu de URL in automàticu</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Cussìgios dae is ispònsors</string>
+    <!-- Preference title for switch preference to show Firefox Suggest search suggestions for web content.
+         The first parameter is the name of the application. -->
+    <string name="preferences_show_nonsponsored_suggestions">Cussìgios dae %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Otene cussìgios de sa rete acapiados a sa chirca tua</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Aberi is ligòngios in is aplicatziones</string>
+    <!-- Preference for open links in third party apps always open in apps option -->
+    <string name="preferences_open_links_in_apps_always">Semper</string>
+    <!-- Preference for open links in third party apps ask before opening option -->
+    <string name="preferences_open_links_in_apps_ask">Pregunta prima de abèrrere</string>
+    <!-- Preference for open links in third party apps never open in apps option -->
+    <string name="preferences_open_links_in_apps_never">Mai</string>
     <!-- Preference for open download with an external download manager app -->
     <string name="preferences_external_download_manager">Gestore de iscarrigamentos esternu</string>
 
+    <!-- Preference for enabling gecko engine logs -->
+    <string name="preferences_enable_gecko_logs">Ativa is registros de Gecko</string>
+    <!-- Message to indicate users that we are quitting the application to apply the changes -->
+    <string name="quit_application">Serrende s’aplicatzione pro aplicare is modìficas…</string>
+
     <!-- Preference for add_ons -->
     <string name="preferences_addons">Cumplementos</string>
+    <!-- Preference for installing a local add-on -->
+    <string name="preferences_install_local_addon">Installa unu cumplementu dae un’archìviu</string>
     <!-- Preference for notifications -->
     <string name="preferences_notifications">Notìficas</string>
 
@@ -492,12 +571,10 @@
     <string name="wallpaper_learn_more">Àteras informatziones</string>
     <!-- Text for classic wallpapers title. The first parameter is the Firefox name. -->
     <string name="wallpaper_classic_title">%s clàssicu</string>
-    <!-- Text for limited edition wallpapers title. -->
-    <string name="wallpaper_limited_edition_title" moz:RemovedIn="118" tools:ignore="UnusedResources">Editzione limitada</string>
-    <!-- Description text for the limited edition wallpapers with learn more link. The first parameter is the learn more string defined in wallpaper_learn_more-->
-    <string name="wallpaper_limited_edition_description_with_learn_more" moz:RemovedIn="118" tools:ignore="UnusedResources">Sa colletzione noa de boghes indipendentes. %s</string>
-    <!-- Description text for the limited edition wallpapers. -->
-    <string name="wallpaper_limited_edition_description" moz:RemovedIn="118" tools:ignore="UnusedResources">Sa colletzione noa de boghes indipendentes.</string>
+    <!-- Description text for the artist series wallpapers with learn more link. The first parameter is the learn more string defined in wallpaper_learn_more. "Independent voices" is the name of the wallpaper collection -->
+    <string name="wallpaper_artist_series_description_with_learn_more">Sa colletzione Boghes indipendentes. %s</string>
+    <!-- Description text for the artist series wallpapers. "Independent voices" is the name of the wallpaper collection -->
+    <string name="wallpaper_artist_series_description">Sa colletzione Boghes indipendentes.</string>
     <!-- Wallpaper onboarding dialog header text. -->
     <string name="wallpapers_onboarding_dialog_title_text">Proa un’istrichiddu de colore</string>
 
@@ -507,12 +584,27 @@
     <!-- Wallpaper onboarding dialog learn more button text. The button navigates to the wallpaper settings screen. -->
     <string name="wallpapers_onboarding_dialog_explore_more_button_text">Iscoberi àteros isfundos de ischermu</string>
 
-    <!-- Add-on Installation from AMO-->
-    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Cumplementu non cumpatìbile</string>
-    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Su cumplementu est giai installadu</string>
-
+    <!-- Add-ons general availability nimbus message-->
+    <!-- Title of the Nimbus message for add-ons general availability-->
+    <string name="addon_ga_message_title" tools:ignore="UnusedResources">Cumplementos noos a disponimentu</string>
+    <!-- Body of the Nimbus message for add-ons general availability. 'Firefox' intentionally hardcoded here-->
+    <string name="addon_ga_message_body" tools:ignore="UnusedResources">Controlla is prus de chentu estensiones noas chi ti permitint de personalizare Firefox.</string>
+    <!-- Button text of the Nimbus message for add-ons general availability. -->
+    <string name="addon_ga_message_button" tools:ignore="UnusedResources">Esplora cumplementos</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Is cumplementos sunt istados disativados in manera temporànea</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Proa torrende a aviare is cumplementos</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Sighi cun is cumplementos disativados</string>
+
+    <!-- Account Preferences -->
+    <!-- Preference for managing your account via accounts.firefox.com -->
+    <string name="preferences_manage_account">Gesti su contu</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Modìfica sa crae tua, gesti sa colletzione de datos o cantzella su contu</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincroniza immoe</string>
     <!-- Preference category for sync -->
@@ -523,6 +615,8 @@
     <string name="preferences_sync_bookmarks">Sinnalibros</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Credentziales</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Craes</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Ischedas abertas</string>
     <!-- Preference for signing out -->
@@ -549,6 +643,8 @@
     <string name="default_device_name_2">%1$s in %2$s %3$s</string>
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Cartas de crèditu</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Mètodos de pagamentu</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Indiritzos</string>
 
@@ -786,10 +882,10 @@
     <string name="collection_open_tabs">Aberi is ischedas</string>
     <!-- Hint for adding name of a collection -->
     <string name="collection_name_hint">Nòmine de sa colletzione</string>
-	<!-- Text for the menu button to rename a top site -->
-	<string name="rename_top_site">Torra a nominare</string>
-	<!-- Text for the menu button to remove a top site -->
-	<string name="remove_top_site">Boga</string>
+    <!-- Text for the menu button to rename a top site -->
+    <string name="rename_top_site">Torra a nominare</string>
+    <!-- Text for the menu button to remove a top site -->
+    <string name="remove_top_site">Boga</string>
     <!-- Text for the menu button to delete a top site from history -->
     <string name="delete_from_history">Cantzella dae sa cronologia</string>
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
@@ -1032,6 +1128,12 @@
     <string name="share_save_to_pdf">Sarva comente PDF</string>
     <!-- Text for error message when generating a PDF file Text. -->
     <string name="unable_to_save_to_pdf_error">Impossìbile generare su PDF</string>
+    <!-- Text for standard error snackbar dismiss button. -->
+    <string name="standard_snackbar_error_dismiss">Iscarta</string>
+    <!-- Text for error message when printing a page and it fails. -->
+    <string name="unable_to_print_page_error">Impossìbile imprentare custa pàgina</string>
+    <!-- Text for the print feature in the share and browser menu -->
+    <string name="menu_print">Imprenta</string>
     <!-- Sub-header in the dialog to share a link to another sync device -->
     <string name="share_device_subheader">Imbia a su dispositivu</string>
     <!-- Sub-header in the dialog to share a link to an app from the full list -->
@@ -1054,8 +1156,12 @@
     <string name="sync_offline">In foras de lìnia</string>
     <!-- An option to connect additional devices -->
     <string name="sync_connect_device">Connete un’àteru dispositivu</string>
+    <!-- The dialog text shown when additional devices are not available -->
+    <string name="sync_connect_device_dialog">Pro imbiare un’ischeda, identìfica·ti in Firefox in un’àteru dispositivu, a su mancu.</string>
     <!-- Confirmation dialog button -->
     <string name="sync_confirmation_button">Apo cumprèndidu</string>
+    <!-- Share error message -->
+    <string name="share_error_snackbar">Impossìbile cumpartzire in custa aplicatzione</string>
     <!-- Add new device screen title -->
     <string name="sync_add_new_device_title">Imbia a su dispositivu</string>
     <!-- Text for the warning message on the Add new device screen -->
@@ -1068,12 +1174,28 @@
     <!-- Notifications -->
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">Serra is ischedas privadas</string>
+
+    <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
+    <string name="notification_erase_title_android_14">Boles serrare is ischedas privadas?</string>
+    <string name="notification_erase_text_android_14">Toca o iscurre in custa notìfica pro serrare is ischedas privadas.</string>
+
+    <!-- Title shown in the notification that pops up to remind the user to set fenix as default browser.
+    The app name is in the text, due to limitations with localizing Nimbus experiments -->
+    <string name="nimbus_notification_default_browser_title" tools:ignore="UnusedResources">Firefox est lestru e privadu</string>
+    <!-- Text shown in the notification that pops up to remind the user to set fenix as default browser.
+    The app name is in the text, due to limitations with localizing Nimbus experiments -->
+    <string name="nimbus_notification_default_browser_text" tools:ignore="UnusedResources">Imprea Firefox comente navigadore predefinidu</string>
     <!-- Title shown in the notification that pops up to re-engage the user -->
     <string name="notification_re_engagement_title">Prova sa navigatzione privada</string>
 
+    <!-- Title A shown in the notification that pops up to re-engage the user -->
+    <string name="notification_re_engagement_A_title">Nàviga chene sighiduras</string>
     <!-- Title B shown in the notification that pops up to re-engage the user -->
     <string name="notification_re_engagement_B_title">Faghe sa prima chirca</string>
 
+    <!-- Preference for not taking the short survey. -->
+    <string name="preferences_not_take_survey">No, gràtzias</string>
+
     <!-- Snackbar -->
     <!-- Text shown in snackbar when user deletes a collection -->
     <string name="snackbar_collection_deleted">Colletzione cantzellada</string>
@@ -1091,6 +1213,8 @@
     <string name="snackbar_private_tab_closed">Ischeda privada serrada</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Ischedas privadas serradas</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Datos de sa navigatzione privada cantzellados</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">ISCONTZA</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -1112,6 +1236,8 @@
     <string name="delete_tab_and_collection_dialog_title">Boles cantzellare %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Cantzella</string>
+    <!-- Text displayed in a notification when the user enters full screen mode -->
+    <string name="full_screen_notification">Intrende a sa modalidade de ischermu cumpletu</string>
     <!-- Message for copying the URL via long press on the toolbar -->
     <string name="url_copied">URL copiadu</string>
     <!-- Title for Accessibility Text Size Scaling Preference -->
@@ -1127,12 +1253,15 @@
     <!-- Subtitle for the tabs item in Delete browsing data, parameter will be replaced with the number of open tabs -->
     <string name="preferences_delete_browsing_data_tabs_subtitle">%d ischedas</string>
     <!-- Title for the data and history items in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_browsing_data_title">Cronologia de navigatzione e datos de is sitos</string>
+    <!-- Title for the history item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_browsing_history_title">Cronologia de navigatzione</string>
     <!-- Subtitle for the data and history items in delete browsing data, parameter will be replaced with the
         number of history items the user has -->
     <string name="preferences_delete_browsing_data_browsing_data_subtitle">%d indiritzos</string>
-    <!-- Title for the cookies item in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_cookies">Testimòngios</string>
+    <!-- Title for the cookies and site data items in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cookies_and_site_data">Testimòngios e datos de is sitos</string>
+    <!-- Title for the cached images and files item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cached_files">Immàgines e archìvios in sa memòria temporànea</string>
     <!-- Title for the site permissions item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_site_permissions">Permissos de is sitos</string>
     <!-- Title for the downloads item in Delete browsing data -->
@@ -1145,6 +1274,8 @@
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Essi</string>
 
+    <!-- Title text of a delete browsing data dialog. -->
+    <string name="delete_history_prompt_title">Perìodu de tempus pro cantzellare</string>
     <!-- Radio button in the delete browsing data dialog to delete history items for the last hour. -->
     <string name="delete_history_prompt_button_last_hour">Ùrtima ora</string>
     <!-- Radio button in the delete browsing data dialog to delete history items for today and yesterday. -->
@@ -1173,35 +1304,10 @@
     <string name="delete_history_group_snackbar">Grupu cantzelladu</string>
 
     <!-- Onboarding -->
-    <!-- Text for onboarding welcome header. -->
-    <string name="onboarding_header_2" moz:RemovedIn="118" tools:ignore="UnusedResources">Ti donamus su benebènnidu a un’internet mègius</string>
-    <!-- Text for the button to manually sign into Firefox account. -->
-    <string name="onboarding_firefox_account_sign_in" moz:RemovedIn="118" tools:ignore="UnusedResources">Identìfica·ti</string>
     <!-- text to display in the snackbar once account is signed-in -->
     <string name="onboarding_firefox_account_sync_is_on">Sincronizatzione ativa</string>
-    <!-- Text for the tracking protection onboarding card header -->
-    <string name="onboarding_tracking_protection_header" moz:RemovedIn="118" tools:ignore="UnusedResources">Amparu de riservadesa predefinidu</string>
-    <!-- text for tracking protection radio button option for standard level of blocking -->
-    <string name="onboarding_tracking_protection_standard_button_2" moz:RemovedIn="118" tools:ignore="UnusedResources">Istàndard (predefinidu)</string>
-    <!-- text for standard blocking option button description -->
-    <string name="onboarding_tracking_protection_standard_button_description_3" moz:RemovedIn="118" tools:ignore="UnusedResources">Echilìbriu intre amparu e rendimentu. Is pàginas s’ant a carrigare cun normalidade.</string>
-    <!-- text for tracking protection radio button option for strict level of blocking -->
-    <string name="onboarding_tracking_protection_strict_option" moz:RemovedIn="118" tools:ignore="UnusedResources">Restrinta</string>
-    <!-- Text for the privacy notice onboarding card header -->
-    <string name="onboarding_privacy_notice_header_1" moz:RemovedIn="118" tools:ignore="UnusedResources">Controllas is datos tuos</string>
-    <!-- text for the button to finish onboarding -->
-    <string name="onboarding_finish" moz:RemovedIn="118" tools:ignore="UnusedResources">Cumintza a navigare</string>
 
     <!-- Onboarding theme -->
-    <!-- text for the theme picker onboarding card header -->
-    <string name="onboarding_theme_picker_header" moz:RemovedIn="118" tools:ignore="UnusedResources">Sèbera unu tema</string>
-    <!-- Automatic theme setting (will follow device setting) -->
-    <string name="onboarding_theme_automatic_title" moz:RemovedIn="118" tools:ignore="UnusedResources">Automàticu</string>
-    <!-- Theme setting for dark mode -->
-    <string name="onboarding_theme_dark_title" moz:RemovedIn="118" tools:ignore="UnusedResources">Tema iscuru</string>
-    <!-- Theme setting for light mode -->
-    <string name="onboarding_theme_light_title" moz:RemovedIn="118" tools:ignore="UnusedResources">Tema craru</string>
-
     <!-- Text shown in snackbar when multiple tabs have been sent to device -->
     <string name="sync_sent_tabs_snackbar">Ischedas imbiadas.</string>
     <!-- Text shown in snackbar when one tab has been sent to device  -->
@@ -1334,10 +1440,17 @@
     <!-- Continue to website button text for the first-time Add to Homescreen dialog -->
     <string name="add_to_homescreen_continue">Sighi a su situ</string>
 
+    <!-- Placeholder text for the TextView in the Add to Homescreen dialog -->
+    <string name="add_to_homescreen_text_placeholder">Nòmine de su curtzadòrgiu</string>
+
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Credentziales e craes</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Craes</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Sarva credentziales e craes</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Sarva is craes</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Pregunta·mi·ddu</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1353,16 +1466,27 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Agiunghe credentziale</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Agiunghe crae</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronizatzione de credentziales</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincroniza is craes</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sincronizatzione de credentziales intre dispositivos</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincroniza is craes intre dispositivos</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Credentziales sarvadas</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Craes sarvadas</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Is credentziales chi as a sarvare o sincronizare cun %s ant a èssere ammustradas inoghe.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Leghe àteru subra de Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Àteras informatziones in pitzus de sa sincronizatzione</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Etzetziones</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
@@ -1373,6 +1497,8 @@
     <string name="preferences_passwords_exceptions_remove_all">Cantzella totu is etzetziones</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Chirca credentziales</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Chirca craes</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Situ</string>
     <!-- The header for the username for a login -->
@@ -1421,18 +1547,28 @@
     <string name="preferences_addresses">Indiritzos</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Cartas de crèditu</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Mètodos de pagamentu</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Sarva e cumpleta in automàticu is cartas</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Sarva e cumpleta cun is mètodos de pagamentu</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Is datos sunt tzifrados</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s tzifrat totu is mètodos de pagamentu chi sarves</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizatzione de cartas intre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sincronizatzione de cartas</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Agiunghe una carta de crèditu</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Agiunghe una carta</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Gesti is cartas</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gesti is cartas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Agiunghe un’indiritzu</string>
     <!-- Preference option for managing saved addresses -->
@@ -1440,9 +1576,14 @@
 
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Sarva e cumpleta in automàticu is indiritzos</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Sarva e cumpleta cun is indiritzos</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Include datos comente nùmeros, indiritzos eletrònicos e indiritzos de ispeditzione</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Includet nùmeros de telèfonu e indiritzos eletrònicos</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Agiunghe una carta</string>
     <!-- Title of the "Edit card" screen -->
@@ -1463,6 +1604,8 @@
     <string name="credit_cards_delete_card_button">Cantzella sa carta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Seguru chi boles cantzellare custa carta de crèditu?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Boles cantzellare sa carta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Cantzella</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1475,16 +1618,32 @@
     <string name="credit_cards_saved_cards">Cartas sarvadas</string>
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Inserta unu nùmeru de carta vàlidu</string>
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Inserta unu nùmeru de carta vàlidu</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Cumpila custu campu</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Agiunghe unu nòmine</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Isbloca pro bìdere is cartas sarvadas tuas</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Ampara is cartas de crèditu tuas</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Ampara is mètodos de pagamentu sarvados</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Cunfigura una secuèntzia de blocu, PIN o crae pro amparare is cartas de crèditu sarvadas tuas de s’atzessu de àtera gente chi tèngiat su dispositivu tuo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Cunfigura una secuèntzia de blocu, PIN o crae pro amparare is mètodos de pagamentu sarvados de s’atzessu de àtera gente chi tèngiat su dispositivu tuo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Cunfigura immoe</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_later">A pustis</string>
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Isbloca su disposivitu tuo</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Isbloca pro impreare informatzione sarvada de una carta de crèditu</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Isbloca pro impreare is mètodos de pagamentu sarvados</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Agiunghe un’indiritzu</string>
     <!-- Title of the "Edit address" screen -->
@@ -1521,6 +1680,8 @@
     <string name="addressess_delete_address_button">Cantzella s’indiritzu</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Seguru chi boles cantzellare custu indiritzu?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Boles cantzellare custu indiritzu?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Cantzella</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1536,26 +1697,16 @@
     <string name="search_engine_add_custom_search_engine_button_content_description">Agiunghe unu motore de chirca nou</string>
     <!-- Title of the Edit search engine screen -->
     <string name="search_engine_edit_custom_search_engine_title">Modìfica motore de chirca</string>
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
-    <string name="search_engine_add_button_content_description">Agiunghe</string>
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Sarva</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Modìfica</string>
     <!-- Text for the menu button to delete a search engine -->
     <string name="search_engine_delete">Cantzella</string>
 
-    <!-- Text for the button to create a custom search engine on the Add search engine screen -->
-    <string name="search_add_custom_engine_label_other">Àteru</string>
     <!-- Label for the TextField in which user enters custom search engine name -->
     <string name="search_add_custom_engine_name_label">Nòmine</string>
-    <!-- Placeholder text shown in the Search Engine Name TextField before a user enters text -->
-    <string name="search_add_custom_engine_name_hint">Nòmine</string>
     <!-- Placeholder text shown in the Search Engine Name text field before a user enters text -->
     <string name="search_add_custom_engine_name_hint_2">Nòmine de su motore de chirca</string>
     <!-- Placeholder text shown in the Search String TextField before a user enters text -->
-    <string name="search_add_custom_engine_search_string_hint">Cadena de chirca</string>
-    <!-- Placeholder text shown in the Search String TextField before a user enters text -->
     <string name="search_add_custom_engine_search_string_hint_2">URL de impreare in sa chirca</string>
     <!-- Description text for the Search String TextField. The %s is part of the string -->
     <string name="search_add_custom_engine_search_string_example" formatted="false">Sostitui sa chirca cun «%s». Esempru: \nhttps://www.google.com/search?q=%s</string>
@@ -1567,8 +1718,7 @@
     <!-- Placeholder text shown in the Search Suggestion String TextField before a user enters text -->
     <string name="search_add_custom_engine_suggest_string_hint">URL de s’API pro is cussìgios de chirca</string>
     <!-- Description text for the Search Suggestion String TextField. The %s is part of the string -->
-    <string name="search_add_custom_engine_suggest_string_example" formatted="false">Sostitui sa chirca cun “%s”.
-Esempru: \nhttp://suggestqueries.google.com/complete/search?client=firefox&amp;q=%s</string>
+    <string name="search_add_custom_engine_suggest_string_example_2" formatted="false">Sostitui sa chirca cun “%s”. Pro esempru:\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp;q=%s</string>
     <!-- The text for the "Save" button for saving a custom search engine -->
     <string name="search_custom_engine_save_button">Sarva</string>
 
@@ -1628,22 +1778,38 @@ Esempru: \nhttp://suggestqueries.google.com/complete/search?client=firefox&amp;q
     <string name="login_menu_edit_button">Modìfica</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Seguru chi boles cantzellare custa credentziale?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Seguru chi boles cantzellare custa crae?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Cantzella</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Annulla</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Optziones de credentziales</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Optziones de is craes</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Sarva is modìficas a sa credentziale.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Sarva is modìficas.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Modìfica</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Modìfica sa crae</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Agiunghe una credentziale noa</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Agiunghe una crae</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Crae rechesta</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Inserta una crae</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Nòmine de utente rechestu</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Inserta unu nòmine de utente</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Inserta un’indiritzu web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Chirca cun sa boghe</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -1658,23 +1824,36 @@ Esempru: \nhttp://suggestqueries.google.com/complete/search?client=firefox&amp;q
     <!-- Synced Tabs -->
     <!-- Text displayed to ask user to connect another device as no devices found with account -->
     <string name="synced_tabs_connect_another_device">Connete un’àteru dispositivu.</string>
+    <!-- Text displayed asking user to re-authenticate -->
+    <string name="synced_tabs_reauth">Autèntica·ti torra.</string>
+    <!-- Text displayed when user has disabled tab syncing in Firefox Sync Account -->
+    <string name="synced_tabs_enable_tab_syncing">Ativa sa sincronizatzione de ischedas.</string>
+    <!-- Text displayed when user has no tabs that have been synced -->
+    <string name="synced_tabs_no_tabs">Nissuna ischeda aberta in su Firefox de is àteros dispositivos.</string>
+    <!-- Text displayed in the synced tabs screen when a user is not signed in to Firefox Sync describing Synced Tabs -->
+    <string name="synced_tabs_sign_in_message">Ammustra una lista de ischedas abertas in àteros dispositivos tuos.</string>
     <!-- Text displayed on a button in the synced tabs screen to link users to sign in when a user is not signed in to Firefox Sync -->
     <string name="synced_tabs_sign_in_button">Identìfica·ti a sync</string>
     <!-- The text displayed when a synced device has no tabs to show in the list of Synced Tabs. -->
     <string name="synced_tabs_no_open_tabs">Nissuna ischeda aberta</string>
 
+    <!-- Top Sites -->
+    <!-- Title text displayed in the dialog when shortcuts limit is reached. -->
+    <string name="shortcut_max_limit_title">Lìmite de curtzadòrgios barigadu</string>
+    <!-- Content description text displayed in the dialog when shortcut limit is reached. -->
+    <string name="shortcut_max_limit_content">Pro agiùnghere unu curtzadòrgiu nou, boga·nde unu. Toca e mantene su situ, pustis seletziona boga.</string>
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">AB, apo cumprèndidu</string>
     <!-- Label for the preference to show the shortcuts for the most visited top sites on the homepage -->
     <string name="top_sites_toggle_top_recent_sites_4">Curtzadòrgios</string>
-	<!-- Title text displayed in the rename top site dialog. -->
-	<string name="top_sites_rename_dialog_title">Nòmine</string>
+    <!-- Title text displayed in the rename top site dialog. -->
+    <string name="top_sites_rename_dialog_title">Nòmine</string>
     <!-- Hint for renaming title of a shortcut -->
     <string name="shortcut_name_hint">Nòmine de su curtzadòrgiu</string>
-	<!-- Button caption to confirm the renaming of the top site. -->
-	<string name="top_sites_rename_dialog_ok">AB</string>
-	<!-- Dialog button text for canceling the rename top site prompt. -->
-	<string name="top_sites_rename_dialog_cancel">Annulla</string>
+    <!-- Button caption to confirm the renaming of the top site. -->
+    <string name="top_sites_rename_dialog_ok">AB</string>
+    <!-- Dialog button text for canceling the rename top site prompt. -->
+    <string name="top_sites_rename_dialog_cancel">Annulla</string>
     <!-- Text for the menu button to open the homepage settings. -->
     <string name="top_sites_menu_settings">Cunfiguratzione</string>
     <!-- Text for the menu button to navigate to sponsors and privacy support articles. '&amp;' is replaced with the ampersand symbol: & -->
@@ -1725,6 +1904,8 @@ Esempru: \nhttp://suggestqueries.google.com/complete/search?client=firefox&amp;q
     <string name="pocket_stories_categories_header">Artìculos pro tema</string>
     <!-- Text of a button allowing users to access an external url for more Pocket recommendations. -->
     <string name="pocket_stories_placeholder_text">Iscoberi·nde àteros</string>
+    <!-- Title of an app feature. Smaller than a heading. The first parameter is product name Pocket -->
+    <string name="pocket_stories_feature_title_2">Funtzionat gràtzias a %s.</string>
     <!-- Caption for describing a certain feature. The placeholder is for a clickable text (eg: Learn more) which will load an url in a new tab when clicked.  -->
     <string name="pocket_stories_feature_caption">Parte de sa famìlia de Firefox. %s</string>
     <!-- Clickable text for opening an external link for more information about Pocket. -->
@@ -1735,11 +1916,268 @@ Esempru: \nhttp://suggestqueries.google.com/complete/search?client=firefox&amp;q
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Bae a sa cunfiguratzione</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Verificadore de retzensiones</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">Retzensiones fidadas</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Misturu de retzensiones fidadas e non fidadas</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Retzensiones non fidadas</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">Canto sunt fidadas custas retzensiones?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Valutatzione assentada</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Retzensiones non fidadas bogadas</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">In evidèntzia dae retzensiones reghentes</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Comente istabilimus sa calidade de is retzensiones</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Impreamus tecnologias de inteligèntzia artifitziale (IA) dae %s in Mozilla pro controllare sa calidade de is retzensiones de produtos. Custu t’at a agiudare a verificare sa calidade sa retzensione, non de su produtu. </string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Assignamus a cada retzensione de produtu unu <b>votu alfabèticu</b> dae A a F.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Retzensiones fidadas. Pensamus chi is retzensiones est probàbile chi bèngiant dae clientes reales chi ant lassadu retzensiones sintzeras e ogetivas.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Pensamus chi ddoe at unu misturu de retzensiones fidadas e non fidadas.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Retzensiones non fidadas. Pensamus chi is retzensiones est probàbile chi siant farsas o bèngiant dae utentes no ogetivos.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[Sa <b>valutatzione assentada</b> si basat isceti subra de retzensiones chi cunsideramus fidadas.]]></string>
+
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[Is elementos <b>in evidèntzia</b> benent dae is retzensiones in %s de is ùrtimas 80 dies chi cunsideramus fidadas.]]></string>
+    <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
+    <string name="review_quality_check_info_learn_more">Àteras informatziones in pitzus de %s.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_info_learn_more_link_2">comente %s istabilit sa calidade de is retzensiones</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">Cunfiguratzione</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Ammustra publitzidade in su verificadore de retzensiones</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Àteras informatziones</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Disativa su verificadore de retzensiones</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Àteru de cunsiderare</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s dae Mozilla</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Informatziones noas de verificare</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Controlla immoe</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">Ancora no ddoe at bastantes retzensiones</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title">Su produtu no est a disponimentu</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2">Su produtu sinnaladu est a disponimentu</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Controllende sa calidade de sa retzensione</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Controllende sa calidade de sa retzensione</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
+    <string name="review_quality_check_analysis_in_progress_warning_title_2">Controllende sa calidade de sa retzensione (%s)</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">Custu podet trigare finas a 60 segundos.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title">Gràtzias de sa sinnalatzione.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Non podimus verificare custas retzensiones</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Àteras informatziones luego</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">S’anàlisi est atualizada</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Apo cumprèndidu</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">Nissuna informatzione a disponimentu immoe</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Semus traballende pro risòlvere su problema. Torra luego.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">Nissuna connessione de rete</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">Àteras informatziones</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">polìtica de riservadesa</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Polìtica de riservadesa</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">cunditziones de su servìtziu</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Cunditziones de su servìtziu</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Eja, dd’apo a proare</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Immoe nono</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Proa su verificadore de retzensiones</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Aberi su verificadore de retzensiones</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Aberi su verificadore de retzensiones</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Serra su verificadore de retzensiones</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s de 5 isteddos</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">Ammustra·nde prus pagu</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">Ammustra àteru</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">Calidade</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">Prètziu</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Imbiu</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Cumpetitividade</string>
+    <!-- Text that is surrounded by quotes. The parameter is the actual text that is in quotes. An example of that text could be: Excellent craftsmanship, and that is displayed as “Excellent craftsmanship”. The text comes from a buyer's review that the feature is highlighting"   -->
+    <string name="surrounded_with_quotes">“%s”</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">mìnima</string>
+    <!-- Current state for elements that can be collapsed if interacting with them. Talkback will dictate this after a state change. -->
+    <string name="a11y_state_label_collapsed">minimadu</string>
     <!-- Action label for elements that can be expanded if interacting with them. Talkback will append this to say "Double tap to expand". -->
     <string name="a11y_action_label_expand">ismànnia</string>
+    <!-- Current state for elements that can be expanded if interacting with them. Talkback will dictate this after a state change. -->
+    <string name="a11y_state_label_expanded">ismanniadu</string>
+    <!-- Action label for links to a website containing documentation about a wallpaper collection. Talkback will append this to say "Double tap to open link to learn more about this collection". -->
+    <string name="a11y_action_label_wallpaper_collection_learn_more">aberi su ligòngiu pro àteras informatziones in pitzus de custa colletzione</string>
     <!-- Action label for links that point to an article. Talkback will append this to say "Double tap to read the article". -->
     <string name="a11y_action_label_read_article">leghe s’artìculu</string>
+
+    <!-- Action label for links to the Firefox Pocket website. Talkback will append this to say "Double tap to open link to learn more". -->
+    <string name="a11y_action_label_pocket_learn_more">aberi su ligòngiu pro nde lèghere àteras informatziones</string>
+    <!-- Title for dialog displayed when trying to access links present in a text. -->
+    <string name="a11y_links_title">Ligòngios</string>
+    <!-- Additional content description for text bodies that contain urls. -->
+    <string name="a11y_links_available">Ligòngios a disponimentu</string>
+
+    <!-- Translations feature-->
+
+    <!-- Translation request dialog -->
+    <!-- Title for the translation dialog that allows a user to translate the webpage. -->
+    <string name="translations_bottom_sheet_title">Boles tradùere custa pàgina?</string>
+    <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translations_bottom_sheet_title_first_time">Proa is tradutziones privadas in %1$s</string>
+    <!-- Text that links to additional information about the Firefox translations feature. -->
+    <string name="translations_bottom_sheet_info_message_learn_more">Àteras informatziones</string>
+    <!-- Label for the dropdown to select which language to translate from on the translations dialog. Usually the translate from language selected will be the same as the page language. -->
+    <string name="translations_bottom_sheet_translate_from">Tradue dae</string>
+    <!-- Label for the dropdown to select which language to translate to on the translations dialog. Usually the translate to language selected will be the user's preferred language. -->
+    <string name="translations_bottom_sheet_translate_to">Tradue in</string>
+    <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
+    <string name="translations_bottom_sheet_negative_button">Immoe nono</string>
+    <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
+    <string name="translations_bottom_sheet_negative_button_error">Fatu</string>
+    <!-- Button text on the translations dialog to begin a translation of the website. -->
+    <string name="translations_bottom_sheet_positive_button">Tradue</string>
+    <!-- Button text on the translations dialog when a translation error appears. -->
+    <string name="translations_bottom_sheet_positive_button_error">Torra a nce proare</string>
+    <!-- Inactive button text on the translations dialog that indicates a translation is currently in progress. This button will be accompanied by a loading icon. -->
+    <string name="translations_bottom_sheet_translating_in_progress">Traduende</string>
+    <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
+    <string name="translations_bottom_sheet_translating_in_progress_content_description">Tradutzione in cursu</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Sèbera una lìngua</string>
+    <!-- The title of the warning card informs the user that a language is not supported. The first parameter is the name of the language that is not supported. -->
+    <string name="translation_error_language_not_supported_warning_text">Custa lìngua no est ancora atzetada: %1$s.</string>
+    <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
+    <string name="translation_error_language_not_supported_learn_more">Àteras informatziones</string>
+
+    <!-- Translations options dialog -->
+    <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
+    <string name="translation_option_bottom_sheet_title">Optziones de tradutzione</string>
+    <!-- Button text for the button that will take the user to the translation settings dialog. -->
+    <string name="translation_option_bottom_sheet_translation_settings">Cunfiguratzione de sa tradutzione</string>
+
+    <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translation_option_bottom_sheet_about_translations">In pitzus de is tradutziones de %1$s</string>
+
+    <!-- Translation settings dialog -->
+    <!-- Title of the translation settings dialog that allows a user to set their preferred translation settings. -->
+    <string name="translation_settings_toolbar_title">Tradutziones</string>
+    <!-- Section header text that begins the section of a list of different options the user may select to adjust their translation preferences. -->
+    <string name="translation_settings_translation_preference">Preferèntzias de sa tradutzione</string>
+    <!-- Button text for the button that will take the user to the automatic translations settings dialog. On the automatic translations settings dialog, the user can set if translations should occur automatically for a given language. -->
+    <string name="translation_settings_automatic_translation">Tradutzione automàtica</string>
+    <!-- Button text for the button that will take the user to the never translate these sites dialog. On the never translate these sites dialog, the user can set if translations should never occur on certain websites. -->
+    <string name="translation_settings_automatic_never_translate_sites">Non traduas mai custos sitos</string>
+    <!-- Button text for the button that will take the user to the download languages dialog. On the download languages dialog, the user can manage which languages they would like to download for translations. -->
+    <string name="translation_settings_download_language">Iscàrriga lìnguas</string>
+
+    <!-- Automatic translation preference screen -->
+    <!-- Title of the automatic translation preference screen that will appear on the toolbar.-->
+    <string name="automatic_translation_toolbar_title_preference">Tradutzione automàtica</string>
+
+    <!-- Preference option for always translate. Radio button title text. -->
+    <string name="automatic_translation_option_always_translate_title_preference">Tradue semper</string>
+    <!-- Preference option for never translate. Radio button title text.-->
+    <string name="automatic_translation_option_never_translate_title_preference">Non traduas mai</string>
+
+    <!-- Never translate site preference screen -->
+    <!-- Title of the never translate site preference screen that will appear on the toolbar.-->
+    <string name="never_translate_site_toolbar_title_preference">Non traduas mai custos sitos</string>
+    <!-- Content description (not visible, for screen readers etc.): For a never-translated site list item that is selected.
+             The first parameter is web site url (for example:"wikipedia.com") -->
+    <string name="never_translate_site_item_list_content_description_preference">Boga %1$s</string>
+    <!-- The Delete site dialogue title will appear when the user clicks on a list item.
+             The first parameter is web site url (for example:"wikipedia.com") -->
+    <string name="never_translate_site_dialog_title_preference">Boles cantzellare %1$s?</string>
+    <!-- The Delete site dialogue positive button will appear when the user clicks on a list item. The site will be deleted. -->
+    <string name="never_translate_site_dialog_confirm_delete_preference">Cantzella</string>
+    <!-- The Delete site dialogue negative button will appear when the user clicks on a list item. The dialog will be dismissed. -->
+    <string name="never_translate_site_dialog_cancel_preference">Annulla</string>
+
+    <!-- Download languages preference screen -->
+    <!-- Title of the download languages preference screen toolbar.-->
+    <string name="download_languages_toolbar_title_preference">Iscàrriga lìnguas</string>
+    <!-- Clickable text from the screen header that links to a website. -->
+    <string name="download_languages_header_learn_more_preference">Àteras informatziones</string>
+    <!-- The subhead of the download language preference screen will appear above the pivot language. -->
+    <string name="download_languages_available_languages_preference">Lìnguas a disponimentu</string>
+    <!-- Text that will appear beside a core or pivot language package name to show that the language is necessary for the translation feature to function. -->
+    <string name="download_languages_default_system_language_require_preference">rechestu</string>
+    <!-- A text for download language preference item.
+    The first parameter is the language name, for example, "Spanish".
+    The second parameter is the language file size, for example, "(3.91 KB)" or, if the language package name is a pivot language, "(required)". -->
+    <string name="download_languages_language_item_preference">%1$s (%2$s)</string>
+    <!-- The subhead of the download language preference screen will appear above the items that were not downloaded. -->
+    <string name="download_language_header_preference">Iscàrriga lìnguas</string>
+    <!-- All languages list item. When the user presses this item, they can download or delete all languages. -->
+    <string name="download_language_all_languages_item_preference">Totu is lìnguas</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item that was downloaded, the user can now delete it. -->
+    <string name="download_languages_item_content_description_downloaded_state">Cantzella</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item, downloading is in progress. -->
+    <string name="download_languages_item_content_description_in_progress_state">In cursu</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item that was not downloaded. -->
+    <string name="download_languages_item_content_description_not_downloaded_state">Iscàrriga</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item that is selected. -->
+    <string name="download_languages_item_content_description_selected_state">Seletzionada</string>
+
+    <!-- Title for the dialog used by the translations feature to confirm deleting a language.
+    The dialog will be presented when the user requests deletion of a language.
+    The first parameter is the name of the language, for example, "Spanish" and the second parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_file_dialog_title">Boles cantzellare %1$s (%2$s)?</string>
+    <!-- Button text on the dialog used by the translations feature to confirm deleting a language. -->
+    <string name="delete_language_file_dialog_positive_button_text">Cantzella</string>
+    <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
+    <string name="delete_language_file_dialog_negative_button_text">Annulla</string>
+
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
+    <string name="download_language_file_dialog_positive_button_text">Iscàrriga</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file and perform a translation. -->
+    <string name="download_language_file_dialog_positive_button_text_all_languages">Iscàrriga e tradue</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
+    <string name="download_language_file_dialog_negative_button_text">Annulla</string>
+
     </resources>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 4cc16dd0f..07e0127c3 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -245,6 +245,9 @@
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">පිරික්සුම් ඉතිහාසය මකන්න</string>
 
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">පිටුව පරිවර්තනය</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">තෝරාගත් භාෂාව</string>
@@ -320,10 +323,15 @@
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
     <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">දැන් නොවේ</string>
 
+    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">ෆයර්ෆොක්ස් රහස්‍යතා දැන්වීම</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">ඔබට ආරක්‍ෂාව සලසන්නෙමු</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_3">අපගේ ලාභ නොලබන පිටුබලයක් සහිත අතිරික්සුව අන්තර්ජාලය පුරා ඔබව රහසින් ලුහුබඳින සමාගම් ස්වයංක්‍රීයව නවත්වයි.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">සමාගම් රහසින් අන්තර්ජාලය පුරා ඔබව ලුහුබැඳීම නැවැත්වීමට අපගේ ලාභ නොලබන පිටුබලයක් සහිත අතිරික්සුව සැමවිට උදව් කරයි.\n\nඅපගේ රහස්‍යතා දැන්වීමෙන් තව දැන ගන්න.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -427,6 +435,8 @@
 
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">දත්තකඩ පතාක අවහිරය</string>
+    <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
+    <string name="preferences_cookie_banner_reduction_private_mode">පෞද්. පිරික්සීමෙහි දත්තකඩ පතාක අවහිරය</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">මෙම අඩවියට අක්‍රියයි</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -443,9 +453,23 @@
     <string name="reduce_cookie_banner_unsupported_site_request_submitted_2">සහාය ඉල්ලීම යැවිණි</string>
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">අඩවියට සහාය නොදක්වයි</string>
+    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
+    <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">%1$s සඳහා දත්තකඩ පතාක අවහිරය සක්‍රිය කරන්නද?</string>
+    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
+    <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">%1$s සඳහා දත්තකඩ පතාක අවහිරය අක්‍රිය කරන්නද?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s මඟින්  මෙම අඩවියේ දත්තකඩ ඉල්ලීම් ස්වයංක්‍රීයව ඉවතලීමට නොහැක. ඉදිරියේ දී මෙම අඩවිය සඳහා සහාය දැක්වීමට ඉල්ලීමක් යැවීමට හැකිය.</string>
 
+    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
+    <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">අක්‍රිය කරන්න සහ %1$s දත්තකඩ මකා මෙම අඩවිය නැවත පූරණය කරනු ඇත. මෙය ඔබව නික්මවීමට හෝ බඩු කරත්ත හිස් කිරීමට ඉඩ ඇත.</string>
+    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
+    <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">සක්‍රිය කළහොත් %1$s මෙම අඩවියේ දත්තකඩ පතාක ස්වයංක්‍රීයව ඉවතලීමට උත්සාහ කරයි.</string>
+    <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
+    <string name="cookie_banner_cfr_title">%1$s ඔබ වෙනුවෙන් දත්තකඩ ඉවතලිණි</string>
+
+    <!--Message for the cookie banner re-engagement CFR -->
+    <string name="cookie_banner_cfr_message">බාධා අවමයි, මෙම අඩවියේ ඔබව ලුහුබඳින දත්තකඩ අවමයි.</string>
+
     <!-- Description of the preference to enable "HTTPS-Only" mode. -->
     <string name="preferences_https_only_summary">ඉහළ ආරක්‍ෂාවක් සඳහා HTTPS සංකේතන කෙටුම්පත භාවිතයෙන් අඩවි වෙත ස්වයංක්‍රීයව සම්බන්ධ වීමට තැත් කරයි.</string>
     <!-- Summary of https only preference if https only is set to off -->
@@ -1506,6 +1530,8 @@
     <string name="preference_enhanced_tracking_protection_custom_cookies_4">සමස්ත දත්තකඩ (අඩවි කැඩීමට හේතු වේ)</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
     <string name="preference_enhanced_tracking_protection_custom_cookies_5">හරස්-අඩවි දත්තකඩ හුදකලාව</string>
+    <!-- Preference for Global Privacy Control for the custom privacy settings for Global Privacy Control. '&amp;' is replaced with the ampersand symbol: &-->
+    <string name="preference_enhanced_tracking_protection_custom_global_privacy_control">දත්ත බෙදා විකිණීමෙන් වළකින ලෙස අඩවි වලට දන්වන්න</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content">ලුහුබැඳීමේ අන්තර්ගතය</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
@@ -1646,6 +1672,8 @@
     <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">මුරපද සමමුහූර්තය</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">උපාංගවල පිවිසුම් සමමුහූර්තය</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">උපාංග අතර මුරපද සමමුහූර්තය</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">සුරැකි පිවිසුම්</string>
     <!-- Preference to access list of saved passwords -->
@@ -1948,16 +1976,28 @@
     <string name="saved_login_password_description">පිවිසීමේ මුරපදය සඳහා සංස්කරණය කළ හැකි පෙළ ක්‍ෂේත්‍රය.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">පිවිසීමට වෙනස්කම් සුරකින්න.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">වෙනස්කම් සුරකින්න</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">සංස්කරණය</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">මුරපදය සංස්කරණය</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">නව පිවිසුමක් යොදන්න</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">මුරපදය එක් කරන්න</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">මුරපදයක් අවශ්‍යයි</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">මුරපදයක් යොදන්න</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">පරිශීලක නාමය අවශ්‍යයි</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">පරිශ්‍රීලක නාමයක් යොදන්න</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">සත්කාරක නාමය අවශ්‍යයි</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">වියමන ලිපිනයක් යොදන්න</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">හඬ සෙවුම</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2200,6 +2240,9 @@
     <!-- Action label for links to the Firefox Pocket website. Talkback will append this to say "Double tap to open link to learn more". -->
     <string name="a11y_action_label_pocket_learn_more">තව දැන ගැනීමට සබැඳිය අරින්න</string>
 
+    <!-- Title for dialog displayed when trying to access links present in a text. -->
+    <string name="a11y_links_title">සබැඳි</string>
+
     <!-- Translations feature-->
 
     <!-- Text that links to additional information about the Firefox translations feature. -->
@@ -2298,6 +2341,15 @@
     <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
     <string name="delete_language_file_dialog_negative_button_text">අවලංගු</string>
 
+    <!-- Title for the data saving mode warning dialog used by the translations feature.
+    This dialog will be presented when the user attempts to download a language or perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file.-->
+    <string name="download_language_file_dialog_title">දත්ත ඉතිරි කරන ප්‍රකාරයේ දී බාගන්න ද (%1$s)?</string>
+    <!-- Additional information for the data saving mode warning dialog used by the translations feature. This text explains the reason a download is required for a translation. -->
+    <string name="download_language_file_dialog_message_all_languages">පරිවර්තන පෞද්ගලිකව රැඳවීමට ඔබගේ නිහිතයට අර්ධව භාෂා බාගැනෙයි.</string>
+    <!-- Checkbox label text on the data saving mode warning dialog used by the translations feature. This checkbox allows users to ignore the data usage warnings. -->
+    <string name="download_language_file_dialog_checkbox_text">සෑමවිට දත්ත ඉතිරි කරන ප්‍රකාරයේ දී බාගන්න</string>
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
     <string name="download_language_file_dialog_positive_button_text">බාගන්න</string>
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file and perform a translation. -->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 403d88a38..1376022d9 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -1314,6 +1314,8 @@
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">Zapri zasebne zavihke</string>
 
+    <string name="notification_erase_text_android_14">Tapnite to obvestilo ali ga povlecite vstran, da zaprete zasebne zavihke.</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">Trženje</string>
 
@@ -1722,8 +1724,12 @@
     <string name="preferences_passwords_exceptions">Izjeme</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Tu bodo prikazane prijave in gesla, ki niso shranjena.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">Za tukaj navedena mesta %s ne bo shranjeval gesel.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Prijave in gesla za te strani ne bodo shranjene.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">Za ta spletna mesta %s ne bo shranjeval gesel.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Izbriši vse izjeme</string>
     <!-- Hint for search box in logins list -->
@@ -1758,8 +1764,12 @@
     <string name="logins_biometric_prompt_message">Odklenite za ogled shranjenih prijav</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Zavarujte svoje prijave in gesla</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Zavarujte shranjena gesla</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Nastavite vzorec za zaklepanje naprave, PIN ali geslo za zaščito pred dostopom do shranjenih prijav in gesel, če vašo napravo uporablja še kdo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Nastavite vzorec za zaklepanje naprave, PIN ali geslo za zaščito pred dostopom do shranjenih gesel, če vašo napravo uporablja še kdo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Pozneje</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1794,6 +1804,8 @@
     <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Shranjuj in izpolnjuj načine plačila</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Podatki so šifrirani</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s šifrira vse načine plačila, ki jih shranite</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sinhroniziraj kartice med napravami</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -2025,8 +2037,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Možnosti gesel</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Besedilno polje za urejanje spletnega naslova prijave.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Besedilno polje za urejanje spletnega naslova.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Besedilno polje za urejanje uporabniškega imena prijave.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Besedilno polje za urejanje uporabniškega imena.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Besedilno polje za urejanje gesla prijave.</string>
     <!--  The editable text field for a login's password. -->
@@ -2430,6 +2446,8 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Nikoli ne prevajaj jezika %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Nikoli ne prevajaj tega spletnega mesta</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Preglasi vse druge nastavitve</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Nastavitve prevajanja</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
@@ -2479,6 +2497,9 @@
     <!-- The Delete site dialogue negative button will appear when the user clicks on a list item. The dialog will be dismissed. -->
     <string name="never_translate_site_dialog_cancel_preference">Prekliči</string>
 
+    <!-- Download languages preference screen -->
+    <!-- Title of the download languages preference screen toolbar.-->
+    <string name="download_languages_toolbar_title_preference">Prenesi jezike</string>
     <!-- Clickable text from the screen header that links to a website. -->
     <string name="download_languages_header_learn_more_preference">Več o tem</string>
     <!-- The subhead of the download language preference screen will appear above the pivot language. -->
@@ -2500,6 +2521,8 @@
     <!-- Content description (not visible, for screen readers etc.): For a language list item that is selected. -->
     <string name="download_languages_item_content_description_selected_state">Izbrano</string>
 
+    <!-- Additional information for the dialog used by the translations feature to confirm deleting all languages file. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="delete_language_all_languages_file_dialog_message">Če izbrišete vse jezike, bo %1$s pri prevajanju v predpomnilnik naložil delne jezike.</string>
     <!-- Button text on the dialog used by the translations feature to confirm deleting a language. -->
     <string name="delete_language_file_dialog_positive_button_text">Izbriši</string>
     <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
diff --git a/app/src/main/res/values-tg/strings.xml b/app/src/main/res/values-tg/strings.xml
index 00441626d..4eaf14fdb 100644
--- a/app/src/main/res/values-tg/strings.xml
+++ b/app/src/main/res/values-tg/strings.xml
@@ -246,6 +246,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Танзимоти саҳифаи асосӣ</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Экрани асосӣ</string>
@@ -253,6 +254,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Пок кардани таърихи тамошо</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Тарҷума кардани саҳифа</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Забони интихобшуда</string>
@@ -264,8 +268,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Ҷустуҷӯ</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Низоми ҷустуҷӯӣ</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Танзимоти низоми ҷустуҷӯӣ</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -320,14 +322,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Огоҳиҳо барои кори бештар бо «%s» ба шумо кумак мекунанд</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Огоҳиҳо барои кори бештар бо «%s» ба шумо кумак мекунанд</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Варақаҳои худро байни дастгоҳҳо ҳамоҳанг созед, боргириҳоро идора кунед, барои беҳтар танзим кардани муҳофизати махфияти «%s» маслиҳатҳо гиред ва аз чизҳои бештар истифода баред.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Варақаҳои худро байни дастгоҳҳо ҳамоҳанг созед, боргириҳоро идора кунед, барои беҳтар танзим кардани муҳофизати махфияти «%s» маслиҳатҳо гиред ва аз чизҳои бештар истифода баред.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Идома додан</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Идома додан</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ҳоло не</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ҳоло не</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -444,21 +446,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Реҷаи «Танҳо HTTPS»</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Маҳдудкунии баннери куки</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Манъкунандаи баннери куки</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Манъкунандаи баннери куки дар тамошокунии хусусӣ</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Маҳдуд кардани баннерҳои куки</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Ғайрифаъол</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Фаъол</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">«%1$s» ба таври худкор кушиш мекунад, ки дархостҳои кукиҳоро дар баннерҳои кукиҳо рад кунад.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Барои ин сомона хомӯш аст</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -476,36 +468,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Ин сомона дар айни замон дастгирӣ намешавад</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">«Маҳдудкунии баннери куки»-ро барои %1$s фаъол месозед?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Манъкунандаи баннери кукиро барои %1$s фаъол мекунед?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">«Маҳдудкунии баннери куки»-ро барои %1$s хомӯш месозед?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Манъкунандаи баннери кукиро барои %1$s хомӯш мекунед?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">«%1$s» наметавонад, ки дархостҳои кукиро барои ин сомона ба таври худкор рад кунад. Шумо метавонед барои дастгирӣ кардани ин сомона дар оянда дархостеро фиристонед.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s кукиҳои ин сомонаро тоза мекунад ва саҳифаро аз нав бор мекунад. Амали тозакунии ҳамаи кукиҳо метавонад шуморо аз сомона хориҷ кунад ва сабадҳои харидории шуморо холӣ намояд.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Хомӯш кунед ва «%1$s» кукиҳоро тоза намуда, ин сомонаро аз нав бор мекунад. Ин амал метавонад шуморо аз сомона хориҷ кунад ва сабадҳои харидории шуморо холӣ намояд.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">«%1$s» кӯшиш мекунад, ки ҳамаи дархостҳои кукиҳоро дар сомонаҳои дастгиришаванда ба таври худкор рад кунад.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Фаъол созед, ва «%1$s» кӯшиш мекунад, ки ҳамаи баннерҳои кукиро дар ин сомона ба таври худкор рад кунад.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Ба «%1$s» иҷозат медиҳед, ки баннерҳои кукиро рад кунад?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">«%1$s» метавонад бисёр дархостҳои баннерҳои кукиро ба таври худкор рад кунад.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ҳоло не</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Шумо бояд камтар дархостҳои кукиҳоро бинед</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Иҷозат додан</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">«%1$s» дар ҳоли ҳозир барои шумо кукиҳоро рад кард</string>
@@ -1294,8 +1267,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Нодида гузарондан</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Чоп ғайриимкон аст</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Ин саҳифа чоп карда намешавад</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Чоп кардан</string>
@@ -1746,6 +1717,8 @@
     <string name="preferences_passwords_saved_logins_description_empty_text">Воридшавиҳое, ки шумо дар %s нигоҳ медоред ё ҳамоҳанг мекунед, дар ин ҷо нишон дода мешаванд.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Маълумоти бештар дар бораи ҳамоҳангсозӣ</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Маълумоти бештар дар бораи ҳамоҳангсозӣ</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Истисноҳо</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
@@ -2223,8 +2196,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Нуқтаҳои асосӣ</b> аз тақризҳои «%s» ба хулоса омаданд, ки дар давоми 80 рӯзи охир ҷамъ карда шудаанд ва онҳо ба умеди мо боэътимод мебошанд.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Маълумоти бештар дар бораи «%s».</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">чӣ тавр «%s» аз ҷониби «Mozilla» сифати тақризҳоро муайян мекунад</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">чӣ тавр «%s» сифати тақризҳоро муайян мекунад</string>
     <!-- Text for title of settings section. -->

From 30b306f1d91721957af89c64581cee6394cec37a Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 1 Feb 2024 11:47:03 +0200
Subject: [PATCH 097/222] Bug 1877939 - Remove redundant assertion functions
 from EnhancedTrackingProtectionRobot

---
 .../robots/EnhancedTrackingProtectionRobot.kt | 61 ++++++++-----------
 1 file changed, 26 insertions(+), 35 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt
index 29e2a25ab..a56bab508 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt
@@ -38,10 +38,29 @@ import org.mozilla.fenix.helpers.isChecked
  * Implementation of Robot Pattern for Enhanced Tracking Protection UI.
  */
 class EnhancedTrackingProtectionRobot {
-    fun verifyEnhancedTrackingProtectionSheetStatus(status: String, state: Boolean) =
-        assertEnhancedTrackingProtectionSheetStatus(status, state)
+    fun verifyEnhancedTrackingProtectionSheetStatus(status: String, state: Boolean) {
+        mDevice.waitNotNull(Until.findObjects(By.text("Protections are $status for this site")))
+        onView(ViewMatchers.withResourceName("switch_widget")).check(
+            matches(
+                isChecked(
+                    state,
+                ),
+            ),
+        )
+        Log.i(TAG, "verifyEnhancedTrackingProtectionSheetStatus: Verified ETP toggle is checked: $state")
+    }
 
-    fun verifyETPSwitchVisibility(visible: Boolean) = assertETPSwitchVisibility(visible)
+    fun verifyETPSwitchVisibility(visible: Boolean) {
+        if (visible) {
+            enhancedTrackingProtectionSwitch()
+                .check(matches(isDisplayed()))
+            Log.i(TAG, "verifyETPSwitchVisibility: Verified ETP toggle is displayed")
+        } else {
+            enhancedTrackingProtectionSwitch()
+                .check(matches(not(isDisplayed())))
+            Log.i(TAG, "verifyETPSwitchVisibility: Verified ETP toggle is not displayed")
+        }
+    }
 
     fun verifyCrossSiteCookiesBlocked(isBlocked: Boolean) {
         assertUIObjectExists(itemWithResId("$packageName:id/cross_site_tracking"))
@@ -184,7 +203,10 @@ class EnhancedTrackingProtectionRobot {
             pageSecurityIndicator().waitForExists(waitingTime)
             pageSecurityIndicator().click()
             Log.i(TAG, "openEnhancedTrackingProtectionSheet: Clicked site security button")
-            assertSecuritySheetIsCompletelyDisplayed()
+            Log.i(TAG, "openEnhancedTrackingProtectionSheet: Looking for quick actions sheet")
+            mDevice.findObject(UiSelector().description(getStringResource(R.string.quick_settings_sheet)))
+                .waitForExists(waitingTime)
+            assertUIObjectExists(itemWithResId("$packageName:id/quick_action_sheet"))
 
             EnhancedTrackingProtectionRobot().interact()
             return Transition()
@@ -236,30 +258,6 @@ fun enhancedTrackingProtection(interact: EnhancedTrackingProtectionRobot.() -> U
     return EnhancedTrackingProtectionRobot.Transition()
 }
 
-private fun assertETPSwitchVisibility(visible: Boolean) {
-    if (visible) {
-        enhancedTrackingProtectionSwitch()
-            .check(matches(isDisplayed()))
-        Log.i(TAG, "assertETPSwitchVisibility: Verified ETP toggle is displayed")
-    } else {
-        enhancedTrackingProtectionSwitch()
-            .check(matches(not(isDisplayed())))
-        Log.i(TAG, "assertETPSwitchVisibility: Verified ETP toggle is not displayed")
-    }
-}
-
-private fun assertEnhancedTrackingProtectionSheetStatus(status: String, state: Boolean) {
-    mDevice.waitNotNull(Until.findObjects(By.text("Protections are $status for this site")))
-    onView(ViewMatchers.withResourceName("switch_widget")).check(
-        matches(
-            isChecked(
-                state,
-            ),
-        ),
-    )
-    Log.i(TAG, "assertEnhancedTrackingProtectionSheetStatus: Verified ETP toggle is checked: $state")
-}
-
 private fun pageSecurityIndicator() =
     mDevice.findObject(UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_security_indicator"))
 
@@ -315,10 +313,3 @@ private fun fingerprintersBlockListButton() =
             withText("Fingerprinters"),
         ),
     )
-
-private fun assertSecuritySheetIsCompletelyDisplayed() {
-    Log.i(TAG, "assertSecuritySheetIsCompletelyDisplayed: Looking for quick actions sheet")
-    mDevice.findObject(UiSelector().description(getStringResource(R.string.quick_settings_sheet)))
-        .waitForExists(waitingTime)
-    assertUIObjectExists(itemWithResId("$packageName:id/quick_action_sheet"))
-}

From 3146218088232f5c316a494069ff0d18d0409884 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 1 Feb 2024 20:43:41 +0200
Subject: [PATCH 098/222] Bug 1877939 - Add pairs of test logs to
 EnhancedTrackingProtectionRobot

---
 .../robots/EnhancedTrackingProtectionRobot.kt | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt
index a56bab508..365b30c98 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt
@@ -40,6 +40,7 @@ import org.mozilla.fenix.helpers.isChecked
 class EnhancedTrackingProtectionRobot {
     fun verifyEnhancedTrackingProtectionSheetStatus(status: String, state: Boolean) {
         mDevice.waitNotNull(Until.findObjects(By.text("Protections are $status for this site")))
+        Log.i(TAG, "verifyEnhancedTrackingProtectionSheetStatus: Trying to check ETP toggle is checked: $state")
         onView(ViewMatchers.withResourceName("switch_widget")).check(
             matches(
                 isChecked(
@@ -52,10 +53,12 @@ class EnhancedTrackingProtectionRobot {
 
     fun verifyETPSwitchVisibility(visible: Boolean) {
         if (visible) {
+            Log.i(TAG, "verifyETPSwitchVisibility: Trying to verify ETP toggle is displayed")
             enhancedTrackingProtectionSwitch()
                 .check(matches(isDisplayed()))
             Log.i(TAG, "verifyETPSwitchVisibility: Verified ETP toggle is displayed")
         } else {
+            Log.i(TAG, "verifyETPSwitchVisibility: Trying to verify ETP toggle is not displayed")
             enhancedTrackingProtectionSwitch()
                 .check(matches(not(isDisplayed())))
             Log.i(TAG, "verifyETPSwitchVisibility: Verified ETP toggle is not displayed")
@@ -64,9 +67,11 @@ class EnhancedTrackingProtectionRobot {
 
     fun verifyCrossSiteCookiesBlocked(isBlocked: Boolean) {
         assertUIObjectExists(itemWithResId("$packageName:id/cross_site_tracking"))
+        Log.i(TAG, "verifyCrossSiteCookiesBlocked: Trying to click cross site cookies block list button")
         crossSiteCookiesBlockListButton().click()
         Log.i(TAG, "verifyCrossSiteCookiesBlocked: Clicked cross site cookies block list button")
         // Verifies the trackers block/allow list
+        Log.i(TAG, "verifyCrossSiteCookiesBlocked: Trying to verify cross site cookies are blocked: $isBlocked")
         onView(withId(R.id.details_blocking_header))
             .check(
                 matches(
@@ -84,9 +89,11 @@ class EnhancedTrackingProtectionRobot {
 
     fun verifySocialMediaTrackersBlocked(isBlocked: Boolean) {
         assertUIObjectExists(itemWithResId("$packageName:id/social_media_trackers"))
+        Log.i(TAG, "verifySocialMediaTrackersBlocked: Trying to click social trackers block list button")
         socialTrackersBlockListButton().click()
         Log.i(TAG, "verifySocialMediaTrackersBlocked: Clicked social trackers block list button")
         // Verifies the trackers block/allow list
+        Log.i(TAG, "verifySocialMediaTrackersBlocked: Trying to verify social trackers are blocked: $isBlocked")
         onView(withId(R.id.details_blocking_header))
             .check(
                 matches(
@@ -100,15 +107,18 @@ class EnhancedTrackingProtectionRobot {
                 ),
             )
         Log.i(TAG, "verifySocialMediaTrackersBlocked: Verified social trackers are blocked: $isBlocked")
+        Log.i(TAG, "verifySocialMediaTrackersBlocked: Trying to verify blocked social trackers list is displayed")
         onView(withId(R.id.blocking_text_list)).check(matches(isDisplayed()))
         Log.i(TAG, "verifySocialMediaTrackersBlocked: Verified blocked social trackers list is displayed")
     }
 
     fun verifyFingerprintersBlocked(isBlocked: Boolean) {
         assertUIObjectExists(itemWithResId("$packageName:id/fingerprinters"))
+        Log.i(TAG, "verifyFingerprintersBlocked: Trying to click fingerprinters block list button")
         fingerprintersBlockListButton().click()
         Log.i(TAG, "verifyFingerprintersBlocked: Clicked fingerprinters block list button")
         // Verifies the trackers block/allow list
+        Log.i(TAG, "verifyFingerprintersBlocked: Trying to verify fingerprinters are blocked: $isBlocked")
         onView(withId(R.id.details_blocking_header))
             .check(
                 matches(
@@ -122,15 +132,18 @@ class EnhancedTrackingProtectionRobot {
                 ),
             )
         Log.i(TAG, "verifyFingerprintersBlocked: Verified fingerprinters are blocked: $isBlocked")
+        Log.i(TAG, "verifyFingerprintersBlocked: Trying to verify blocked fingerprinter trackers list is displayed")
         onView(withId(R.id.blocking_text_list)).check(matches(isDisplayed()))
         Log.i(TAG, "verifyFingerprintersBlocked: Verified blocked fingerprinter trackers list is displayed")
     }
 
     fun verifyCryptominersBlocked(isBlocked: Boolean) {
         assertUIObjectExists(itemWithResId("$packageName:id/cryptominers"))
+        Log.i(TAG, "verifyCryptominersBlocked: Trying to click cryptominers block list button")
         cryptominersBlockListButton().click()
         Log.i(TAG, "verifyCryptominersBlocked: Clicked cryptominers block list button")
         // Verifies the trackers block/allow list
+        Log.i(TAG, "verifyCryptominersBlocked: Trying to verify cryptominers are blocked: $isBlocked")
         onView(withId(R.id.details_blocking_header))
             .check(
                 matches(
@@ -144,15 +157,18 @@ class EnhancedTrackingProtectionRobot {
                 ),
             )
         Log.i(TAG, "verifyCryptominersBlocked: Verified cryptominers are blocked: $isBlocked")
+        Log.i(TAG, "verifyCryptominersBlocked: Trying to verify blocked cryptominers trackers list is displayed")
         onView(withId(R.id.blocking_text_list)).check(matches(isDisplayed()))
         Log.i(TAG, "verifyCryptominersBlocked: Verified blocked cryptominers trackers list is displayed")
     }
 
     fun verifyTrackingContentBlocked(isBlocked: Boolean) {
         assertUIObjectExists(itemWithText("Tracking Content"))
+        Log.i(TAG, "verifyTrackingContentBlocked: Trying to click tracking content block list button")
         trackingContentBlockListButton().click()
         Log.i(TAG, "verifyTrackingContentBlocked: Clicked tracking content block list button")
         // Verifies the trackers block/allow list
+        Log.i(TAG, "verifyTrackingContentBlocked: Trying to verify tracking content is blocked: $isBlocked")
         onView(withId(R.id.details_blocking_header))
             .check(
                 matches(
@@ -166,11 +182,13 @@ class EnhancedTrackingProtectionRobot {
                 ),
             )
         Log.i(TAG, "verifyTrackingContentBlocked: Verified tracking content is blocked: $isBlocked")
+        Log.i(TAG, "verifyTrackingContentBlocked: Trying to verify blocked tracking content trackers list is displayed")
         onView(withId(R.id.blocking_text_list)).check(matches(isDisplayed()))
         Log.i(TAG, "verifyTrackingContentBlocked: Verified blocked tracking content trackers list is displayed")
     }
 
     fun viewTrackingContentBlockList() {
+        Log.i(TAG, "viewTrackingContentBlockList: Trying to verify blocked tracking content trackers")
         onView(withId(R.id.blocking_text_list))
             .check(
                 matches(
@@ -193,19 +211,23 @@ class EnhancedTrackingProtectionRobot {
         )
 
     fun navigateBackToDetails() {
+        Log.i(TAG, "navigateBackToDetails: Trying to click details list back button")
         onView(withId(R.id.details_back)).click()
         Log.i(TAG, "navigateBackToDetails: Clicked details list back button")
     }
 
     class Transition {
         fun openEnhancedTrackingProtectionSheet(interact: EnhancedTrackingProtectionRobot.() -> Unit): Transition {
-            Log.i(TAG, "openEnhancedTrackingProtectionSheet: Looking for site security button")
+            Log.i(TAG, "openEnhancedTrackingProtectionSheet: Waiting for $waitingTime ms for site security button to exist")
             pageSecurityIndicator().waitForExists(waitingTime)
+            Log.i(TAG, "openEnhancedTrackingProtectionSheet: Waited for $waitingTime ms for site security button to exist")
+            Log.i(TAG, "openEnhancedTrackingProtectionSheet: Trying to click site security button")
             pageSecurityIndicator().click()
             Log.i(TAG, "openEnhancedTrackingProtectionSheet: Clicked site security button")
-            Log.i(TAG, "openEnhancedTrackingProtectionSheet: Looking for quick actions sheet")
+            Log.i(TAG, "openEnhancedTrackingProtectionSheet: Waiting for $waitingTime ms for quick actions sheet to exits")
             mDevice.findObject(UiSelector().description(getStringResource(R.string.quick_settings_sheet)))
                 .waitForExists(waitingTime)
+            Log.i(TAG, "openEnhancedTrackingProtectionSheet: Waited for $waitingTime ms for quick actions sheet to exits")
             assertUIObjectExists(itemWithResId("$packageName:id/quick_action_sheet"))
 
             EnhancedTrackingProtectionRobot().interact()
@@ -214,6 +236,7 @@ class EnhancedTrackingProtectionRobot {
 
         fun closeEnhancedTrackingProtectionSheet(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
             // Back out of the Enhanced Tracking Protection sheet
+            Log.i(TAG, "closeEnhancedTrackingProtectionSheet: Trying to click device back button")
             mDevice.pressBack()
             Log.i(TAG, "closeEnhancedTrackingProtectionSheet: Clicked device back button")
 
@@ -222,6 +245,7 @@ class EnhancedTrackingProtectionRobot {
         }
 
         fun toggleEnhancedTrackingProtectionFromSheet(interact: EnhancedTrackingProtectionRobot.() -> Unit): Transition {
+            Log.i(TAG, "toggleEnhancedTrackingProtectionFromSheet: Trying to click ETP switch")
             enhancedTrackingProtectionSwitch().click()
             Log.i(TAG, "toggleEnhancedTrackingProtectionFromSheet: Clicked ETP switch")
 
@@ -230,10 +254,13 @@ class EnhancedTrackingProtectionRobot {
         }
 
         fun openProtectionSettings(interact: SettingsSubMenuEnhancedTrackingProtectionRobot.() -> Unit): SettingsSubMenuEnhancedTrackingProtectionRobot.Transition {
-            Log.i(TAG, "openProtectionSettings: Looking for ETP sheet \"Details\" button")
+            Log.i(TAG, "openProtectionSettings: Waiting for $waitingTime ms for ETP sheet \"Details\" button to exist")
             openEnhancedTrackingProtectionDetails().waitForExists(waitingTime)
+            Log.i(TAG, "openProtectionSettings: Waited for $waitingTime ms for ETP sheet \"Details\" button to exist")
+            Log.i(TAG, "openProtectionSettings: Trying to click ETP sheet \"Details\" button")
             openEnhancedTrackingProtectionDetails().click()
             Log.i(TAG, "openProtectionSettings: Clicked ETP sheet \"Details\" button")
+            Log.i(TAG, "openProtectionSettings: Trying to click \"Protection Settings\" button")
             trackingProtectionSettingsButton().click()
             Log.i(TAG, "openProtectionSettings: Clicked \"Protection Settings\" button")
 
@@ -242,8 +269,10 @@ class EnhancedTrackingProtectionRobot {
         }
 
         fun openDetails(interact: EnhancedTrackingProtectionRobot.() -> Unit): Transition {
-            Log.i(TAG, "openDetails: Looking for ETP sheet \"Details\" button")
+            Log.i(TAG, "openDetails: Waiting for $waitingTime ms for ETP sheet \"Details\" button to exist")
             openEnhancedTrackingProtectionDetails().waitForExists(waitingTime)
+            Log.i(TAG, "openDetails: Waited for $waitingTime ms for ETP sheet \"Details\" button to exist")
+            Log.i(TAG, "openDetails: Trying to click ETP sheet \"Details\" button")
             openEnhancedTrackingProtectionDetails().click()
             Log.i(TAG, "openDetails: Clicked ETP sheet \"Details\" button")
 

From c8934beca1d8e3f21398947127de0b1ac608dd40 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 1 Feb 2024 12:09:13 +0200
Subject: [PATCH 099/222] Bug 1877945 - Remove redundant assertion functions
 from FindInPageRobot

---
 .../fenix/ui/robots/FindInPageRobot.kt        | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt
index ed459189b..1b43737ca 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt
@@ -27,9 +27,21 @@ import org.mozilla.fenix.helpers.ext.waitNotNull
  * Implementation of Robot Pattern for the find in page UI.
  */
 class FindInPageRobot {
-    fun verifyFindInPageNextButton() = assertFindInPageNextButton()
-    fun verifyFindInPagePrevButton() = assertFindInPagePrevButton()
-    fun verifyFindInPageCloseButton() = assertFindInPageCloseButton()
+    fun verifyFindInPageNextButton() {
+        findInPageNextButton()
+            .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        Log.i(TAG, "verifyFindInPageNextButton: Verified find in page next result button is visible")
+    }
+    fun verifyFindInPagePrevButton() {
+        findInPagePrevButton()
+            .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        Log.i(TAG, "verifyFindInPagePrevButton: Verified find in page previous result button is visible")
+    }
+    fun verifyFindInPageCloseButton() {
+        findInPageCloseButton()
+            .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        Log.i(TAG, "verifyFindInPageCloseButton: Verified find in page close button is visible")
+    }
     fun clickFindInPageNextButton() {
         findInPageNextButton().click()
         Log.i(TAG, "clickFindInPageNextButton: Clicked next result button")
@@ -84,21 +96,3 @@ private fun findInPageResult() = onView(withId(R.id.find_in_page_result_text))
 private fun findInPageNextButton() = onView(withId(R.id.find_in_page_next_btn))
 private fun findInPagePrevButton() = onView(withId(R.id.find_in_page_prev_btn))
 private fun findInPageCloseButton() = onView(withId(R.id.find_in_page_close_btn))
-
-private fun assertFindInPageNextButton() {
-    findInPageNextButton()
-        .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-    Log.i(TAG, "assertFindInPageNextButton: Verified find in page next result button is visible")
-}
-
-private fun assertFindInPagePrevButton() {
-    findInPagePrevButton()
-        .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-    Log.i(TAG, "assertFindInPagePrevButton: Verified find in page previous result button is visible")
-}
-
-private fun assertFindInPageCloseButton() {
-    findInPageCloseButton()
-        .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-    Log.i(TAG, "assertFindInPageCloseButton: Verified find in page close button is visible")
-}

From 28746c1ba7fb4cf1b0584da979cc652a33b08bbf Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 1 Feb 2024 20:49:39 +0200
Subject: [PATCH 100/222] Bug 1877945 - Add pairs of test logs to
 FindInPageRobot

---
 .../mozilla/fenix/ui/robots/FindInPageRobot.kt  | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt
index 1b43737ca..7f0789c22 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/FindInPageRobot.kt
@@ -28,48 +28,59 @@ import org.mozilla.fenix.helpers.ext.waitNotNull
  */
 class FindInPageRobot {
     fun verifyFindInPageNextButton() {
+        Log.i(TAG, "verifyFindInPageNextButton: Trying to verify find in page next result button is visible")
         findInPageNextButton()
             .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
         Log.i(TAG, "verifyFindInPageNextButton: Verified find in page next result button is visible")
     }
     fun verifyFindInPagePrevButton() {
+        Log.i(TAG, "verifyFindInPagePrevButton: Trying to verify find in page previous result button is visible")
         findInPagePrevButton()
             .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
         Log.i(TAG, "verifyFindInPagePrevButton: Verified find in page previous result button is visible")
     }
     fun verifyFindInPageCloseButton() {
+        Log.i(TAG, "verifyFindInPageCloseButton: Trying to verify find in page close button is visible")
         findInPageCloseButton()
             .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
         Log.i(TAG, "verifyFindInPageCloseButton: Verified find in page close button is visible")
     }
     fun clickFindInPageNextButton() {
+        Log.i(TAG, "clickFindInPageNextButton: Trying to click next result button")
         findInPageNextButton().click()
         Log.i(TAG, "clickFindInPageNextButton: Clicked next result button")
     }
     fun clickFindInPagePrevButton() {
+        Log.i(TAG, "clickFindInPagePrevButton: Trying to click previous result button")
         findInPagePrevButton().click()
         Log.i(TAG, "clickFindInPagePrevButton: Clicked previous result button")
     }
 
     fun enterFindInPageQuery(expectedText: String) {
         mDevice.waitNotNull(Until.findObject(By.res("org.mozilla.fenix.debug:id/find_in_page_query_text")), waitingTime)
+        Log.i(TAG, "enterFindInPageQuery: Trying to clear find in page bar text")
         findInPageQuery().perform(clearText())
         Log.i(TAG, "enterFindInPageQuery: Cleared find in page bar text")
         mDevice.waitNotNull(Until.gone(By.res("org.mozilla.fenix.debug:id/find_in_page_result_text")), waitingTime)
+        Log.i(TAG, "enterFindInPageQuery: Trying to type $expectedText in find in page bar")
         findInPageQuery().perform(typeText(expectedText))
-        Log.i(TAG, "enterFindInPageQuery: Typed $expectedText to find in page bar")
+        Log.i(TAG, "enterFindInPageQuery: Typed $expectedText in find page bar")
         mDevice.waitNotNull(Until.findObject(By.res("org.mozilla.fenix.debug:id/find_in_page_result_text")), waitingTime)
     }
 
     fun verifyFindInPageResult(ratioCounter: String) {
         mDevice.waitNotNull(Until.findObject(By.text(ratioCounter)), waitingTime)
+        Log.i(TAG, "verifyFindInPageResult: Trying to verify $ratioCounter results")
         findInPageResult().check(matches(withText((ratioCounter))))
         Log.i(TAG, "verifyFindInPageResult: Verified $ratioCounter results")
     }
 
     class Transition {
         fun closeFindInPageWithCloseButton(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "closeFindInPageWithCloseButton: Waiting for device to be idle")
             mDevice.waitForIdle()
+            Log.i(TAG, "closeFindInPageWithCloseButton: Device was idle")
+            Log.i(TAG, "closeFindInPageWithCloseButton: Trying to close find in page button")
             findInPageCloseButton().click()
             Log.i(TAG, "closeFindInPageWithCloseButton: Clicked close find in page button")
             BrowserRobot().interact()
@@ -77,11 +88,15 @@ class FindInPageRobot {
         }
 
         fun closeFindInPageWithBackButton(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "closeFindInPageWithBackButton: Waiting for device to be idle")
             mDevice.waitForIdle()
+            Log.i(TAG, "closeFindInPageWithBackButton: Device was idle")
 
             // Will need to press back 2x, the first will only dismiss the keyboard
+            Log.i(TAG, "closeFindInPageWithBackButton: Trying to press 1x the device back button")
             mDevice.pressBack()
             Log.i(TAG, "closeFindInPageWithBackButton: Pressed 1x the device back button")
+            Log.i(TAG, "closeFindInPageWithBackButton: Trying to press 2x the device back button")
             mDevice.pressBack()
             Log.i(TAG, "closeFindInPageWithBackButton: Pressed 2x the device back button")
 

From 31df2b71675fb5f41180b8586c779cef44a589f7 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 1 Feb 2024 14:17:38 +0200
Subject: [PATCH 101/222] Bug 1878028 - Remove redundant assertion functions
 from HistoryRobot

---
 .../mozilla/fenix/ui/ComposeHistoryTest.kt    |  5 +-
 .../org/mozilla/fenix/ui/ComposeSearchTest.kt |  3 +-
 .../java/org/mozilla/fenix/ui/HistoryTest.kt  |  5 +-
 .../java/org/mozilla/fenix/ui/SearchTest.kt   |  3 +-
 .../mozilla/fenix/ui/robots/HistoryRobot.kt   | 87 ++++++-------------
 5 files changed, 37 insertions(+), 66 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHistoryTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHistoryTest.kt
index 5a2fed714..138ffa7c3 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHistoryTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHistoryTest.kt
@@ -28,6 +28,7 @@ import org.mozilla.fenix.helpers.RecyclerViewIdlingResource
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.historyMenu
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -128,7 +129,7 @@ class ComposeHistoryTest {
             ) {
                 clickDeleteHistoryButton(firstWebPage.url.toString())
             }
-            verifyDeleteSnackbarText("Deleted")
+            verifySnackBarText(expectedText = "Deleted")
             verifyEmptyHistoryView()
         }
     }
@@ -153,7 +154,7 @@ class ComposeHistoryTest {
             verifyDeleteConfirmationMessage()
             selectEverythingOption()
             confirmDeleteAllHistory()
-            verifyDeleteSnackbarText("Browsing data deleted")
+            verifySnackBarText(expectedText = "Browsing data deleted")
             verifyEmptyHistoryView()
         }
     }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSearchTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSearchTest.kt
index 71391b522..27f46d84f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSearchTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSearchTest.kt
@@ -31,6 +31,7 @@ import org.mozilla.fenix.helpers.SearchDispatcher
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.ui.robots.clickContextMenuItem
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -472,7 +473,7 @@ class ComposeSearchTest {
         }.openRecentlyVisitedSearchGroupHistoryList(queryString) {
             clickDeleteAllHistoryButton()
             confirmDeleteAllHistory()
-            verifyDeleteSnackbarText("Group deleted")
+            verifySnackBarText(expectedText = "Group deleted")
             verifyHistoryItemExists(shouldExist = false, firstPageUrl.toString())
         }.goBack {}
         homeScreen {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
index ec76f4419..f29372c63 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
@@ -29,6 +29,7 @@ import org.mozilla.fenix.helpers.RecyclerViewIdlingResource
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.historyMenu
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -131,7 +132,7 @@ class HistoryTest {
             clickUndoDeleteButton()
             verifyHistoryItemExists(true, firstWebPage.url.toString())
             clickDeleteHistoryButton(firstWebPage.url.toString())
-            verifyDeleteSnackbarText("Deleted")
+            verifySnackBarText(expectedText = "Deleted")
             verifyEmptyHistoryView()
         }
     }
@@ -161,7 +162,7 @@ class HistoryTest {
             verifyDeleteConfirmationMessage()
             selectEverythingOption()
             confirmDeleteAllHistory()
-            verifyDeleteSnackbarText("Browsing data deleted")
+            verifySnackBarText(expectedText = "Browsing data deleted")
             verifyEmptyHistoryView()
         }
     }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
index 0a5686c03..d1d0076cd 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
@@ -44,6 +44,7 @@ import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
 import org.mozilla.fenix.helpers.TestHelper.mDevice
+import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
 import org.mozilla.fenix.ui.robots.clickContextMenuItem
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -487,7 +488,7 @@ class SearchTest {
         }.openRecentlyVisitedSearchGroupHistoryList(queryString) {
             clickDeleteAllHistoryButton()
             confirmDeleteAllHistory()
-            verifyDeleteSnackbarText("Group deleted")
+            verifySnackBarText("Group deleted")
             verifyHistoryItemExists(shouldExist = false, firstPageUrl.toString())
         }.goBack {}
         homeScreen {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt
index 768121d45..b38920e0d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt
@@ -19,7 +19,6 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
-import org.hamcrest.Matchers
 import org.hamcrest.Matchers.allOf
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
@@ -38,17 +37,26 @@ import org.mozilla.fenix.helpers.ext.waitNotNull
  */
 class HistoryRobot {
 
-    fun verifyHistoryMenuView() = assertHistoryMenuView()
+    fun verifyHistoryMenuView() {
+        onView(
+            allOf(withText("History"), withParent(withId(R.id.navigationToolbar))),
+        ).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+    }
 
     fun verifyEmptyHistoryView() {
         mDevice.findObject(
             UiSelector().text("No history here"),
         ).waitForExists(waitingTime)
 
-        assertEmptyHistoryView()
+        onView(
+            allOf(
+                withId(R.id.history_empty_view),
+                withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE),
+            ),
+        ).check(matches(withText("No history here")))
     }
 
-    fun verifyHistoryListExists() = assertHistoryListExists()
+    fun verifyHistoryListExists() = assertUIObjectExists(itemWithResId("$packageName:id/history_list"))
 
     fun verifyVisitedTimeTitle() {
         mDevice.waitNotNull(
@@ -57,21 +65,24 @@ class HistoryRobot {
             ),
             waitingTime,
         )
-        assertVisitedTimeTitle()
+        onView(withId(R.id.header_title)).check(matches(withText("Today")))
     }
 
     fun verifyHistoryItemExists(shouldExist: Boolean, item: String) =
         assertUIObjectExists(itemContainingText(item), exists = shouldExist)
 
-    fun verifyFirstTestPageTitle(title: String) = assertTestPageTitle(title)
+    fun verifyFirstTestPageTitle(title: String) =
+        testPageTitle()
+            .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+            .check(matches(withText(title)))
 
     fun verifyTestPageUrl(expectedUrl: Uri) = pageUrl(expectedUrl.toString()).check(matches(isDisplayed()))
 
-    fun verifyCopySnackBarText() = assertCopySnackBarText()
-
-    fun verifyDeleteConfirmationMessage() = assertDeleteConfirmationMessage()
-
-    fun verifyHomeScreen() = HomeScreenRobot().verifyHomeScreen()
+    fun verifyDeleteConfirmationMessage() =
+        assertUIObjectExists(
+            itemWithResIdContainingText("$packageName:id/title", getStringResource(R.string.delete_history_prompt_title)),
+            itemWithResIdContainingText("$packageName:id/body", getStringResource(R.string.delete_history_prompt_body_2)),
+        )
 
     fun clickDeleteHistoryButton(item: String) {
         deleteButton(item).click()
@@ -98,9 +109,7 @@ class HistoryRobot {
                     .textContains(getStringResource(R.string.delete_browsing_data_prompt_cancel)),
             ).click()
 
-    fun verifyDeleteSnackbarText(text: String) = assertSnackBarText(text)
-
-    fun verifyUndoDeleteSnackBarButton() = assertUndoDeleteSnackBarButton()
+    fun verifyUndoDeleteSnackBarButton() = snackBarUndoButton().check(matches(withText("UNDO")))
 
     fun clickUndoDeleteButton() {
         snackBarUndoButton().click()
@@ -130,7 +139,7 @@ class HistoryRobot {
         }
 
         fun openWebsite(url: Uri, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            assertHistoryListExists()
+            assertUIObjectExists(itemWithResId("$packageName:id/history_list"))
             onView(withText(url.toString())).click()
 
             BrowserRobot().interact()
@@ -138,8 +147,8 @@ class HistoryRobot {
         }
 
         fun openRecentlyClosedTabs(interact: RecentlyClosedTabsRobot.() -> Unit): RecentlyClosedTabsRobot.Transition {
-            recentlyClosedTabsListButton.waitForExists(waitingTime)
-            recentlyClosedTabsListButton.click()
+            recentlyClosedTabsListButton().waitForExists(waitingTime)
+            recentlyClosedTabsListButton().click()
 
             RecentlyClosedTabsRobot().interact()
             return RecentlyClosedTabsRobot.Transition()
@@ -168,50 +177,8 @@ private fun deleteButton(title: String) =
 
 private fun deleteButton() = onView(withId(R.id.history_delete))
 
-private fun snackBarText() = onView(withId(R.id.snackbar_text))
-
-private fun assertHistoryMenuView() {
-    onView(
-        allOf(withText("History"), withParent(withId(R.id.navigationToolbar))),
-    )
-        .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-}
-
-private fun assertEmptyHistoryView() =
-    onView(
-        allOf(
-            withId(R.id.history_empty_view),
-            withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE),
-        ),
-    )
-        .check(matches(withText("No history here")))
-
-private fun assertHistoryListExists() =
-    mDevice.findObject(UiSelector().resourceId("$packageName:id/history_list")).waitForExists(waitingTime)
-
-private fun assertVisitedTimeTitle() =
-    onView(withId(R.id.header_title)).check(matches(withText("Today")))
-
-private fun assertTestPageTitle(title: String) = testPageTitle()
-    .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-    .check(matches(withText(title)))
-
-private fun assertDeleteConfirmationMessage() =
-    assertUIObjectExists(
-        itemWithResIdContainingText("$packageName:id/title", getStringResource(R.string.delete_history_prompt_title)),
-        itemWithResIdContainingText("$packageName:id/body", getStringResource(R.string.delete_history_prompt_body_2)),
-    )
-
-private fun assertCopySnackBarText() = snackBarText().check(matches(withText("URL copied")))
-
-private fun assertSnackBarText(text: String) =
-    snackBarText().check(matches(withText(Matchers.containsString(text))))
-
 private fun snackBarUndoButton() = onView(withId(R.id.snackbar_btn))
 
-private fun assertUndoDeleteSnackBarButton() =
-    snackBarUndoButton().check(matches(withText("UNDO")))
-
 private fun deleteHistoryEverythingOption() =
     mDevice
         .findObject(
@@ -220,5 +187,5 @@ private fun deleteHistoryEverythingOption() =
                 .resourceId("$packageName:id/everything_button"),
         )
 
-private val recentlyClosedTabsListButton =
+private fun recentlyClosedTabsListButton() =
     mDevice.findObject(UiSelector().resourceId("$packageName:id/recently_closed_tabs_header"))

From eaf06fb0c077460bbfc4398706c48698a665a45b Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 1 Feb 2024 16:49:42 +0200
Subject: [PATCH 102/222] Bug 1878028 - Add more test logs to HistoryRobot

---
 .../mozilla/fenix/ui/robots/HistoryRobot.kt   | 69 +++++++++++++++++--
 1 file changed, 62 insertions(+), 7 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt
index b38920e0d..fc6ee4d1a 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.ui.robots
 
 import android.net.Uri
+import android.util.Log
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.RootMatchers.isDialog
@@ -21,6 +22,7 @@ import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import org.hamcrest.Matchers.allOf
 import org.mozilla.fenix.R
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
@@ -38,22 +40,28 @@ import org.mozilla.fenix.helpers.ext.waitNotNull
 class HistoryRobot {
 
     fun verifyHistoryMenuView() {
+        Log.i(TAG, "verifyHistoryMenuView: Trying to verify that history menu view is visible")
         onView(
             allOf(withText("History"), withParent(withId(R.id.navigationToolbar))),
         ).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        Log.i(TAG, "verifyHistoryMenuView: Verified that history menu view is visible")
     }
 
     fun verifyEmptyHistoryView() {
+        Log.i(TAG, "verifyEmptyHistoryView: Waiting for $waitingTime ms for empty history list view to exist")
         mDevice.findObject(
             UiSelector().text("No history here"),
         ).waitForExists(waitingTime)
+        Log.i(TAG, "verifyEmptyHistoryView: Waited for $waitingTime ms for empty history list view to exist")
 
+        Log.i(TAG, "verifyEmptyHistoryView: Trying to verify empty history list view")
         onView(
             allOf(
                 withId(R.id.history_empty_view),
                 withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE),
             ),
         ).check(matches(withText("No history here")))
+        Log.i(TAG, "verifyEmptyHistoryView: Verified empty history list view")
     }
 
     fun verifyHistoryListExists() = assertUIObjectExists(itemWithResId("$packageName:id/history_list"))
@@ -65,18 +73,27 @@ class HistoryRobot {
             ),
             waitingTime,
         )
+        Log.i(TAG, "verifyVisitedTimeTitle: Trying to verify \"Today\" chronological timeline title")
         onView(withId(R.id.header_title)).check(matches(withText("Today")))
+        Log.i(TAG, "verifyVisitedTimeTitle: Verified \"Today\" chronological timeline title")
     }
 
     fun verifyHistoryItemExists(shouldExist: Boolean, item: String) =
         assertUIObjectExists(itemContainingText(item), exists = shouldExist)
 
-    fun verifyFirstTestPageTitle(title: String) =
+    fun verifyFirstTestPageTitle(title: String) {
+        Log.i(TAG, "verifyFirstTestPageTitle: Trying to verify $title page title is visible")
         testPageTitle()
             .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
             .check(matches(withText(title)))
+        Log.i(TAG, "verifyFirstTestPageTitle: Verified $title page title is visible")
+    }
 
-    fun verifyTestPageUrl(expectedUrl: Uri) = pageUrl(expectedUrl.toString()).check(matches(isDisplayed()))
+    fun verifyTestPageUrl(expectedUrl: Uri) {
+        Log.i(TAG, "verifyTestPageUrl: Trying to verify page url: $expectedUrl is displayed")
+        pageUrl(expectedUrl.toString()).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyTestPageUrl: Verified page url: $expectedUrl is displayed")
+    }
 
     fun verifyDeleteConfirmationMessage() =
         assertUIObjectExists(
@@ -85,34 +102,58 @@ class HistoryRobot {
         )
 
     fun clickDeleteHistoryButton(item: String) {
+        Log.i(TAG, "clickDeleteHistoryButton: Trying to click delete history button for item: $item")
         deleteButton(item).click()
+        Log.i(TAG, "clickDeleteHistoryButton: Clicked delete history button for item: $item")
     }
 
-    fun verifyDeleteHistoryItemButton(historyItemTitle: String) =
+    fun verifyDeleteHistoryItemButton(historyItemTitle: String) {
+        Log.i(TAG, "verifyDeleteHistoryItemButton: Trying to verify delete history button for item: $historyItemTitle is visible")
         deleteButton(historyItemTitle).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        Log.i(TAG, "verifyDeleteHistoryItemButton: Verified delete history button for item: $historyItemTitle is visible")
+    }
 
-    fun clickDeleteAllHistoryButton() = deleteButton().click()
+    fun clickDeleteAllHistoryButton() {
+        Log.i(TAG, "clickDeleteAllHistoryButton: Trying to click delete all history button")
+        deleteButton().click()
+        Log.i(TAG, "clickDeleteAllHistoryButton: Clicked delete all history button")
+    }
 
-    fun selectEverythingOption() = deleteHistoryEverythingOption().click()
+    fun selectEverythingOption() {
+        Log.i(TAG, "selectEverythingOption: Trying to click \"Everything\" dialog option")
+        deleteHistoryEverythingOption().click()
+        Log.i(TAG, "selectEverythingOption: Clicked \"Everything\" dialog option")
+    }
 
     fun confirmDeleteAllHistory() {
+        Log.i(TAG, "confirmDeleteAllHistory: Trying to click \"Delete\" dialog button")
         onView(withText("Delete"))
             .inRoot(isDialog())
             .check(matches(isDisplayed()))
             .click()
+        Log.i(TAG, "confirmDeleteAllHistory: Clicked \"Delete\" dialog button")
     }
 
-    fun cancelDeleteHistory() =
+    fun cancelDeleteHistory() {
+        Log.i(TAG, "cancelDeleteHistory: Trying to click \"Cancel\" dialog button")
         mDevice
             .findObject(
                 UiSelector()
                     .textContains(getStringResource(R.string.delete_browsing_data_prompt_cancel)),
             ).click()
+        Log.i(TAG, "cancelDeleteHistory: Clicked \"Cancel\" dialog button")
+    }
 
-    fun verifyUndoDeleteSnackBarButton() = snackBarUndoButton().check(matches(withText("UNDO")))
+    fun verifyUndoDeleteSnackBarButton() {
+        Log.i(TAG, "verifyUndoDeleteSnackBarButton: Trying to verify \"Undo\" snackbar button")
+        snackBarUndoButton().check(matches(withText("UNDO")))
+        Log.i(TAG, "verifyUndoDeleteSnackBarButton: Verified \"Undo\" snackbar button")
+    }
 
     fun clickUndoDeleteButton() {
+        Log.i(TAG, "verifyUndoDeleteSnackBarButton: Trying to click \"Undo\" snackbar button")
         snackBarUndoButton().click()
+        Log.i(TAG, "verifyUndoDeleteSnackBarButton: Clicked \"Undo\" snackbar button")
     }
 
     fun verifySearchGroupDisplayed(shouldBeDisplayed: Boolean, searchTerm: String, groupSize: Int) =
@@ -126,13 +167,19 @@ class HistoryRobot {
         )
 
     fun openSearchGroup(searchTerm: String) {
+        Log.i(TAG, "openSearchGroup: Waiting for $waitingTime ms for search group: $searchTerm to exist")
         mDevice.findObject(UiSelector().text(searchTerm)).waitForExists(waitingTime)
+        Log.i(TAG, "openSearchGroup: Waited for $waitingTime ms for search group: $searchTerm to exist")
+        Log.i(TAG, "openSearchGroup: Trying to click search group: $searchTerm")
         mDevice.findObject(UiSelector().text(searchTerm)).click()
+        Log.i(TAG, "openSearchGroup: Clicked search group: $searchTerm")
     }
 
     class Transition {
         fun goBack(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "goBack: Trying to click go back menu button")
             onView(withContentDescription("Navigate up")).click()
+            Log.i(TAG, "goBack: Clicked go back menu button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -140,22 +187,30 @@ class HistoryRobot {
 
         fun openWebsite(url: Uri, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
             assertUIObjectExists(itemWithResId("$packageName:id/history_list"))
+            Log.i(TAG, "openWebsite: Trying to click history item with url: $url")
             onView(withText(url.toString())).click()
+            Log.i(TAG, "openWebsite: Clicked history item with url: $url")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun openRecentlyClosedTabs(interact: RecentlyClosedTabsRobot.() -> Unit): RecentlyClosedTabsRobot.Transition {
+            Log.i(TAG, "openRecentlyClosedTabs: Waiting for $waitingTime ms for \"Recently closed tabs\" button to exist")
             recentlyClosedTabsListButton().waitForExists(waitingTime)
+            Log.i(TAG, "openRecentlyClosedTabs: Waited for $waitingTime ms for \"Recently closed tabs\" button to exist")
+            Log.i(TAG, "openRecentlyClosedTabs: Trying to click \"Recently closed tabs\" button")
             recentlyClosedTabsListButton().click()
+            Log.i(TAG, "openRecentlyClosedTabs: Clicked \"Recently closed tabs\" button")
 
             RecentlyClosedTabsRobot().interact()
             return RecentlyClosedTabsRobot.Transition()
         }
 
         fun clickSearchButton(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
+            Log.i(TAG, "clickSearchButton: Trying to click search history button")
             itemWithResId("$packageName:id/history_search").click()
+            Log.i(TAG, "clickSearchButton: Clicked search history button")
 
             SearchRobot().interact()
             return SearchRobot.Transition()

From 801fe811aa8ecddec3de7b3c1836ab76bf0085a7 Mon Sep 17 00:00:00 2001
From: jackyzy823 <jackyzy823@gmail.com>
Date: Sun, 4 Feb 2024 09:33:06 +0800
Subject: [PATCH 103/222] Bug 1878524 - Return immediately when tab found

---
 .../main/java/org/mozilla/fenix/tabstray/TabsTrayTabLayouts.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayTabLayouts.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayTabLayouts.kt
index 9d8e32404..2ad848576 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayTabLayouts.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayTabLayouts.kt
@@ -94,6 +94,7 @@ fun TabLayout(
         tabs.forEachIndexed { index, tab ->
             if (tab.id == selectedTabId) {
                 selectedTabIndex = index
+                return@forEachIndexed
             }
         }
     }

From fa6b6038046ab057c38b15399cff2a5438723d47 Mon Sep 17 00:00:00 2001
From: Jackie Johnson <107960801+jjSDET@users.noreply.github.com>
Date: Fri, 2 Feb 2024 02:02:59 -0600
Subject: [PATCH 104/222] Bug 1873897 - Update Testrail Milestone Release
 Trigger and Slack Message

---
 .../androidTest/lib/testrail_conn.py          | 104 ----------
 .../taskcluster/androidTest/testrail.py       | 180 ------------------
 automation/taskcluster/androidTest/ui-test.sh |   9 -
 3 files changed, 293 deletions(-)
 delete mode 100644 automation/taskcluster/androidTest/lib/testrail_conn.py
 delete mode 100644 automation/taskcluster/androidTest/testrail.py

diff --git a/automation/taskcluster/androidTest/lib/testrail_conn.py b/automation/taskcluster/androidTest/lib/testrail_conn.py
deleted file mode 100644
index e2e18dd9f..000000000
--- a/automation/taskcluster/androidTest/lib/testrail_conn.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# flake8: noqa
-"""TestRail API binding for Python 3.x.
-
-(API v2, available since TestRail 3.0)
-
-Compatible with TestRail 3.0 and later.
-
-Learn more:
-
-http://docs.gurock.com/testrail-api2/start
-http://docs.gurock.com/testrail-api2/accessing
-
-Copyright Gurock Software GmbH. See license.md for details.
-"""
-
-import base64
-import json
-
-import requests
-
-
-class APIClient:
-    def __init__(self, base_url):
-        self.user = ""
-        self.password = ""
-        if not base_url.endswith("/"):
-            base_url += "/"
-        self.__url = base_url + "index.php?/api/v2/"
-
-    def send_get(self, uri, filepath=None):
-        """Issue a GET request (read) against the API.
-
-        Args:
-            uri: The API method to call including parameters, e.g. get_case/1.
-            filepath: The path and file name for attachment download; used only
-                for 'get_attachment/:attachment_id'.
-
-        Returns:
-            A dict containing the result of the request.
-        """
-        return self.__send_request("GET", uri, filepath)
-
-    def send_post(self, uri, data):
-        """Issue a POST request (write) against the API.
-
-        Args:
-            uri: The API method to call, including parameters, e.g. add_case/1.
-            data: The data to submit as part of the request as a dict; strings
-                must be UTF-8 encoded. If adding an attachment, must be the
-                path to the file.
-
-        Returns:
-            A dict containing the result of the request.
-        """
-        return self.__send_request("POST", uri, data)
-
-    def __send_request(self, method, uri, data):
-        url = self.__url + uri
-
-        auth = str(
-            base64.b64encode(bytes("%s:%s" % (self.user, self.password), "utf-8")),
-            "ascii",
-        ).strip()
-        headers = {"Authorization": "Basic " + auth}
-
-        if method == "POST":
-            if uri[:14] == "add_attachment":  # add_attachment API method
-                files = {"attachment": (open(data, "rb"))}
-                response = requests.post(url, headers=headers, files=files)
-                files["attachment"].close()
-            else:
-                headers["Content-Type"] = "application/json"
-                payload = bytes(json.dumps(data), "utf-8")
-                response = requests.post(url, headers=headers, data=payload)
-        else:
-            headers["Content-Type"] = "application/json"
-            response = requests.get(url, headers=headers)
-
-        if response.status_code > 201:
-            try:
-                error = response.json()
-            except (
-                requests.exceptions.HTTPError
-            ):  # response.content not formatted as JSON
-                error = str(response.content)
-            raise APIError(
-                "TestRail API returned HTTP %s (%s)" % (response.status_code, error)
-            )
-        else:
-            if uri[:15] == "get_attachment/":  # Expecting file, not JSON
-                try:
-                    open(data, "wb").write(response.content)
-                    return data
-                except FileNotFoundError:
-                    return "Error saving attachment."
-            else:
-                try:
-                    return response.json()
-                except requests.exceptions.HTTPError:
-                    return {}
-
-
-class APIError(Exception):
-    pass
diff --git a/automation/taskcluster/androidTest/testrail.py b/automation/taskcluster/androidTest/testrail.py
deleted file mode 100644
index e735e417a..000000000
--- a/automation/taskcluster/androidTest/testrail.py
+++ /dev/null
@@ -1,180 +0,0 @@
-"""
-This Python script is designed to automate the process of creating milestones
-and test runs in TestRail, and updating test cases based on the results of
-automated smoke tests for different product releases.
-
-Below is a summary of its functionality in order of execution:
-
-1. Environment and Credentials Setup: 
-    - Imports necessary libraries and modules.
-    - Loads environmental variables from "execution_metadata.env".
-    - Reads and processes TestRail credentials from '.testrail_credentials.json'.
-
-2. Environment Variables Validation: 
-    - Retrieves and validates several environment variables like `PRODUCT_TYPE`,
-        `RELEASE_TYPE`, `VERSION_NUMBER`, and `TEST_STATUS`.
-    - Ensures `TEST_STATUS` is either 'PASS' or 'FAIL'.
-
-3. Utility Functions: 
-    - `parse_release_number()`: Parses the version number to extract a specific part.
-    - `build_milestone_name()`: Constructs a milestone name based on product type,
-        release type, and version number.
-    - `build_milestone_description()`: Creates a detailed description for the milestone
-        including the current date and placeholders for various testing statuses.
-
-4. TestRail Integration: 
-    - Defines a `TestRail` class that handles interactions with the TestRail API.
-    - Includes methods to create milestones, create test runs, and update test cases.
-
-5. Main Execution: 
-    - Checks if `TEST_STATUS` is 'PASS'. If not, it raises an error to trigger a Slack notification.
-    - Sets parameters for a demo TestRail project.
-    - Instantiates the `TestRail` class.
-    - Creates a milestone in TestRail and retrieves its ID.
-    - Creates test runs for each device/API combination (currently hardcoded for phase 1 testing)
-        and updates test cases to 'passed' status.
-
-6. Phase 1 and Phase 2 Notes: 
-    - The script is currently in Phase 1, where certain values are hardcoded for testing.
-    - In Phase 2, these hardcoded values will be parameterized for broader usage.
-"""
-
-
-import json
-import os
-import textwrap
-from lib.testrail_conn import APIClient
-from dotenv import load_dotenv
-from datetime import datetime
-
-try:
-    load_dotenv("execution_metadata.env")  # Attempt to load .env file
-except FileNotFoundError:
-    raise FileNotFoundError("The .env file was not found.")
-except Exception as e:
-    raise Exception(f"An error occurred while loading the .env file: {e}")
-
-try:
-    with open(".testrail_credentials.json", "r") as file:
-        secret = json.load(file)
-        TESTRAIL_HOST = secret["host"]
-        TESTRAIL_USERNAME = secret["username"]
-        TESTRAIL_PASSWORD = secret["password"]
-except json.JSONDecodeError as e:
-    raise ValueError(f"Failed to load testrail credentials : {e}")
-
-try:
-    PRODUCT_TYPE = os.environ["PRODUCT_TYPE"]
-    RELEASE_TYPE = os.environ["RELEASE_TYPE"]
-    VERSION_NUMBER = os.environ["MOBILE_HEAD_REF"]
-    TEST_STATUS = os.environ["TEST_STATUS"]
-
-    if TEST_STATUS not in ("PASS", "FAIL"):
-        raise ValueError(f"ERROR: Invalid TEST_STATUS value: {TEST_STATUS}")
-except KeyError as e:
-    raise ValueError(f"ERROR: Missing Environment Variable: {e}")
-
-
-def parse_release_number(VERSION_NUMBER):
-    parts = VERSION_NUMBER.split("_")
-    return parts[1]
-
-
-def build_milestone_name(product_type, release_type, version_number):
-    return f"Automated smoke testing sign-off - {product_type} {release_type} {version_number}"
-
-
-def build_milestone_description(milestone_name):
-    current_date = datetime.now()
-    formatted_date = current_date = current_date.strftime("%B %d, %Y")
-    return textwrap.dedent(
-        f"""
-        RELEASE: {milestone_name}\n\n\
-        RELEASE_TAG_URL: https://github.com/mozilla-mobile/firefox-android/releases\n\n\
-        RELEASE_DATE: {formatted_date}\n\n\
-        TESTING_STATUS: [ TBD ]\n\n\
-        QA_RECOMMENDATION:[ TBD ]\n\n\
-        QA_RECOMENTATION_VERBOSE: \n\n\
-        TESTING_SUMMARY\n\n\
-        Known issues: n/a\n\
-        New issue: n/a\n\
-        Verified issue: 
-    """
-    )
-
-
-class TestRail:
-    def __init__(self):
-        try:
-            self.client = APIClient(TESTRAIL_HOST)
-            self.client.user = TESTRAIL_USERNAME
-            self.client.password = TESTRAIL_PASSWORD
-        except KeyError as e:
-            raise ValueError(f"ERROR: Missing Testrail Env Var: {e}")
-
-    # Public Methods
-
-    def create_milestone(self, testrail_project_id, title, description):
-        data = {"name": title, "description": description}
-        return self.client.send_post(f"add_milestone/{testrail_project_id}", data)
-
-    def create_test_run(
-        self, testrail_project_id, testrail_milestone_id, name_run, testrail_suite_id
-    ):
-        data = {
-            "name": name_run,
-            "milestone_id": testrail_milestone_id,
-            "suite_id": testrail_suite_id,
-        }
-        return self.client.send_post(f"add_run/{testrail_project_id}", data)
-
-    def update_test_cases_to_passed(
-        self, testrail_project_id, testrail_run_id, testrail_suite_id
-    ):
-        test_cases = self._get_test_cases(testrail_project_id, testrail_suite_id)
-        data = {
-            "results": [
-                {"case_id": test_case["id"], "status_id": 1} for test_case in test_cases
-            ]
-        }
-        return testrail._update_test_run_results(testrail_run_id, data)
-
-    # Private Methods
-
-    def _get_test_cases(self, testrail_project_id, testrail_test_suite_id):
-        return self.client.send_get(
-            f"get_cases/{testrail_project_id}&suite_id={testrail_test_suite_id}"
-        )
-
-    def _update_test_run_results(self, testrail_run_id, data):
-        return self.client.send_post(f"add_results_for_cases/{testrail_run_id}", data)
-
-
-if __name__ == "__main__":
-    if TEST_STATUS != "PASS":
-        raise ValueError("Tests failed. Sending Slack Notification....")
-
-    # There are for a dummy Testrail project used for Phase 1 testing of this script
-    # They will be parameterized during Phase 2 of script hardening
-    PROJECT_ID = 53  # Firefox for FireTV
-    TEST_SUITE_ID = 45442  # Demo Test Suite
-
-    testrail = TestRail()
-    milestone_name = build_milestone_name(
-        PRODUCT_TYPE, RELEASE_TYPE, parse_release_number(VERSION_NUMBER)
-    )
-    milestone_description = build_milestone_description(milestone_name)
-
-    # Create milestone for 'Firefox for FireTV' and store the ID
-    milestone_id = testrail.create_milestone(
-        PROJECT_ID, milestone_name, milestone_description
-    )["id"]
-
-    # Create test run for each Device/API and update test cases to 'passed'
-    # The Firebase Test devices are temporarily hard-coded during testing
-    # and will be parameterized in Phase 2 of hardening
-    for test_run_name in ["Google Pixel 32(Android11)", "Google Pixel2(Android9)"]:
-        test_run_id = testrail.create_test_run(
-            PROJECT_ID, milestone_id, test_run_name, TEST_SUITE_ID
-        )["id"]
-        testrail.update_test_cases_to_passed(PROJECT_ID, test_run_id, TEST_SUITE_ID)
diff --git a/automation/taskcluster/androidTest/ui-test.sh b/automation/taskcluster/androidTest/ui-test.sh
index a4df3971b..3c5b29c17 100755
--- a/automation/taskcluster/androidTest/ui-test.sh
+++ b/automation/taskcluster/androidTest/ui-test.sh
@@ -102,18 +102,9 @@ function failure_check() {
     echo
     if [[ $exitcode -ne 0 ]]; then
         echo "FAILURE: UI test run failed, please check above URL"
-        TEST_STATUS="FAIL"
     else
 	    echo "All UI test(s) have passed!"
-        TEST_STATUS="PASS"
     fi
-
-    {
-        echo "TEST_STATUS=${TEST_STATUS}"
-        echo "PRODUCT_TYPE=${PRODUCT_TYPE}"
-        echo "RELEASE_TYPE=${RELEASE_TYPE}"
-    } >> execution_metadata.env
-
     echo
     echo "RESULTS"
     echo

From f008f890e1c6ca0e03f996fdbf30c42de993874f Mon Sep 17 00:00:00 2001
From: ohall-m <ohall@mozilla.com>
Date: Wed, 31 Jan 2024 15:28:25 -0500
Subject: [PATCH 105/222] Bug 1877205 - Translations Fetch Supported Languages
 Refactor

This patch refactors a few things for fetching supported languages:

* `TranslateExpectedAction` is decoupled from fetching languages
* Now use `OperationRequestedAction` w/ `FETCH_SUPPORTED_LANGUAGES`
* Refactors the Fenix fragment to send `OperationRequestedAction` as a
placeholder for data initialization
* `TranslateSetLanguagesAction` is now `SetSupportedLanguagesAction`
---
 .../fenix/translations/TranslationsDialogFragment.kt   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogFragment.kt
index 24bd845e3..e94bc22ce 100644
--- a/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogFragment.kt
@@ -26,6 +26,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import mozilla.components.browser.state.action.TranslationsAction
 import mozilla.components.browser.state.selector.findTab
 import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.concept.engine.translate.TranslationOperation
 import mozilla.components.concept.engine.translate.initialFromLanguage
 import mozilla.components.concept.engine.translate.initialToLanguage
 import mozilla.components.lib.state.ext.observeAsComposableState
@@ -69,8 +70,13 @@ class TranslationsDialogFragment : BottomSheetDialogFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?,
     ): View = ComposeView(requireContext()).apply {
-        // Signalling user intention to translate
-        browserStore.dispatch(TranslationsAction.TranslateExpectedAction(args.sessionId))
+        // Signalling need to fetch languages
+        browserStore.dispatch(
+            TranslationsAction.OperationRequestedAction(
+                tabId = args.sessionId,
+                operation = TranslationOperation.FETCH_SUPPORTED_LANGUAGES,
+            ),
+        )
 
         setContent {
             val translationsState = browserStore.observeAsComposableState {

From aaa15b69728436f7e2a13b1179cf18cc91681f84 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Wed, 7 Feb 2024 00:03:12 +0000
Subject: [PATCH 106/222] Import translations from android-l10n

---
 app/src/main/res/values-azb/strings.xml | 134 ++++++++++++++++++++++++
 app/src/main/res/values-da/strings.xml  | 102 ++++++++++++++++++
 app/src/main/res/values-kab/strings.xml |   4 +
 app/src/main/res/values-si/strings.xml  |   2 +
 4 files changed, 242 insertions(+)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index b375ebffe..d3b9fa554 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -192,6 +192,140 @@
     <string name="recently_visited_menu_item_remove">قالدیر</string>
 
 
+    <!-- Content description for the button which navigates the user to show all of their history. -->
+    <string name="past_explorations_show_all_content_description_2">بوتون گئچمیش آراشدیرمالاری گؤستر</string>
+
+    <!-- Browser Fragment -->
+    <!-- Content description (not visible, for screen readers etc.): Navigate backward (browsing history) -->
+    <string name="browser_menu_back">دالیا</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate forward (browsing history) -->
+    <string name="browser_menu_forward">قاباغا</string>
+    <!-- Content description (not visible, for screen readers etc.): Refresh current website -->
+    <string name="browser_menu_refresh">رفرش</string>
+    <!-- Content description (not visible, for screen readers etc.): Stop loading current website -->
+    <string name="browser_menu_stop">دوردور</string>
+    <!-- Browser menu button that opens the addon manager -->
+    <string name="browser_menu_add_ons">تاخیلان‌لار</string>
+    <!-- Browser menu button that opens account settings -->
+    <string name="browser_menu_account_settings">حساب بیلگی‌لری</string>
+    <!-- Text displayed when there are no add-ons to be shown -->
+    <string name="no_add_ons">بوردا هئچ تاخیلان یوخ</string>
+
+
+    <!-- Browser menu button that sends a user to help articles -->
+    <string name="browser_menu_help">ال‌توتما</string>
+    <!-- Browser menu button that sends a to a the what's new article -->
+    <string name="browser_menu_whats_new">یئنی نه وار</string>
+    <!-- Browser menu button that opens the settings menu -->
+    <string name="browser_menu_settings">تنظیم‌‎لر</string>
+    <!-- Browser menu button that opens a user's library -->
+    <string name="browser_menu_library">کیتابخانا</string>
+    <!-- Browser menu toggle that requests a desktop site -->
+    <string name="browser_menu_desktop_site">دسکتاپ سایت</string>
+    <!-- Browser menu button that reopens a private tab as a regular tab -->
+    <string name="browser_menu_open_in_regular_tab">معمولی تاغدا آچ</string>
+    <!-- Browser menu toggle that adds a shortcut to the site on the device home screen. -->
+    <string name="browser_menu_add_to_homescreen">آناصفحه‌یه آرتیر</string>
+    <!-- Browser menu toggle that installs a Progressive Web App shortcut to the site on the device home screen. -->
+    <string name="browser_menu_install_on_homescreen">قوْش</string>
+    <!-- Content description (not visible, for screen readers etc.) for the Resync tabs button -->
+    <string name="resync_button_content_description">گئنه دؤنگل</string>
+    <!-- Browser menu button that opens the find in page menu -->
+    <string name="browser_menu_find_in_page">صفحه‌ده تاپ</string>
+
+
+    <!-- Browser menu button that opens the translations dialog, which has options to translate the current browser page. -->
+    <string name="browser_menu_translations">صفحه‌نی ترجومه ائله</string>
+    <!-- Browser menu button that saves the current tab to a collection -->
+    <string name="browser_menu_save_to_collection_2">مجموعه‌ده ساخلا</string>
+    <!-- Browser menu button that open a share menu to share the current site -->
+    <string name="browser_menu_share">پایلاش</string>
+    <!-- Browser menu button shown in custom tabs that opens the current tab in Fenix
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="browser_menu_open_in_fenix">%1$s ایله آچ</string>
+    <!-- Browser menu text shown in custom tabs to indicate this is a Fenix tab
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="browser_menu_powered_by">%1$s طرفیندن گوج آلیر</string>
+    <!-- Browser menu text shown in custom tabs to indicate this is a Fenix tab
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="browser_menu_powered_by2">%1$s گوجو ایله</string>
+
+
+    <!-- Browser menu button to put the current page in reader mode -->
+    <string name="browser_menu_read">اوخوجو گؤرونوشو</string>
+    <!-- Browser menu button content description to close reader mode and return the user to the regular browser -->
+    <string name="browser_menu_read_close">اوخوجو گؤرونوشو باغلا</string>
+    <!-- Browser menu button to open the current page in an external app -->
+    <string name="browser_menu_open_app_link">اپده آچ</string>
+    <!-- Browser menu button to show reader view appearance controls e.g. the used font type and size -->
+    <string name="browser_menu_customize_reader_view">اوخوجو گؤرونوشو اؤزللشدیر</string>
+    <!-- Browser menu label for adding a bookmark -->
+    <string name="browser_menu_add">اکله</string>
+    <!-- Browser menu label for editing a bookmark -->
+    <string name="browser_menu_edit">دوزه‌لیش</string>
+    <!-- Button shown on the home page that opens the Customize home settings -->
+    <string name="browser_menu_customize_home_1">آنایارپاغی اؤزللشدیر</string>
+
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">باش صفحه</string>
+
+
+    <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
+         history and go back to the home screen. -->
+    <string name="browser_toolbar_erase">مورور گئچمیشینی پوز</string>
+
+
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">صفحه‌نی ترجومه ائله</string>
+
+    <!-- Locale Settings Fragment -->
+    <!-- Content description for tick mark on selected language -->
+    <string name="a11y_selected_locale_content_description">سئچیلمیش دیل</string>
+
+
+    <!-- Text for default locale item -->
+    <string name="default_locale_text">جهاز دیلینی ایشه آل</string>
+    <!-- Placeholder text shown in the search bar before a user enters text -->
+    <string name="locale_search_hint">دیل آختار</string>
+
+
+    <!-- Search Fragment -->
+    <!-- Button in the search view that lets a user search by scanning a QR code -->
+    <string name="search_scan_button">اسکن</string>
+    <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
+    <string name="search_shortcuts_engine_settings">آختاریش موتورونون تنظیم‌لری</string>
+    <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
+    <string name="search_suggestions_onboarding_allow_button">ایجازه وئر</string>
+    <!-- Button in the search suggestions onboarding that does not allow search suggestions in private sessions -->
+    <string name="search_suggestions_onboarding_do_not_allow_button">ایجازه وئرمه</string>
+    <!-- Search suggestion onboarding hint title text -->
+    <string name="search_suggestions_onboarding_title">اؤزل اوتورم‌لاردا آختاریش تکلیف‌لرینه ایجازه وئریلسین؟</string>
+
+
+    <!-- Search engine suggestion title text. The first parameter is the name of the suggested engine-->
+    <string name="search_engine_suggestions_title">%s ایله آختار</string>
+
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">ایندی یوخ</string>
+
+    <!-- Search Widget -->
+    <!-- Content description for searching with a widget. The first parameter is the name of the application.-->
+    <string name="search_widget_content_description_2">یئنی بیر %1$s تاغی آچین</string>
+    <!-- Text preview for smaller sized widgets -->
+    <string name="search_widget_text_short">آختاریش</string>
+    <!-- Text preview for larger sized widgets -->
+    <string name="search_widget_text_long">وب‌ده آختارین</string>
+    <!-- Content description (not visible, for screen readers etc.): Voice search -->
+    <string name="search_widget_voice">سس‌لی آختاریش</string>
+
+    <!-- Preferences -->
+    <!-- Title for the settings page-->
+    <string name="settings">تنظیم‌‎لر</string>
+    <!-- Preference category for general settings -->
+    <string name="preferences_category_general">عمومی</string>
+
+
     <!-- Translations feature-->
 
     </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 7e983ecc9..6c206ff7b 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -252,6 +252,9 @@
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Slet browser-historik</string>
 
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Oversæt side</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valgt sprog</string>
@@ -325,10 +328,15 @@
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
     <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ikke nu</string>
 
+    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Privatlivserklæring for Firefox</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Vi elsker at holde dig sikker</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Vores browser er støttet af en nonprofit-organisation og forhindrer virksomheder i at følge dig rundt på nettet i det skjulte.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Vores non-profit-støttede browser hjælper med at forhindre virksomheder i at følge dig rundt på nettet i hemmelighed.\n\nLæs mere i vores privatlivserklæring.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -682,6 +690,8 @@
     <string name="preferences_sync_bookmarks">Bogmærker</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Logins</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Adgangskoder</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Åbne faneblade</string>
     <!-- Preference for signing out -->
@@ -708,6 +718,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Betalingskort</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Betalingsmetoder</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresser</string>
 
@@ -1643,8 +1655,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Logins og adgangskoder</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Adgangskoder</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Gem logins og adgangskoder</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Gem adgangskoder</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Bed om at gemme</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1661,26 +1677,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Tilføj login</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Tilføj adgangskode</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Synkroniser logins</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synkroniser adgangskoder</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Synkroniser logins på tværs af enheder</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synkroniser adgangskoder på tværs af enheder</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Gemte logins</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Gemte adgangskoder</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">De logins, du gemmer eller synkroniserer til %s, vises her.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Adgangskoderne, du gemmer i eller synkroniserer med %s vil blive vist her. Alle dine gemte adgangskoder bliver krypteret.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Læs mere om Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Læs mere om synkronisering</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Undtagelser</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Logins og adgangskoder, der ikke er gemt, vises her.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s gemmer ikke adgangskoder til websteder vist her.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Logins og adgangskoder vil ikke blive gemt for disse websteder.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s gemmer ikke adgangskoder til disse websteder.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Slet alle undtagelser</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Søg efter logins</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Søg efter adgangskoder</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Websted</string>
     <!-- The header for the username for a login -->
@@ -1709,10 +1745,16 @@
     <string name="saved_login_hide_password">Skjul adgangskode</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Lås op for at se dine gemte logins</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Lås op for at se dine gemte adgangskoder</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Gør dine logins og adgangskoder sikre</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Gør dine gemte adgangskoder sikre</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Indstil en pinkode, en adgangskode eller et låsemønster på din enhed for at forhindre, at andre mennesker får adgang til dine gemte logins og adgangskoder, hvis de har adgang til din enhed.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Indstil en pinkode, en adgangskode eller et låsemønster på din enhed for at forhindre, at andre mennesker får adgang til dine gemte  adgangskoder, hvis de har adgang til din enhed.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Senere</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1732,6 +1774,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sortér menuen logins</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menuen sorter adgangskoder</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Autofyld</string>
@@ -1739,27 +1784,42 @@
     <string name="preferences_addresses">Adresser</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Betalingskort</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Betalingsmetoder</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Gem og autofyld betalingskort</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Gem og udfyld betalingsmetoder</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data er krypteret</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s krypterer alle betalingsmetoder, du gemmer</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synkroniser kort på tværs af enheder</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Synkroniser kort</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Tilføj betalingskort</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Tilføj kort</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Håndter gemte kort</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Håndter kort</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Tilføj adresse</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Håndter adresser</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Gem og autofyld adresser</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Gem og udfyld adresser</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Inkluderer oplysninger såsom telefonnumre, mail- og forsendelsesadresser</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Inkluderer telefonnumre og mailadresser</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Tilføj kort</string>
     <!-- Title of the "Edit card" screen -->
@@ -1780,6 +1840,8 @@
     <string name="credit_cards_delete_card_button">Slet kort</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Er du sikker på, at du vil slette dette betalingskort?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Slet kort?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Slet</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1795,14 +1857,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Indtast et gyldigt betalingskortnummer</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Indtast et gyldigt kortnummer</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Udfyld dette felt</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Tilføj navn</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Lås op for at se dine gemte betalingskort</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Beskyt dine betalingskort</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Gør dine gemte betalingsmetoder sikre</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Indstil en pinkode, en adgangskode eller et låsemønster på din enhed for at forhindre, at andre mennesker får adgang til dine gemte betalingskort, hvis de har adgang til din enhed.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Indstil en pinkode, en adgangskode eller et låsemønster på din enhed for at forhindre, at andre mennesker får adgang til dine gemte betalingsmetoder, hvis de har adgang til din enhed.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Indstil nu</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1812,6 +1882,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Lås op for at anvende gemte informationer om betalingskort</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Lås op for at bruge gemte betalingsmetoder</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Tilføj adresse</string>
     <!-- Title of the "Edit address" screen -->
@@ -1848,6 +1920,8 @@
     <string name="addressess_delete_address_button">Slet adresse</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Er du sikker på, at du vil slette denne adresse?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Slet denne adresse?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Slet</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1947,30 +2021,52 @@
     <string name="login_menu_edit_button">Rediger</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Er du sikker på, at du vil slette dette login?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Er du sikker på, at du vil slette denne adgangskode?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Slet</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Annuller</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Login-indstillinger</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Adgangskode-indstillinger</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Det redigerbare tekstfelt for login’ets webadresse.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Det redigerbare tekstfelt for webadressen.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Det redigerbare tekstfelt for login’ets brugernavn.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Det redigerbare tekstfelt for brugernavnet.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Det redigerbare tekstfelt for login’ets adgangskode.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Det redigerbare tekstfelt for adgangskoden.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Gem ændringer til login.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Gem ændringer.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Rediger</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Rediger adgangskode</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Tilføj nyt login</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Tilføj adgangskode</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Adgangskode påkrævet</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Indtast en adgangskode</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Brugernavn påkrævet</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Indtast et brugernavn</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Værtsnavn påkrævet</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Indtast en webadresse</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Stemme-søgning</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2325,6 +2421,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Oversættelse i gang</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Vælg et sprog</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Der opstod et problem med at oversætte. Prøv igen.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2345,6 +2443,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Oversæt aldrig %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Oversæt aldrig dette websted</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Tilsidesætter alle andre indstillinger</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Tilsidesætter tilbud om oversættelse</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Oversættelses-indstillinger</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 780162870..bdb13932b 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -1558,6 +1558,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="preference_enhanced_tracking_protection_custom_cookies_4">Akk inagan n tuqqna (ad rẓen isaml web)</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
     <string name="preference_enhanced_tracking_protection_custom_cookies_5">Ɛzel inagan n tuqqna gar yismal</string>
+    <!-- Preference for Global Privacy Control for the custom privacy settings for Global Privacy Control. '&amp;' is replaced with the ampersand symbol: &-->
+    <string name="preference_enhanced_tracking_protection_custom_global_privacy_control">Ssuter i yismal web ur snuzuyen, ur beṭṭun isefka-w</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content">Agbur n uḍfaṛ</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
@@ -1759,6 +1761,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="logins_biometric_prompt_message">Serreḥ akken ad tsekneḍ inekcam-ik yettwaskelsen</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Mmesten inekcam d wawalen uffiren</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Seɣles awalen-ik·im uffiren i yettwaskelsen</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Sbadu azenziɣ n usekkeṛ, tangal PIN, neɣ awal uffir akken ad temmesteneḍ inekcam-ik akked wawlen-ik uffiren yettwaskelsen ticki yella win ikecmen ɣer yibenk-ik.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 07e0127c3..b986ea293 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -1289,6 +1289,8 @@
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
     <string name="notification_erase_title_android_14">පෞද්. පටිති වසන්නද?</string>
 
+    <string name="notification_erase_text_android_14">පෞද්. පටිති වැසීමට දැනුම්දීම මත තට්ටු හෝ තල්ලු කරන්න.</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">අළෙවිකරණය</string>
 

From ce80610473e7127cc4d266979190e634ff20cff3 Mon Sep 17 00:00:00 2001
From: Lina Butler <lina@yakshaving.ninja>
Date: Sat, 3 Feb 2024 11:49:05 -0800
Subject: [PATCH 107/222] Bug 1878434 - Record an awesomebar abandonment for
 cancelled toolbar edits.

We were missing instrumentation for the case where the user cancels
editing. This commit adds that instrumentation.
---
 .../java/org/mozilla/fenix/search/SearchDialogController.kt   | 1 +
 .../org/mozilla/fenix/search/SearchDialogControllerTest.kt    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt
index 74e830fce..4ab17e66a 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt
@@ -143,6 +143,7 @@ class SearchDialogController(
     override fun handleEditingCancelled() {
         clearToolbarFocus()
         dismissDialogAndGoBack()
+        store.dispatch(AwesomeBarAction.EngagementFinished(abandoned = true))
     }
 
     override fun handleTextChanged(text: String) {
diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt
index fcb7fb6f8..d1e10dcfe 100644
--- a/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt
@@ -313,6 +313,10 @@ class SearchDialogControllerTest {
 
         assertTrue(clearToolbarFocusInvoked)
         assertTrue(dismissAndGoBack)
+
+        middleware.assertLastAction(AwesomeBarAction.EngagementFinished::class) { action ->
+            assertTrue(action.abandoned)
+        }
     }
 
     @Test

From 6e866c420635668eeb5ad86df7fff2f96af1e3ce Mon Sep 17 00:00:00 2001
From: Lina Butler <lina@yakshaving.ninja>
Date: Fri, 2 Feb 2024 16:11:14 -0800
Subject: [PATCH 108/222] Bug 1878434 - Add the `awesomebar.{engagement,
 abandonment}` events.

This commit:

* Sends the new `awesomebar.{engagement, abandonment}` events when the
  user finishes interacting with the awesomebar. These events match
  iOS's events of the same name, and Desktop's
  `urlbar.{engagement, abandonment}` events.
* Removes the `engagement_abandoned` extra key for the
  `awesomebar.{sponsored, non_sponsored}_suggestion_impressed` events,
  since they're specific to AMP and Wikipedia suggestions, and are
  subsumed by the new events.

This is the first step toward unifying our awesomebar search telemetry
on all our platforms.
---
 app/metrics.yaml                              | 51 ++++++++++++++++---
 .../components/metrics/MetricController.kt    |  2 -
 .../fenix/telemetry/TelemetryMiddleware.kt    | 11 +++-
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/app/metrics.yaml b/app/metrics.yaml
index fe36185ed..636f46ff2 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -9204,8 +9204,10 @@ awesomebar:
       A sponsored suggestion was visible when the user finished interacting with the awesomebar.
     bugs:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1871156
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1878434
     data_reviews:
       - https://github.com/mozilla-mobile/firefox-android/pull/4914#issuecomment-1874271848
+      - https://github.com/mozilla-mobile/firefox-android/pull/5438#issuecomment-1930970336
     data_sensitivity:
       - interaction
     notification_emails:
@@ -9216,12 +9218,6 @@ awesomebar:
     expires: never
     extra_keys:
       provider: *sponsored_suggestion_provider
-      engagement_abandoned: &awesomebar_engagement_abandoned
-        description: |
-          If `true`, the user dismissed the awesomebar without navigating to a destination. If
-          `false`, the user finished engaging with the awesomebar by navigating to a destination,
-          like a URL, a search results page, or a suggestion.
-        type: boolean
     metadata:
       tags:
         - Search
@@ -9231,8 +9227,10 @@ awesomebar:
       A non-sponsored suggestion was visible when the user finished interacting with the awesomebar.
     bugs:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1871156
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1878434
     data_reviews:
       - https://github.com/mozilla-mobile/firefox-android/pull/4914#issuecomment-1874271848
+      - https://github.com/mozilla-mobile/firefox-android/pull/5438#issuecomment-1930970336
     data_sensitivity:
       - interaction
     notification_emails:
@@ -9243,10 +9241,49 @@ awesomebar:
     expires: never
     extra_keys:
       provider: *non_sponsored_suggestion_provider
-      engagement_abandoned: *awesomebar_engagement_abandoned
     metadata:
       tags:
         - Search
+  engagement:
+    type: event
+    description: |
+      The user completed their search session by tapping a search result,
+      or entering a URL or a search term.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1878434
+    data_reviews:
+      - https://github.com/mozilla-mobile/firefox-android/pull/5438#issuecomment-1930970336
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+      - lina@mozilla.com
+      - ttran@mozilla.com
+      - najiang@mozilla.com
+    expires: never
+    metadata:
+      tags:
+        - Search
+  abandonment:
+    type: event
+    description: |
+      The user dismissed the awesomebar without completing their search.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1878434
+    data_reviews:
+      - https://github.com/mozilla-mobile/firefox-android/pull/5438#issuecomment-1930970336
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+      - lina@mozilla.com
+      - ttran@mozilla.com
+      - najiang@mozilla.com
+    expires: never
+    metadata:
+      tags:
+        - Search
+
 android_autofill:
   supported:
     type: boolean
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt
index 453ff4750..6e43803f4 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt
@@ -339,7 +339,6 @@ internal class ReleaseMetricController(
                     Awesomebar.sponsoredSuggestionImpressed.record(
                         Awesomebar.SponsoredSuggestionImpressedExtra(
                             provider = "amp",
-                            engagementAbandoned = engagementAbandoned,
                         ),
                     )
                 }
@@ -347,7 +346,6 @@ internal class ReleaseMetricController(
                     Awesomebar.nonSponsoredSuggestionImpressed.record(
                         Awesomebar.NonSponsoredSuggestionImpressedExtra(
                             provider = "wikipedia",
-                            engagementAbandoned = engagementAbandoned,
                         ),
                     )
                 }
diff --git a/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt b/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt
index 3b448bdb4..53c1fc8fe 100644
--- a/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt
+++ b/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.telemetry
 
 import android.content.Context
+import mozilla.components.browser.state.action.AwesomeBarAction
 import mozilla.components.browser.state.action.BrowserAction
 import mozilla.components.browser.state.action.ContentAction
 import mozilla.components.browser.state.action.DownloadAction
@@ -25,6 +26,7 @@ import mozilla.telemetry.glean.internal.TimerId
 import mozilla.telemetry.glean.private.NoExtras
 import org.mozilla.fenix.Config
 import org.mozilla.fenix.GleanMetrics.Addons
+import org.mozilla.fenix.GleanMetrics.Awesomebar
 import org.mozilla.fenix.GleanMetrics.Events
 import org.mozilla.fenix.GleanMetrics.Metrics
 import org.mozilla.fenix.components.metrics.Event
@@ -59,7 +61,7 @@ class TelemetryMiddleware(
 
     private val logger = Logger("TelemetryMiddleware")
 
-    @Suppress("TooGenericExceptionCaught", "ComplexMethod", "NestedBlockDepth")
+    @Suppress("TooGenericExceptionCaught", "ComplexMethod", "NestedBlockDepth", "LongMethod")
     override fun invoke(
         context: MiddlewareContext<BrowserState, BrowserAction>,
         next: (BrowserAction) -> Unit,
@@ -144,6 +146,13 @@ class TelemetryMiddleware(
             is ExtensionsProcessAction.DisabledAction -> {
                 Addons.extensionsProcessUiDisable.add()
             }
+            is AwesomeBarAction.EngagementFinished -> {
+                if (action.abandoned) {
+                    Awesomebar.abandonment.record()
+                } else {
+                    Awesomebar.engagement.record()
+                }
+            }
             else -> {
                 // no-op
             }

From 9277995e3a3c9bd9239458f4f55ced5b1d952bc1 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 6 Feb 2024 14:32:54 +0200
Subject: [PATCH 109/222] Bug 1878866 - Add missing pairs of logs to
 AddToHomeScreenRobot

---
 .../fenix/ui/robots/AddToHomeScreenRobot.kt   | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt
index 5d1bd8338..f42941bbc 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt
@@ -30,21 +30,25 @@ import java.util.regex.Pattern
 class AddToHomeScreenRobot {
 
     fun verifyAddPrivateBrowsingShortcutButton(composeTestRule: ComposeTestRule) {
+        Log.i(TAG, "verifyAddPrivateBrowsingShortcutButton: Trying to verify \"Add to Home screen\" private browsing shortcut dialog button is displayed")
         composeTestRule.onNodeWithTag("private.add").assertIsDisplayed()
         Log.i(TAG, "verifyAddPrivateBrowsingShortcutButton: Verified \"Add to Home screen\" private browsing shortcut dialog button is displayed")
     }
 
     fun verifyNoThanksPrivateBrowsingShortcutButton(composeTestRule: ComposeTestRule) {
+        Log.i(TAG, "verifyNoThanksPrivateBrowsingShortcutButton: Trying to verify \"No thanks\" private browsing shortcut dialog button is displayed")
         composeTestRule.onNodeWithTag("private.cancel").assertIsDisplayed()
         Log.i(TAG, "verifyNoThanksPrivateBrowsingShortcutButton: Verified \"No thanks\" private browsing shortcut dialog button is displayed")
     }
 
     fun clickAddPrivateBrowsingShortcutButton(composeTestRule: ComposeTestRule) {
+        Log.i(TAG, "clickAddPrivateBrowsingShortcutButton: Trying to click \"Add to Home screen\" private browsing shortcut dialog button")
         composeTestRule.onNodeWithTag("private.add").performClick()
         Log.i(TAG, "clickAddPrivateBrowsingShortcutButton: Clicked \"Add to Home screen\" private browsing shortcut dialog button")
     }
 
     fun addShortcutName(title: String) {
+        Log.i(TAG, "addShortcutName: Trying to set shortcut name to: $title")
         shortcutTextField().setText(title)
         Log.i(TAG, "addShortcutName: Set shortcut name to: $title")
     }
@@ -52,17 +56,20 @@ class AddToHomeScreenRobot {
     fun verifyShortcutTextFieldTitle(title: String) = assertUIObjectExists(shortcutTitle(title))
 
     fun clickAddShortcutButton() {
+        Log.i(TAG, "clickAddShortcutButton: Trying to click \"Add\" button from \"Add to home screen\" dialog and wait for $waitingTime ms for a new window")
         confirmAddToHomeScreenButton().clickAndWaitForNewWindow(waitingTime)
-        Log.i(TAG, "clickAddShortcutButton: Clicked \"Add\" button from \"Add to home screen\" dialog")
+        Log.i(TAG, "clickAddShortcutButton: Clicked \"Add\" button from \"Add to home screen\" dialog and waited for $waitingTime ms for a new window")
     }
 
     fun clickCancelShortcutButton() {
+        Log.i(TAG, "clickCancelShortcutButton: Trying to click \"Cancel\" button from \"Add to home screen\" dialog")
         cancelAddToHomeScreenButton().click()
         Log.i(TAG, "clickCancelShortcutButton: Clicked \"Cancel\" button from \"Add to home screen\" dialog")
     }
 
     fun clickAddAutomaticallyButton() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            Log.i(TAG, "clickAddAutomaticallyButton: Waiting for $waitingTime ms until finding \"Add automatically\" system dialog button")
             mDevice.wait(
                 Until.findObject(
                     By.text(
@@ -71,7 +78,8 @@ class AddToHomeScreenRobot {
                 ),
                 waitingTime,
             )
-            Log.i(TAG, "clickAddAutomaticallyButton: Waited for \"Add automatically\" system dialog button")
+            Log.i(TAG, "clickAddAutomaticallyButton: Waited for $waitingTime ms until \"Add automatically\" system dialog button was found")
+            Log.i(TAG, "clickAddAutomaticallyButton: Trying to click \"Add automatically\" system dialog button")
             addAutomaticallyButton().click()
             Log.i(TAG, "clickAddAutomaticallyButton: Clicked \"Add automatically\" system dialog button")
         }
@@ -82,32 +90,37 @@ class AddToHomeScreenRobot {
 
     class Transition {
         fun openHomeScreenShortcut(title: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "openHomeScreenShortcut: Waiting for $waitingTime ms until finding $title home screen shortcut")
             mDevice.wait(
                 Until.findObject(By.text(title)),
                 waitingTime,
             )
-            Log.i(TAG, "openHomeScreenShortcut: Waited for $title home screen shortcut")
+            Log.i(TAG, "openHomeScreenShortcut: Waited for $waitingTime ms until $title home screen shortcut was found")
+            Log.i(TAG, "openHomeScreenShortcut: Trying to click $title home screen shortcut and wait for $waitingTime ms for a new window")
             mDevice.findObject((UiSelector().text(title))).clickAndWaitForNewWindow(waitingTime)
-            Log.i(TAG, "openHomeScreenShortcut: Clicked $title home screen shortcut")
+            Log.i(TAG, "openHomeScreenShortcut: Clicked $title home screen shortcut and waited for $waitingTime ms for a new window")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun searchAndOpenHomeScreenShortcut(title: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "searchAndOpenHomeScreenShortcut: Trying to press device home button")
             mDevice.pressHome()
             Log.i(TAG, "searchAndOpenHomeScreenShortcut: Pressed device home button")
 
             fun homeScreenView() = UiScrollable(UiSelector().scrollable(true))
+            Log.i(TAG, "searchAndOpenHomeScreenShortcut: Waiting for $waitingTime ms for home screen view to exist")
             homeScreenView().waitForExists(waitingTime)
-            Log.i(TAG, "searchAndOpenHomeScreenShortcut: Waiting for home screen view")
+            Log.i(TAG, "searchAndOpenHomeScreenShortcut: Waited for $waitingTime ms for home screen view to exist")
 
             fun shortcut() =
                 homeScreenView()
                     .setAsHorizontalList()
                     .getChildByText(UiSelector().textContains(title), title, true)
+            Log.i(TAG, "searchAndOpenHomeScreenShortcut: Trying to click home screen shortcut: $title and wait for a new window")
             shortcut().clickAndWaitForNewWindow()
-            Log.i(TAG, "searchAndOpenHomeScreenShortcut: Clicked home screen shortcut: $title")
+            Log.i(TAG, "searchAndOpenHomeScreenShortcut: Clicked home screen shortcut: $title and waited for a new window")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()

From efad284e5389eea3ca8a527f8056a5185d58148c Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 6 Feb 2024 15:08:59 +0200
Subject: [PATCH 110/222] Bug 1878878 - Add missing pairs of logs to
 BookmarksRobot

---
 .../mozilla/fenix/ui/robots/BookmarksRobot.kt | 109 +++++++++++++-----
 1 file changed, 81 insertions(+), 28 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
index 0176f326c..48b73ced8 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
@@ -55,11 +55,12 @@ import org.mozilla.fenix.helpers.ext.waitNotNull
 class BookmarksRobot {
 
     fun verifyBookmarksMenuView() {
-        Log.i(TAG, "verifyBookmarksMenuView: Looking for bookmarks view")
+        Log.i(TAG, "verifyBookmarksMenuView: Waiting for $waitingTime ms for bookmarks view to exist")
         mDevice.findObject(
             UiSelector().text("Bookmarks"),
         ).waitForExists(waitingTime)
-
+        Log.i(TAG, "verifyBookmarksMenuView: Waited for $waitingTime ms for bookmarks view to exist")
+        Log.i(TAG, "verifyBookmarksMenuView: Trying to verify bookmarks view is displayed")
         onView(
             allOf(
                 withText("Bookmarks"),
@@ -70,16 +71,19 @@ class BookmarksRobot {
     }
 
     fun verifyAddFolderButton() {
+        Log.i(TAG, "verifyAddFolderButton: Trying to verify add bookmarks folder button is visible")
         addFolderButton().check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
         Log.i(TAG, "verifyAddFolderButton: Verified add bookmarks folder button is visible")
     }
 
     fun verifyCloseButton() {
+        Log.i(TAG, "verifyCloseButton: Trying to verify close bookmarks section button is visible")
         closeButton().check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
         Log.i(TAG, "verifyCloseButton: Verified close bookmarks section button is visible")
     }
 
     fun verifyBookmarkFavicon(forUrl: Uri) {
+        Log.i(TAG, "verifyBookmarkFavicon: Trying to verify bookmarks favicon for $forUrl is visible")
         bookmarkFavicon(forUrl.toString()).check(
             matches(
                 withEffectiveVisibility(
@@ -91,41 +95,47 @@ class BookmarksRobot {
     }
 
     fun verifyBookmarkedURL(url: String) {
+        Log.i(TAG, "verifyBookmarkedURL: Trying to verify bookmarks url: $url is displayed")
         bookmarkURL(url).check(matches(isDisplayed()))
         Log.i(TAG, "verifyBookmarkedURL: Verified bookmarks url: $url is displayed")
     }
 
     fun verifyFolderTitle(title: String) {
-        Log.i(TAG, "verifyFolderTitle: Looking for bookmarks folder with title: $title")
+        Log.i(TAG, "verifyFolderTitle: Waiting for $waitingTime ms for bookmarks folder with title: $title to exist")
         mDevice.findObject(UiSelector().text(title)).waitForExists(waitingTime)
+        Log.i(TAG, "verifyFolderTitle: Waited for $waitingTime ms for bookmarks folder with title: $title to exist")
+        Log.i(TAG, "verifyFolderTitle: Trying to verify bookmarks folder with title: $title is displayed")
         onView(withText(title)).check(matches(isDisplayed()))
         Log.i(TAG, "verifyFolderTitle: Verified bookmarks folder with title: $title is displayed")
     }
 
     fun verifyBookmarkFolderIsNotCreated(title: String) {
-        Log.i(TAG, "verifyBookmarkFolderIsNotCreated: Looking for bookmarks view")
+        Log.i(TAG, "verifyBookmarkFolderIsNotCreated: Waiting for $waitingTime ms for bookmarks folder with title: $title to exist")
         mDevice.findObject(
             UiSelector()
                 .resourceId("$packageName:id/bookmarks_wrapper"),
         ).waitForExists(waitingTime)
+        Log.i(TAG, "verifyBookmarkFolderIsNotCreated: Waited for $waitingTime ms for bookmarks folder with title: $title to exist")
 
         assertUIObjectExists(itemContainingText(title), exists = false)
     }
 
     fun verifyBookmarkTitle(title: String) {
-        Log.i(TAG, "verifyBookmarkTitle: Looking for bookmark with title: $title")
+        Log.i(TAG, "verifyBookmarkTitle: Waiting for $waitingTime ms for bookmark with title: $title to exist")
         mDevice.findObject(UiSelector().text(title)).waitForExists(waitingTime)
+        Log.i(TAG, "verifyBookmarkTitle: Waited for $waitingTime ms for bookmark with title: $title to exist")
+        Log.i(TAG, "verifyBookmarkTitle: Trying to verify bookmark with title: $title is displayed")
         onView(withText(title)).check(matches(isDisplayed()))
         Log.i(TAG, "verifyBookmarkTitle: Verified bookmark with title: $title is displayed")
     }
 
     fun verifyBookmarkIsDeleted(expectedTitle: String) {
-        Log.i(TAG, "verifyBookmarkIsDeleted: Looking for bookmarks view")
+        Log.i(TAG, "verifyBookmarkIsDeleted: Waiting for $waitingTime ms for bookmarks view to exist")
         mDevice.findObject(
             UiSelector()
                 .resourceId("$packageName:id/bookmarks_wrapper"),
         ).waitForExists(waitingTime)
-
+        Log.i(TAG, "verifyBookmarkIsDeleted: Waited for $waitingTime ms for bookmarks view to exist")
         assertUIObjectExists(
             itemWithResIdContainingText(
                 "$packageName:id/title",
@@ -136,16 +146,19 @@ class BookmarksRobot {
     }
 
     fun verifyUndoDeleteSnackBarButton() {
+        Log.i(TAG, "verifyUndoDeleteSnackBarButton: Trying to verify bookmark deletion undo snack bar button")
         snackBarUndoButton().check(matches(withText("UNDO")))
         Log.i(TAG, "verifyUndoDeleteSnackBarButton: Verified bookmark deletion undo snack bar button")
     }
 
     fun verifySnackBarHidden() {
+        Log.i(TAG, "verifySnackBarHidden: Waiting until undo snack bar button is gone")
         mDevice.waitNotNull(
             Until.gone(By.text("UNDO")),
             waitingTime,
         )
-        Log.i(TAG, "verifySnackBarHidden: Waited until undo snack bar button is gone")
+        Log.i(TAG, "verifySnackBarHidden: Waited until undo snack bar button was gone")
+        Log.i(TAG, "verifySnackBarHidden: Trying to verify bookmark snack bar does not exist")
         onView(withId(R.id.snackbar_layout)).check(doesNotExist())
         Log.i(TAG, "verifySnackBarHidden: Verified bookmark snack bar does not exist")
     }
@@ -162,6 +175,7 @@ class BookmarksRobot {
         )
 
     fun verifyKeyboardHidden(isExpectedToBeVisible: Boolean) {
+        Log.i(TAG, "assertKeyboardVisibility: Trying to verify that the keyboard is visible: $isExpectedToBeVisible")
         assertEquals(
             isExpectedToBeVisible,
             mDevice
@@ -172,33 +186,38 @@ class BookmarksRobot {
     }
 
     fun verifyShareOverlay() {
+        Log.i(TAG, "verifyShareOverlay: Trying to verify bookmarks sharing overlay is displayed")
         onView(withId(R.id.shareWrapper)).check(matches(isDisplayed()))
         Log.i(TAG, "verifyShareOverlay: Verified bookmarks sharing overlay is displayed")
     }
 
     fun verifyShareBookmarkFavicon() {
+        Log.i(TAG, "verifyShareBookmarkFavicon: Trying to verify shared bookmarks favicon is displayed")
         onView(withId(R.id.share_tab_favicon)).check(matches(isDisplayed()))
         Log.i(TAG, "verifyShareBookmarkFavicon: Verified shared bookmarks favicon is displayed")
     }
 
     fun verifyShareBookmarkTitle() {
+        Log.i(TAG, "verifyShareBookmarkTitle: Trying to verify shared bookmarks title is displayed")
         onView(withId(R.id.share_tab_title)).check(matches(isDisplayed()))
         Log.i(TAG, "verifyShareBookmarkTitle: Verified shared bookmarks title is displayed")
     }
 
     fun verifyShareBookmarkUrl() {
+        Log.i(TAG, "verifyShareBookmarkUrl: Trying to verify shared bookmarks url is displayed")
         onView(withId(R.id.share_tab_url)).check(matches(isDisplayed()))
         Log.i(TAG, "verifyShareBookmarkUrl: Verified shared bookmarks url is displayed")
     }
 
     fun verifyCurrentFolderTitle(title: String) {
-        Log.i(TAG, "verifyCurrentFolderTitle: Looking for bookmark with title: $title")
+        Log.i(TAG, "verifyCurrentFolderTitle: Waiting for $waitingTime ms for bookmark with title: $title to exist")
         mDevice.findObject(
             UiSelector().resourceId("$packageName:id/navigationToolbar")
                 .textContains(title),
         )
             .waitForExists(waitingTime)
-
+        Log.i(TAG, "verifyCurrentFolderTitle: Waited for $waitingTime ms for bookmark with title: $title to exist")
+        Log.i(TAG, "verifyCurrentFolderTitle: Trying to verify bookmark with title: $title is displayed")
         onView(
             allOf(
                 withText(title),
@@ -210,22 +229,25 @@ class BookmarksRobot {
     }
 
     fun waitForBookmarksFolderContentToExist(parentFolderName: String, childFolderName: String) {
-        Log.i(TAG, "waitForBookmarksFolderContentToExist: Looking for navigation toolbar containing bookmark folder with title: $parentFolderName")
+        Log.i(TAG, "waitForBookmarksFolderContentToExist: Waiting for $waitingTime ms for navigation toolbar containing bookmark folder with title: $parentFolderName to exist")
         mDevice.findObject(
             UiSelector().resourceId("$packageName:id/navigationToolbar")
                 .textContains(parentFolderName),
         )
             .waitForExists(waitingTime)
+        Log.i(TAG, "waitForBookmarksFolderContentToExist: Waited for $waitingTime ms for navigation toolbar containing bookmark folder with title: $parentFolderName to exist")
 
         mDevice.waitNotNull(Until.findObject(By.text(childFolderName)), waitingTime)
     }
 
     fun verifySyncSignInButton() {
+        Log.i(TAG, "verifySyncSignInButton: Trying to verify sign in to sync button is visible")
         syncSignInButton().check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
         Log.i(TAG, "verifySyncSignInButton: Verified sign in to sync button is visible")
     }
 
     fun cancelFolderDeletion() {
+        Log.i(TAG, "cancelFolderDeletion: Trying to click \"Cancel\" bookmarks folder deletion dialog button")
         onView(withText("CANCEL"))
             .inRoot(RootMatchers.isDialog())
             .check(matches(isDisplayed()))
@@ -253,6 +275,7 @@ class BookmarksRobot {
             Until.findObject(By.desc("Add folder")),
             waitingTime,
         )
+        Log.i(TAG, "clickAddFolderButton: Trying to click add bookmarks folder button")
         addFolderButton().click()
         Log.i(TAG, "clickAddFolderButton: Clicked add bookmarks folder button")
     }
@@ -260,79 +283,99 @@ class BookmarksRobot {
     fun clickAddNewFolderButtonFromSelectFolderView() {
         itemWithResId("$packageName:id/add_folder_button")
             .also {
+                Log.i(TAG, "clickAddNewFolderButtonFromSelectFolderView: Waiting for $waitingTime ms for add bookmarks folder button from folder selection view to exist")
                 it.waitForExists(waitingTime)
+                Log.i(TAG, "clickAddNewFolderButtonFromSelectFolderView: Waited for $waitingTime ms for add bookmarks folder button from folder selection view to exist")
+                Log.i(TAG, "clickAddNewFolderButtonFromSelectFolderView: Trying to click add bookmarks folder button from folder selection view")
                 it.click()
+                Log.i(TAG, "clickAddNewFolderButtonFromSelectFolderView: Clicked add bookmarks folder button from folder selection view")
             }
-        Log.i(TAG, "clickAddNewFolderButtonFromSelectFolderView: Clicked add bookmarks folder button from folder selection view")
     }
 
     fun addNewFolderName(name: String) {
-        addFolderTitleField()
-            .click()
-            .perform(replaceText(name))
+        Log.i(TAG, "addNewFolderName: Trying to click add folder name field")
+        addFolderTitleField().click()
+        Log.i(TAG, "addNewFolderName: Clicked to click add folder name field")
+        Log.i(TAG, "addNewFolderName: Trying to set bookmarks folder name to: $name")
+        addFolderTitleField().perform(replaceText(name))
         Log.i(TAG, "addNewFolderName: Bookmarks folder name was set to: $name")
     }
 
     fun saveNewFolder() {
+        Log.i(TAG, "saveNewFolder: Trying to click save folder button")
         saveFolderButton().click()
         Log.i(TAG, "saveNewFolder: Clicked save folder button")
     }
 
     fun navigateUp() {
+        Log.i(TAG, "navigateUp: Trying to click navigate up toolbar button")
         goBackButton().click()
         Log.i(TAG, "navigateUp: Clicked navigate up toolbar button")
     }
 
     fun clickUndoDeleteButton() {
+        Log.i(TAG, "clickUndoDeleteButton: Trying to click undo snack bar button")
         snackBarUndoButton().click()
         Log.i(TAG, "clickUndoDeleteButton: Clicked undo snack bar button")
     }
 
     fun changeBookmarkTitle(newTitle: String) {
-        bookmarkNameEditBox()
-            .perform(clearText())
-            .perform(typeText(newTitle))
+        Log.i(TAG, "changeBookmarkTitle: Trying to clear bookmark name text box")
+        bookmarkNameEditBox().perform(clearText())
+        Log.i(TAG, "changeBookmarkTitle: Cleared bookmark name text box")
+        Log.i(TAG, "changeBookmarkTitle: Trying to set bookmark title to: $newTitle")
+        bookmarkNameEditBox().perform(typeText(newTitle))
         Log.i(TAG, "changeBookmarkTitle: Bookmark title was set to: $newTitle")
     }
 
     fun changeBookmarkUrl(newUrl: String) {
-        bookmarkURLEditBox()
-            .perform(clearText())
-            .perform(typeText(newUrl))
+        Log.i(TAG, "changeBookmarkUrl: Trying to clear bookmark url text box")
+        bookmarkURLEditBox().perform(clearText())
+        Log.i(TAG, "changeBookmarkUrl: Cleared bookmark url text box")
+        Log.i(TAG, "changeBookmarkUrl: Trying to set bookmark url to: $newUrl")
+        bookmarkURLEditBox().perform(typeText(newUrl))
         Log.i(TAG, "changeBookmarkUrl: Bookmark url was set to: $newUrl")
     }
 
     fun saveEditBookmark() {
+        Log.i(TAG, "saveEditBookmark: Trying to click save bookmark button")
         saveBookmarkButton().click()
         Log.i(TAG, "saveEditBookmark: Clicked save bookmark button")
-        Log.i(TAG, "saveEditBookmark: Looking for bookmarks list")
+        Log.i(TAG, "saveEditBookmark: Waiting for $waitingTime ms for bookmarks list to exist")
         mDevice.findObject(UiSelector().resourceId("org.mozilla.fenix.debug:id/bookmark_list")).waitForExists(waitingTime)
+        Log.i(TAG, "saveEditBookmark: Waited for $waitingTime ms for bookmarks list to exist")
     }
 
     fun clickParentFolderSelector() {
+        Log.i(TAG, "clickParentFolderSelector: Trying to click folder selector")
         bookmarkFolderSelector().click()
         Log.i(TAG, "clickParentFolderSelector: Clicked folder selector")
     }
 
     fun selectFolder(title: String) {
+        Log.i(TAG, "selectFolder: Trying to click folder with title: $title")
         onView(withText(title)).click()
-        Log.i(TAG, "selectFolder: Selected folder: $title")
+        Log.i(TAG, "selectFolder: Clicked folder with title: $title")
     }
 
     fun longTapDesktopFolder(title: String) {
+        Log.i(TAG, "longTapDesktopFolder: Trying to long tap folder with title: $title")
         onView(withText(title)).perform(longClick())
-        Log.i(TAG, "longTapDesktopFolder: Log tapped folder with title: $title")
+        Log.i(TAG, "longTapDesktopFolder: Long tapped folder with title: $title")
     }
 
     fun cancelDeletion() {
         val cancelButton = mDevice.findObject(UiSelector().textContains("CANCEL"))
-        Log.i(TAG, "saveEditBookmark: Looking for \"Cancel\" bookmarks deletion button")
+        Log.i(TAG, "cancelDeletion: Waiting for $waitingTime ms for \"Cancel\" bookmarks deletion button to exist")
         cancelButton.waitForExists(waitingTime)
+        Log.i(TAG, "cancelDeletion: Waited for $waitingTime ms for \"Cancel\" bookmarks deletion button to exist")
+        Log.i(TAG, "cancelDeletion: Trying to click \"Cancel\" bookmarks deletion button")
         cancelButton.click()
-        Log.i(TAG, "saveEditBookmark: Clicked \"Cancel\" bookmarks deletion button")
+        Log.i(TAG, "cancelDeletion: Clicked \"Cancel\" bookmarks deletion button")
     }
 
     fun confirmDeletion() {
+        Log.i(TAG, "confirmDeletion: Trying to click \"Delete\" bookmarks deletion button")
         onView(withText(R.string.delete_browsing_data_prompt_allow))
             .inRoot(RootMatchers.isDialog())
             .check(matches(isDisplayed()))
@@ -341,12 +384,14 @@ class BookmarksRobot {
     }
 
     fun clickDeleteInEditModeButton() {
+        Log.i(TAG, "clickDeleteInEditModeButton: Trying to click delete bookmarks button while in edit mode")
         deleteInEditModeButton().click()
         Log.i(TAG, "clickDeleteInEditModeButton: Clicked delete bookmarks button while in edit mode")
     }
 
     class Transition {
         fun closeMenu(interact: HomeScreenRobot.() -> Unit): Transition {
+            Log.i(TAG, "closeMenu: Trying to click close bookmarks section button")
             closeButton().click()
             Log.i(TAG, "closeMenu: Clicked close bookmarks section button")
 
@@ -356,6 +401,7 @@ class BookmarksRobot {
 
         fun openThreeDotMenu(bookmark: String, interact: ThreeDotMenuBookmarksRobot.() -> Unit): ThreeDotMenuBookmarksRobot.Transition {
             mDevice.waitNotNull(Until.findObject(res("$packageName:id/overflow_menu")))
+            Log.i(TAG, "openThreeDotMenu: Trying to click three dot button for bookmark item: $bookmark")
             threeDotMenu(bookmark).click()
             Log.i(TAG, "openThreeDotMenu: Clicked three dot button for bookmark item: $bookmark")
 
@@ -364,6 +410,7 @@ class BookmarksRobot {
         }
 
         fun clickSingInToSyncButton(interact: SettingsTurnOnSyncRobot.() -> Unit): SettingsTurnOnSyncRobot.Transition {
+            Log.i(TAG, "clickSingInToSyncButton: Trying to click sign in to sync button")
             syncSignInButton().click()
             Log.i(TAG, "clickSingInToSyncButton: Clicked sign in to sync button")
 
@@ -372,6 +419,7 @@ class BookmarksRobot {
         }
 
         fun goBack(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
+            Log.i(TAG, "goBack: Trying to click go back button")
             goBackButton().click()
             Log.i(TAG, "goBack: Clicked go back button")
 
@@ -380,6 +428,7 @@ class BookmarksRobot {
         }
 
         fun goBackToBrowserScreen(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "goBackToBrowserScreen: Trying to click go back button")
             goBackButton().click()
             Log.i(TAG, "goBackToBrowserScreen: Clicked go back button")
 
@@ -388,6 +437,7 @@ class BookmarksRobot {
         }
 
         fun closeEditBookmarkSection(interact: BookmarksRobot.() -> Unit): Transition {
+            Log.i(TAG, "goBackToBrowserScreen: Trying to click go back button")
             goBackButton().click()
             Log.i(TAG, "goBackToBrowserScreen: Clicked go back button")
 
@@ -396,19 +446,22 @@ class BookmarksRobot {
         }
 
         fun openBookmarkWithTitle(bookmarkTitle: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            Log.i(TAG, "openBookmarkWithTitle: Looking for bookmark with title: $bookmarkTitle")
             itemWithResIdAndText("$packageName:id/title", bookmarkTitle)
                 .also {
+                    Log.i(TAG, "openBookmarkWithTitle: Waiting for $waitingTime ms for bookmark with title: $bookmarkTitle")
                     it.waitForExists(waitingTime)
+                    Log.i(TAG, "openBookmarkWithTitle: Waited for $waitingTime ms for bookmark with title: $bookmarkTitle")
+                    Log.i(TAG, "openBookmarkWithTitle: Trying to click bookmark with title: $bookmarkTitle and wait for $waitingTimeShort ms for a new window")
                     it.clickAndWaitForNewWindow(waitingTimeShort)
+                    Log.i(TAG, "openBookmarkWithTitle: Clicked bookmark with title: $bookmarkTitle and waited for $waitingTimeShort ms for a new window")
                 }
-            Log.i(TAG, "openBookmarkWithTitle: Clicked bookmark with title: $bookmarkTitle")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun clickSearchButton(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
+            Log.i(TAG, "clickSearchButton: Trying to click search bookmarks button")
             itemWithResId("$packageName:id/bookmark_search").click()
             Log.i(TAG, "clickSearchButton: Clicked search bookmarks button")
 

From da540d7578781ea65aa6d680722957e12f80d0a9 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 6 Feb 2024 17:52:27 +0200
Subject: [PATCH 111/222] Bug 1879027 - Add missing pairs of logs to
 CollectionRobot

---
 .../fenix/ui/robots/CollectionRobot.kt        | 81 ++++++++++++++-----
 1 file changed, 61 insertions(+), 20 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt
index 94626a88e..1dc74bb38 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt
@@ -48,6 +48,7 @@ class CollectionRobot {
         )
 
     fun clickAddNewCollection() {
+        Log.i(TAG, "clickAddNewCollection: Trying to click the add new collection button")
         addNewCollectionButton().click()
         Log.i(TAG, "clickAddNewCollection: Clicked the add new collection button")
     }
@@ -56,25 +57,33 @@ class CollectionRobot {
 
     // names a collection saved from tab drawer
     fun typeCollectionNameAndSave(collectionName: String) {
+        Log.i(TAG, "typeCollectionNameAndSave: Trying to set collection name text field to: $collectionName")
         collectionNameTextField().text = collectionName
         Log.i(TAG, "typeCollectionNameAndSave: Collection name text field set to: $collectionName")
+        Log.i(TAG, "typeCollectionNameAndSave: Waiting for $waitingTime ms for add collection button panel to exist")
         addCollectionButtonPanel().waitForExists(waitingTime)
+        Log.i(TAG, "typeCollectionNameAndSave: Waited for $waitingTime ms for add collection button panel to exist")
+        Log.i(TAG, "typeCollectionNameAndSave: Trying to click \"OK\" panel button")
         addCollectionOkButton().click()
         Log.i(TAG, "typeCollectionNameAndSave: Clicked \"OK\" panel button")
     }
 
     fun verifyTabsSelectedCounterText(numOfTabs: Int) {
-        Log.i(TAG, "verifyTabsSelectedCounterText: Waiting for \"Select tabs to save\" prompt to be gone")
+        Log.i(TAG, "verifyTabsSelectedCounterText: Waiting for $waitingTime ms for \"Select tabs to save\" prompt to be gone")
         itemWithText("Select tabs to save").waitUntilGone(waitingTime)
+        Log.i(TAG, "verifyTabsSelectedCounterText: Waited for $waitingTime ms for \"Select tabs to save\" prompt to be gone")
 
         val tabsCounter = mDevice.findObject(UiSelector().resourceId("$packageName:id/bottom_bar_text"))
+        Log.i(TAG, "verifyTabsSelectedCounterText: Trying to assert that number of tabs selected is: $numOfTabs")
         when (numOfTabs) {
             1 -> assertItemTextEquals(tabsCounter, expectedText = "$numOfTabs tab selected")
             2 -> assertItemTextEquals(tabsCounter, expectedText = "$numOfTabs tabs selected")
         }
+        Log.i(TAG, "verifyTabsSelectedCounterText: Asserted number of tabs selected is: $numOfTabs")
     }
 
     fun saveTabsSelectedForCollection() {
+        Log.i(TAG, "saveTabsSelectedForCollection: Trying to click \"Save\" button")
         itemWithResId("$packageName:id/save_button").click()
         Log.i(TAG, "saveTabsSelectedForCollection: Clicked \"Save\" button")
     }
@@ -96,11 +105,14 @@ class CollectionRobot {
 
     fun verifyCollectionMenuIsVisible(visible: Boolean, rule: ComposeTestRule) {
         if (visible) {
-            collectionThreeDotButton(rule)
-                .assertExists()
-                .assertIsDisplayed()
+            Log.i(TAG, "verifyCollectionMenuIsVisible: Trying to verify collection three dot button exists")
+            collectionThreeDotButton(rule).assertExists()
             Log.i(TAG, "verifyCollectionMenuIsVisible: Verified collection three dot button exists")
+            Log.i(TAG, "verifyCollectionMenuIsVisible: Trying to verify collection three dot button is displayed")
+            collectionThreeDotButton(rule).assertIsDisplayed()
+            Log.i(TAG, "verifyCollectionMenuIsVisible: Verified collection three dot button is displayed")
         } else {
+            Log.i(TAG, "verifyCollectionMenuIsVisible: Trying to verify collection three dot button does not exist")
             collectionThreeDotButton(rule)
                 .assertDoesNotExist()
             Log.i(TAG, "verifyCollectionMenuIsVisible: Verified collection three dot button does not exist")
@@ -108,40 +120,52 @@ class CollectionRobot {
     }
 
     fun clickCollectionThreeDotButton(rule: ComposeTestRule) {
-        collectionThreeDotButton(rule)
-            .assertIsDisplayed()
-            .performClick()
+        Log.i(TAG, "clickCollectionThreeDotButton: Trying to verify three dot button is displayed")
+        collectionThreeDotButton(rule).assertIsDisplayed()
+        Log.i(TAG, "clickCollectionThreeDotButton: Verified three dot button is displayed")
+        Log.i(TAG, "clickCollectionThreeDotButton: Trying to click three dot button")
+        collectionThreeDotButton(rule).performClick()
         Log.i(TAG, "clickCollectionThreeDotButton: Clicked three dot button")
     }
 
     fun selectOpenTabs(rule: ComposeTestRule) {
-        rule.onNode(hasText("Open tabs"))
-            .assertIsDisplayed()
-            .performClick()
+        Log.i(TAG, "selectOpenTabs: Trying to verify \"Open tabs\" menu option is displayed")
+        rule.onNode(hasText("Open tabs")).assertIsDisplayed()
+        Log.i(TAG, "selectOpenTabs: Verified \"Open tabs\" menu option is displayed")
+        Log.i(TAG, "selectOpenTabs: Trying to click \"Open tabs\" menu option")
+        rule.onNode(hasText("Open tabs")).performClick()
         Log.i(TAG, "selectOpenTabs: Clicked \"Open tabs\" menu option")
     }
 
     fun selectRenameCollection(rule: ComposeTestRule) {
-        rule.onNode(hasText("Rename collection"))
-            .assertIsDisplayed()
-            .performClick()
+        Log.i(TAG, "selectRenameCollection: Trying to verify \"Rename collection\" menu option is displayed")
+        rule.onNode(hasText("Rename collection")).assertIsDisplayed()
+        Log.i(TAG, "selectRenameCollection: Verified \"Rename collection\" menu option is displayed")
+        Log.i(TAG, "selectRenameCollection: Trying to click \"Rename collection\" menu option")
+        rule.onNode(hasText("Rename collection")).performClick()
         Log.i(TAG, "selectRenameCollection: Clicked \"Rename collection\" menu option")
+        Log.i(TAG, "selectRenameCollection: Waiting for $waitingTime ms for collection name text field to exist")
         mainMenuEditCollectionNameField().waitForExists(waitingTime)
+        Log.i(TAG, "selectRenameCollection: Waited for $waitingTime ms for collection name text field to exist")
     }
 
     fun selectAddTabToCollection(rule: ComposeTestRule) {
-        rule.onNode(hasText("Add tab"))
-            .assertIsDisplayed()
-            .performClick()
+        Log.i(TAG, "selectAddTabToCollection: Trying to verify \"Add tab\" menu option is displayed")
+        rule.onNode(hasText("Add tab")).assertIsDisplayed()
+        Log.i(TAG, "selectAddTabToCollection: Verified \"Add tab\" menu option is displayed")
+        Log.i(TAG, "selectAddTabToCollection: Trying to click \"Add tab\" menu option")
+        rule.onNode(hasText("Add tab")).performClick()
         Log.i(TAG, "selectAddTabToCollection: Clicked \"Add tab\" menu option")
 
         mDevice.waitNotNull(Until.findObject(By.text("Select Tabs")))
     }
 
     fun selectDeleteCollection(rule: ComposeTestRule) {
-        rule.onNode(hasText("Delete collection"))
-            .assertIsDisplayed()
-            .performClick()
+        Log.i(TAG, "selectDeleteCollection: Trying to verify \"Delete collection\" menu option is displayed")
+        rule.onNode(hasText("Delete collection")).assertIsDisplayed()
+        Log.i(TAG, "selectDeleteCollection: Verified \"Delete collection\" menu option is displayed")
+        Log.i(TAG, "selectDeleteCollection: Trying to click \"Delete collection\" menu option")
+        rule.onNode(hasText("Delete collection")).performClick()
         Log.i(TAG, "selectDeleteCollection: Clicked \"Delete collection\" menu option")
     }
 
@@ -149,27 +173,33 @@ class CollectionRobot {
         assertUIObjectExists(removeTabFromCollectionButton(title), exists = visible)
 
     fun removeTabFromCollection(title: String) {
+        Log.i(TAG, "removeTabFromCollection: Trying to click remove button for tab: $title")
         removeTabFromCollectionButton(title).click()
         Log.i(TAG, "removeTabFromCollection: Clicked remove button for tab: $title")
     }
 
     fun swipeTabLeft(title: String, rule: ComposeTestRule) {
+        Log.i(TAG, "swipeTabLeft: Trying to remove tab: $title using swipe left action")
         rule.onNode(hasText(title), useUnmergedTree = true)
             .performTouchInput { swipeLeft() }
         Log.i(TAG, "swipeTabLeft: Removed tab: $title using swipe left action")
+        Log.i(TAG, "swipeTabLeft: Waiting for rule to be idle")
         rule.waitForIdle()
         Log.i(TAG, "swipeTabLeft: Waited for rule to be idle")
     }
 
     fun swipeTabRight(title: String, rule: ComposeTestRule) {
+        Log.i(TAG, "swipeTabRight: Trying to remove tab: $title using swipe right action")
         rule.onNode(hasText(title), useUnmergedTree = true)
             .performTouchInput { swipeRight() }
         Log.i(TAG, "swipeTabRight: Removed tab: $title using swipe right action")
+        Log.i(TAG, "swipeTabRight: Waiting for rule to be idle")
         rule.waitForIdle()
         Log.i(TAG, "swipeTabRight: Waited for rule to be idle")
     }
 
     fun goBackInCollectionFlow() {
+        Log.i(TAG, "goBackInCollectionFlow: Trying to click collection creation flow back button")
         backButton().click()
         Log.i(TAG, "goBackInCollectionFlow: Clicked collection creation flow back button")
     }
@@ -180,8 +210,9 @@ class CollectionRobot {
             interact: HomeScreenRobot.() -> Unit,
         ): HomeScreenRobot.Transition {
             assertUIObjectExists(itemContainingText(title))
+            Log.i(TAG, "collapseCollection: Trying to click collection $title and wait for $waitingTimeShort ms for a new window")
             itemContainingText(title).clickAndWaitForNewWindow(waitingTimeShort)
-            Log.i(TAG, "collapseCollection: Clicked collection $title")
+            Log.i(TAG, "collapseCollection: Clicked collection $title and waited for $waitingTimeShort ms for a new window")
             assertUIObjectExists(itemWithDescription(getStringResource(R.string.remove_tab_from_collection)), exists = false)
 
             HomeScreenRobot().interact()
@@ -193,9 +224,13 @@ class CollectionRobot {
             name: String,
             interact: BrowserRobot.() -> Unit,
         ): BrowserRobot.Transition {
+            Log.i(TAG, "typeCollectionNameAndSave: Waiting for $waitingTime ms for collection name text field to exist")
             mainMenuEditCollectionNameField().waitForExists(waitingTime)
+            Log.i(TAG, "typeCollectionNameAndSave: Waited for $waitingTime ms for collection name text field to exist")
+            Log.i(TAG, "typeCollectionNameAndSave: Trying to set collection name text field to: $name")
             mainMenuEditCollectionNameField().text = name
             Log.i(TAG, "typeCollectionNameAndSave: Collection name text field set to: $name")
+            Log.i(TAG, "typeCollectionNameAndSave: Trying to press done action button")
             onView(withId(R.id.name_collection_edittext)).perform(pressImeActionButton())
             Log.i(TAG, "typeCollectionNameAndSave: Pressed done action button")
 
@@ -210,7 +245,10 @@ class CollectionRobot {
             title: String,
             interact: BrowserRobot.() -> Unit,
         ): BrowserRobot.Transition {
+            Log.i(TAG, "selectExistingCollection: Waiting for $waitingTime ms for collection with title: $title to exist")
             collectionTitle(title).waitForExists(waitingTime)
+            Log.i(TAG, "selectExistingCollection: Waited for $waitingTime ms for collection with title: $title to exist")
+            Log.i(TAG, "selectExistingCollection: Trying to click collection with title: $title")
             collectionTitle(title).click()
             Log.i(TAG, "selectExistingCollection: Clicked collection with title: $title")
 
@@ -219,7 +257,10 @@ class CollectionRobot {
         }
 
         fun clickShareCollectionButton(interact: ShareOverlayRobot.() -> Unit): ShareOverlayRobot.Transition {
+            Log.i(TAG, "clickShareCollectionButton: Waiting for $waitingTime ms for share collection button to exist")
             shareCollectionButton().waitForExists(waitingTime)
+            Log.i(TAG, "clickShareCollectionButton: Waited for $waitingTime ms for share collection button to exist")
+            Log.i(TAG, "clickShareCollectionButton: Trying to click share collection button")
             shareCollectionButton().click()
             Log.i(TAG, "clickShareCollectionButton: Clicked share collection button")
 

From e36e0e23134ba819ef5fb68650b0c20e9221ead8 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Mon, 5 Feb 2024 12:20:42 +0200
Subject: [PATCH 112/222] Bug 1879072 - Remove redundant assertion functions
 from HomeScreenRobot

---
 .../fenix/ui/robots/HomeScreenRobot.kt        | 212 +++++++-----------
 1 file changed, 85 insertions(+), 127 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
index 5c7bfd4cb..71cff2971 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
@@ -104,14 +104,27 @@ class HomeScreenRobot {
 
     fun verifyHomePrivateBrowsingButton() = assertUIObjectExists(privateBrowsingButton())
     fun verifyHomeMenuButton() = assertUIObjectExists(menuButton)
-    fun verifyTabButton() = assertTabButton()
-    fun verifyCollectionsHeader() = assertCollectionsHeader()
-    fun verifyNoCollectionsText() = assertNoCollectionsText()
+    fun verifyTabButton() =
+        onView(allOf(withId(R.id.tab_button), isDisplayed())).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    fun verifyCollectionsHeader() =
+        onView(allOf(withText("Collections"))).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    fun verifyNoCollectionsText() =
+        onView(
+            withText(
+                containsString(
+                    "Collect the things that matter to you.\n" +
+                        "Group together similar searches, sites, and tabs for quick access later.",
+                ),
+            ),
+        ).check(matches(isDisplayed()))
+
     fun verifyHomeWordmark() {
         homeScreenList().scrollToBeginning(3)
         assertUIObjectExists(homepageWordmark())
     }
-    fun verifyHomeComponent() = assertHomeComponent()
+    fun verifyHomeComponent() =
+        onView(ViewMatchers.withResourceName("sessionControlRecyclerView"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 
     fun verifyTabCounter(numberOfOpenTabs: String) =
         assertUIObjectExists(tabCounter(numberOfOpenTabs))
@@ -218,7 +231,16 @@ class HomeScreenRobot {
     fun verifyExistingTopSitesList() =
         assertUIObjectExists(itemWithResId("$packageName:id/top_sites_list"))
 
-    fun verifyNotExistingTopSitesList(title: String) = assertNotExistingTopSitesList(title)
+    fun verifyNotExistingTopSitesList(title: String) {
+        mDevice.findObject(UiSelector().text(title)).waitUntilGone(waitingTime)
+        assertUIObjectExists(
+            itemWithResIdContainingText(
+                "$packageName:id/top_site_title",
+                title,
+            ),
+            exists = false,
+        )
+    }
     fun verifySponsoredShortcutDoesNotExist(sponsoredShortcutTitle: String, position: Int) =
         assertUIObjectExists(
             itemWithResIdAndIndex("$packageName:id/top_site_item", index = position - 1)
@@ -228,17 +250,60 @@ class HomeScreenRobot {
                 ),
             exists = false,
         )
-    fun verifyNotExistingSponsoredTopSitesList() = assertSponsoredTopSitesNotDisplayed()
+    fun verifyNotExistingSponsoredTopSitesList() =
+        assertUIObjectExists(
+            itemWithResIdContainingText(
+                "$packageName:id/top_site_subtitle",
+                getStringResource(R.string.top_sites_sponsored_label),
+            ),
+            exists = false,
+        )
+
     fun verifyExistingTopSitesTabs(title: String) {
         homeScreenList().scrollIntoView(itemWithResId("$packageName:id/top_sites_list"))
-        assertExistingTopSitesTabs(title)
+        mDevice.findObject(
+            UiSelector()
+                .resourceId("$packageName:id/top_site_title")
+                .textContains(title),
+        ).waitForExists(waitingTime)
+
+        onView(allOf(withId(R.id.top_sites_list)))
+            .check(matches(hasDescendant(withText(title))))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
     }
     fun verifySponsoredShortcutDetails(sponsoredShortcutTitle: String, position: Int) {
-        assertSponsoredShortcutLogoIsDisplayed(position)
-        assertSponsoredShortcutTitle(sponsoredShortcutTitle, position)
-        assertSponsoredSubtitleIsDisplayed(position)
+        assertUIObjectExists(
+            itemWithResIdAndIndex(resourceId = "$packageName:id/top_site_item", index = position - 1)
+                .getChild(
+                    UiSelector()
+                        .resourceId("$packageName:id/favicon_card"),
+                ),
+        )
+        assertUIObjectExists(
+            itemWithResIdAndIndex(resourceId = "$packageName:id/top_site_item", index = position - 1)
+                .getChild(
+                    UiSelector()
+                        .textContains(sponsoredShortcutTitle),
+                ),
+        )
+        assertUIObjectExists(
+            itemWithResIdAndIndex(resourceId = "$packageName:id/top_site_item", index = position - 1)
+                .getChild(
+                    UiSelector()
+                        .resourceId("$packageName:id/top_site_subtitle"),
+                ),
+        )
+    }
+    fun verifyTopSiteContextMenuItems() {
+        mDevice.waitNotNull(
+            findObject(By.text("Open in private tab")),
+            waitingTime,
+        )
+        mDevice.waitNotNull(
+            findObject(By.text("Remove")),
+            waitingTime,
+        )
     }
-    fun verifyTopSiteContextMenuItems() = assertTopSiteContextMenuItems()
 
     fun verifyJumpBackInSectionIsDisplayed() {
         scrollToElementByText(getStringResource(R.string.recent_tabs_header))
@@ -247,13 +312,16 @@ class HomeScreenRobot {
     fun verifyJumpBackInSectionIsNotDisplayed() =
         assertUIObjectExists(itemContainingText(getStringResource(R.string.recent_tabs_header)), exists = false)
     fun verifyJumpBackInItemTitle(testRule: ComposeTestRule, itemTitle: String) =
-        assertJumpBackInItemTitle(testRule, itemTitle)
+        testRule.onNodeWithTag("recent.tab.title", useUnmergedTree = true).assert(hasText(itemTitle))
     fun verifyJumpBackInItemWithUrl(testRule: ComposeTestRule, itemUrl: String) =
-        assertJumpBackInItemWithUrl(testRule, itemUrl)
-    fun verifyJumpBackInShowAllButton() = assertJumpBackInShowAllButton()
-    fun verifyRecentlyVisitedSectionIsDisplayed(exists: Boolean) = assertRecentlyVisitedSectionIsDisplayed(exists)
-    fun verifyRecentBookmarksSectionIsDisplayed(exists: Boolean) = assertRecentBookmarksSectionIsDisplayed(exists)
-    fun verifyPocketSectionIsDisplayed(exists: Boolean) = assertPocketSectionIsDisplayed(exists)
+        testRule.onNodeWithTag("recent.tab.url", useUnmergedTree = true).assert(hasText(itemUrl))
+    fun verifyJumpBackInShowAllButton() = assertUIObjectExists(itemContainingText(getStringResource(R.string.recent_tabs_show_all)))
+    fun verifyRecentlyVisitedSectionIsDisplayed(exists: Boolean) =
+        assertUIObjectExists(itemContainingText(getStringResource(R.string.history_metadata_header_2)), exists = exists)
+    fun verifyRecentBookmarksSectionIsDisplayed(exists: Boolean) =
+        assertUIObjectExists(itemContainingText(getStringResource(R.string.recently_saved_title)), exists = exists)
+    fun verifyPocketSectionIsDisplayed(exists: Boolean) =
+        assertUIObjectExists(itemContainingText(getStringResource(R.string.pocket_stories_header_1)), exists = exists)
 
     fun verifyRecentlyVisitedSearchGroupDisplayed(shouldBeDisplayed: Boolean, searchTerm: String, groupSize: Int) {
         // checks if the search group exists in the Recently visited section
@@ -820,118 +888,8 @@ private fun assertKeyboardVisibility(isExpectedToBeVisible: Boolean) =
             .contains("mInputShown=true"),
     )
 
-private fun assertTabButton() =
-    onView(allOf(withId(R.id.tab_button), isDisplayed()))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-
-private fun assertCollectionsHeader() =
-    onView(allOf(withText("Collections")))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-
-private fun assertNoCollectionsText() =
-    onView(
-        withText(
-            containsString(
-                "Collect the things that matter to you.\n" +
-                    "Group together similar searches, sites, and tabs for quick access later.",
-            ),
-        ),
-    ).check(matches(isDisplayed()))
-
-private fun assertHomeComponent() =
-    onView(ViewMatchers.withResourceName("sessionControlRecyclerView"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-
 private fun threeDotButton() = onView(allOf(withId(R.id.menuButton)))
 
-private fun assertExistingTopSitesTabs(title: String) {
-    mDevice.findObject(
-        UiSelector()
-            .resourceId("$packageName:id/top_site_title")
-            .textContains(title),
-    ).waitForExists(waitingTime)
-
-    onView(allOf(withId(R.id.top_sites_list)))
-        .check(matches(hasDescendant(withText(title))))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertSponsoredShortcutLogoIsDisplayed(position: Int) =
-    assertUIObjectExists(
-        itemWithResIdAndIndex(resourceId = "$packageName:id/top_site_item", index = position - 1)
-            .getChild(
-                UiSelector()
-                    .resourceId("$packageName:id/favicon_card"),
-            ),
-    )
-
-private fun assertSponsoredSubtitleIsDisplayed(position: Int) =
-    assertUIObjectExists(
-        itemWithResIdAndIndex(resourceId = "$packageName:id/top_site_item", index = position - 1)
-            .getChild(
-                UiSelector()
-                    .resourceId("$packageName:id/top_site_subtitle"),
-            ),
-    )
-
-private fun assertSponsoredShortcutTitle(sponsoredShortcutTitle: String, position: Int) =
-    assertUIObjectExists(
-        itemWithResIdAndIndex(resourceId = "$packageName:id/top_site_item", index = position - 1)
-            .getChild(
-                UiSelector()
-                    .textContains(sponsoredShortcutTitle),
-            ),
-    )
-
-private fun assertNotExistingTopSitesList(title: String) {
-    mDevice.findObject(UiSelector().text(title)).waitUntilGone(waitingTime)
-    assertUIObjectExists(
-        itemWithResIdContainingText(
-            "$packageName:id/top_site_title",
-            title,
-        ),
-        exists = false,
-    )
-}
-
-private fun assertSponsoredTopSitesNotDisplayed() =
-    assertUIObjectExists(
-        itemWithResIdContainingText(
-            "$packageName:id/top_site_subtitle",
-            getStringResource(R.string.top_sites_sponsored_label),
-        ),
-        exists = false,
-    )
-
-private fun assertTopSiteContextMenuItems() {
-    mDevice.waitNotNull(
-        findObject(By.text("Open in private tab")),
-        waitingTime,
-    )
-    mDevice.waitNotNull(
-        findObject(By.text("Remove")),
-        waitingTime,
-    )
-}
-
-private fun assertJumpBackInItemTitle(testRule: ComposeTestRule, itemTitle: String) =
-    testRule.onNodeWithTag("recent.tab.title", useUnmergedTree = true).assert(hasText(itemTitle))
-
-private fun assertJumpBackInItemWithUrl(testRule: ComposeTestRule, itemUrl: String) =
-    testRule.onNodeWithTag("recent.tab.url", useUnmergedTree = true).assert(hasText(itemUrl))
-
-private fun assertJumpBackInShowAllButton() =
-    assertUIObjectExists(itemContainingText(getStringResource(R.string.recent_tabs_show_all)))
-
-private fun assertRecentlyVisitedSectionIsDisplayed(exists: Boolean) =
-    assertUIObjectExists(itemContainingText(getStringResource(R.string.history_metadata_header_2)), exists = exists)
-
-private fun assertRecentBookmarksSectionIsDisplayed(exists: Boolean) =
-    assertUIObjectExists(itemContainingText(getStringResource(R.string.recently_saved_title)), exists = exists)
-
-private fun assertPocketSectionIsDisplayed(exists: Boolean) =
-    assertUIObjectExists(itemContainingText(getStringResource(R.string.pocket_stories_header_1)), exists = exists)
-
 private fun saveTabsToCollectionButton() = onView(withId(R.id.add_tabs_to_collections_button))
 
 private fun tabsCounter() = onView(withId(R.id.tab_button))

From ab4a64f3804154c7e6b943b90273e5db12f3a028 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Mon, 5 Feb 2024 12:40:15 +0200
Subject: [PATCH 113/222] Bug 1879072 - Remove unused functions from
 HomeScreenRobot

---
 .../fenix/ui/robots/HomeScreenRobot.kt        | 39 -------------------
 1 file changed, 39 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
index 71cff2971..3364da18d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
@@ -48,7 +48,6 @@ import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.containsString
 import org.hamcrest.CoreMatchers.instanceOf
 import org.hamcrest.Matchers
-import org.junit.Assert
 import org.junit.Assert.assertTrue
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.Constants.LISTS_MAXSWIPES
@@ -99,9 +98,6 @@ class HomeScreenRobot {
     fun verifyHomeScreenAppBarItems() =
         assertUIObjectExists(homeScreen(), privateBrowsingButton(), homepageWordmark())
 
-    fun verifyNavigationToolbarItems(numberOfOpenTabs: String = "0") =
-        assertUIObjectExists(navigationToolbar(), menuButton, tabCounter(numberOfOpenTabs))
-
     fun verifyHomePrivateBrowsingButton() = assertUIObjectExists(privateBrowsingButton())
     fun verifyHomeMenuButton() = assertUIObjectExists(menuButton)
     fun verifyTabButton() =
@@ -320,8 +316,6 @@ class HomeScreenRobot {
         assertUIObjectExists(itemContainingText(getStringResource(R.string.history_metadata_header_2)), exists = exists)
     fun verifyRecentBookmarksSectionIsDisplayed(exists: Boolean) =
         assertUIObjectExists(itemContainingText(getStringResource(R.string.recently_saved_title)), exists = exists)
-    fun verifyPocketSectionIsDisplayed(exists: Boolean) =
-        assertUIObjectExists(itemContainingText(getStringResource(R.string.pocket_stories_header_1)), exists = exists)
 
     fun verifyRecentlyVisitedSearchGroupDisplayed(shouldBeDisplayed: Boolean, searchTerm: String, groupSize: Int) {
         // checks if the search group exists in the Recently visited section
@@ -353,13 +347,6 @@ class HomeScreenRobot {
             .perform(click())
     }
 
-    fun swipeToBottom() = onView(withId(R.id.homeLayout)).perform(ViewActions.swipeUp())
-
-    fun swipeToTop() =
-        onView(withId(R.id.sessionControlRecyclerView)).perform(ViewActions.swipeDown())
-
-    fun clickFirefoxLogo() = homepageWordmark().click()
-
     fun verifyThoughtProvokingStories(enabled: Boolean) {
         if (enabled) {
             scrollToElementByText(getStringResource(R.string.pocket_stories_header_1))
@@ -789,18 +776,6 @@ class HomeScreenRobot {
             return ComposeTabDrawerRobot.Transition(composeTestRule)
         }
 
-        fun clickJumpBackInItemWithTitle(itemTitle: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            mDevice
-                .findObject(
-                    UiSelector()
-                        .resourceId("recent.tab.title")
-                        .textContains(itemTitle),
-                ).clickAndWaitForNewWindow(waitingTime)
-
-            BrowserRobot().interact()
-            return BrowserRobot.Transition()
-        }
-
         fun clickPocketStoryItem(publisher: String, position: Int, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
             mDevice.findObject(
                 UiSelector()
@@ -880,14 +855,6 @@ private fun homeScreenList() =
             .scrollable(true),
     ).setAsVerticalList()
 
-private fun assertKeyboardVisibility(isExpectedToBeVisible: Boolean) =
-    Assert.assertEquals(
-        isExpectedToBeVisible,
-        mDevice
-            .executeShellCommand("dumpsys input_method | grep mInputShown")
-            .contains("mInputShown=true"),
-    )
-
 private fun threeDotButton() = onView(allOf(withId(R.id.menuButton)))
 
 private fun saveTabsToCollectionButton() = onView(withId(R.id.add_tabs_to_collections_button))
@@ -934,12 +901,6 @@ val deleteFromHistory =
         ),
     ).inRoot(RootMatchers.isPlatformPopup())
 
-private val recentlyVisitedList =
-    UiScrollable(
-        UiSelector()
-            .className("android.widget.HorizontalScrollView"),
-    ).setAsHorizontalList()
-
 private val sponsoredShortcutsSettingsButton =
     mDevice
         .findObject(

From fa93a4ba3aea1900657aaef869ec9d685fa4bda4 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Mon, 5 Feb 2024 12:50:51 +0200
Subject: [PATCH 114/222] Bug 1879072 - Convert private variables to functions
 so they don't get initialized

---
 .../fenix/ui/robots/HomeScreenRobot.kt        | 49 +++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
index 3364da18d..e47f9ef46 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
@@ -79,19 +79,20 @@ import org.mozilla.fenix.tabstray.TabsTrayTestTag
  * Implementation of Robot Pattern for the home screen menu.
  */
 class HomeScreenRobot {
-    val privateSessionMessage =
-        "$appName clears your search and browsing history from private tabs when you close them" +
-            " or quit the app. While this doesn’t make you anonymous to websites or your internet" +
-            " service provider, it makes it easier to keep what you do online private from anyone" +
-            " else who uses this device."
-
     fun verifyNavigationToolbar() = assertUIObjectExists(navigationToolbar())
 
     fun verifyHomeScreen() = assertUIObjectExists(homeScreen())
 
     fun verifyPrivateBrowsingHomeScreenItems() {
         verifyHomeScreenAppBarItems()
-        assertUIObjectExists(itemContainingText(privateSessionMessage))
+        assertUIObjectExists(
+            itemContainingText(
+                "$appName clears your search and browsing history from private tabs when you close them" +
+                    " or quit the app. While this doesn’t make you anonymous to websites or your internet" +
+                    " service provider, it makes it easier to keep what you do online private from anyone" +
+                    " else who uses this device.",
+            ),
+        )
         verifyCommonMythsLink()
     }
 
@@ -99,7 +100,7 @@ class HomeScreenRobot {
         assertUIObjectExists(homeScreen(), privateBrowsingButton(), homepageWordmark())
 
     fun verifyHomePrivateBrowsingButton() = assertUIObjectExists(privateBrowsingButton())
-    fun verifyHomeMenuButton() = assertUIObjectExists(menuButton)
+    fun verifyHomeMenuButton() = assertUIObjectExists(menuButton())
     fun verifyTabButton() =
         onView(allOf(withId(R.id.tab_button), isDisplayed())).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
     fun verifyCollectionsHeader() =
@@ -365,8 +366,7 @@ class HomeScreenRobot {
 
     fun verifyPocketRecommendedStoriesItems() {
         for (position in 0..8) {
-            pocketStoriesList
-                .scrollIntoView(UiSelector().index(position))
+            pocketStoriesList().scrollIntoView(UiSelector().index(position))
             assertUIObjectExists(itemWithIndex(position))
         }
     }
@@ -387,8 +387,7 @@ class HomeScreenRobot {
 //    }
 
     fun verifyDiscoverMoreStoriesButton() {
-        pocketStoriesList
-            .scrollIntoView(UiSelector().text("Discover more"))
+        pocketStoriesList().scrollIntoView(UiSelector().text("Discover more"))
         assertUIObjectExists(itemWithText("Discover more"))
     }
 
@@ -661,7 +660,7 @@ class HomeScreenRobot {
             mDevice.findObject(
                 UiSelector().resourceId("$packageName:id/simple_text"),
             ).waitForExists(waitingTime)
-            deleteFromHistory.click()
+            deleteFromHistory().click()
 
             HomeScreenRobot().interact()
             return Transition()
@@ -677,18 +676,18 @@ class HomeScreenRobot {
         }
 
         fun clickSponsorsAndPrivacyButton(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            sponsorsAndPrivacyButton.waitForExists(waitingTime)
-            sponsorsAndPrivacyButton.clickAndWaitForNewWindow(waitingTime)
+            sponsorsAndPrivacyButton().waitForExists(waitingTime)
+            sponsorsAndPrivacyButton().clickAndWaitForNewWindow(waitingTime)
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun clickSponsoredShortcutsSettingsButton(interact: SettingsSubMenuHomepageRobot.() -> Unit): SettingsSubMenuHomepageRobot.Transition {
-            Log.i(TAG, "clickSponsoredShortcutsSettingsButton: Looking for: ${sponsoredShortcutsSettingsButton.selector}")
-            sponsoredShortcutsSettingsButton.waitForExists(waitingTime)
-            sponsoredShortcutsSettingsButton.clickAndWaitForNewWindow(waitingTime)
-            Log.i(TAG, "clickSponsoredShortcutsSettingsButton: Clicked ${sponsoredShortcutsSettingsButton.selector} and waiting for $waitingTime for a new window")
+            Log.i(TAG, "clickSponsoredShortcutsSettingsButton: Looking for: ${sponsoredShortcutsSettingsButton().selector}")
+            sponsoredShortcutsSettingsButton().waitForExists(waitingTime)
+            sponsoredShortcutsSettingsButton().clickAndWaitForNewWindow(waitingTime)
+            Log.i(TAG, "clickSponsoredShortcutsSettingsButton: Clicked ${sponsoredShortcutsSettingsButton().selector} and waiting for $waitingTime for a new window")
 
             SettingsSubMenuHomepageRobot().interact()
             return SettingsSubMenuHomepageRobot.Transition()
@@ -793,7 +792,7 @@ class HomeScreenRobot {
         }
 
         fun clickPocketDiscoverMoreButton(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            pocketStoriesList
+            pocketStoriesList()
                 .scrollIntoView(UiSelector().text("Discover more"))
 
             mDevice.findObject(UiSelector().text("Discover more")).also {
@@ -888,12 +887,12 @@ private fun homepageWordmark() =
 
 private fun navigationToolbar() =
     itemWithResId("$packageName:id/toolbar")
-private val menuButton =
+private fun menuButton() =
     itemWithResId("$packageName:id/menuButton")
 private fun tabCounter(numberOfOpenTabs: String) =
     itemWithResIdAndText("$packageName:id/counter_text", numberOfOpenTabs)
 
-val deleteFromHistory =
+fun deleteFromHistory() =
     onView(
         allOf(
             withId(R.id.simple_text),
@@ -901,7 +900,7 @@ val deleteFromHistory =
         ),
     ).inRoot(RootMatchers.isPlatformPopup())
 
-private val sponsoredShortcutsSettingsButton =
+private fun sponsoredShortcutsSettingsButton() =
     mDevice
         .findObject(
             UiSelector()
@@ -909,7 +908,7 @@ private val sponsoredShortcutsSettingsButton =
                 .resourceId("$packageName:id/simple_text"),
         )
 
-private val sponsorsAndPrivacyButton =
+private fun sponsorsAndPrivacyButton() =
     mDevice
         .findObject(
             UiSelector()
@@ -917,5 +916,5 @@ private val sponsorsAndPrivacyButton =
                 .resourceId("$packageName:id/simple_text"),
         )
 
-private val pocketStoriesList =
+private fun pocketStoriesList() =
     UiScrollable(UiSelector().resourceId("pocket.stories")).setAsHorizontalList()

From a68320cae81953cc681b9359ba1835722222a641 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Mon, 5 Feb 2024 13:55:33 +0200
Subject: [PATCH 115/222] Bug 1879072 - Add test logs to HomeScreenRobot

---
 .../fenix/ui/robots/HomeScreenRobot.kt        | 277 +++++++++++++++---
 1 file changed, 241 insertions(+), 36 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
index e47f9ef46..62842aa21 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
@@ -101,11 +101,24 @@ class HomeScreenRobot {
 
     fun verifyHomePrivateBrowsingButton() = assertUIObjectExists(privateBrowsingButton())
     fun verifyHomeMenuButton() = assertUIObjectExists(menuButton())
-    fun verifyTabButton() =
-        onView(allOf(withId(R.id.tab_button), isDisplayed())).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-    fun verifyCollectionsHeader() =
+    fun verifyTabButton() {
+        Log.i(TAG, "verifyTabButton: Trying to verify tab counter button is visible")
+        onView(allOf(withId(R.id.tab_button), isDisplayed())).check(
+            matches(
+                withEffectiveVisibility(
+                    Visibility.VISIBLE,
+                ),
+            ),
+        )
+        Log.i(TAG, "verifyTabButton: Verified tab counter button is visible")
+    }
+    fun verifyCollectionsHeader() {
+        Log.i(TAG, "verifyCollectionsHeader: Trying to verify collections header is visible")
         onView(allOf(withText("Collections"))).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-    fun verifyNoCollectionsText() =
+        Log.i(TAG, "verifyCollectionsHeader: Verified collections header is visible")
+    }
+    fun verifyNoCollectionsText() {
+        Log.i(TAG, "verifyNoCollectionsText: Trying to verify empty collections placeholder text is displayed")
         onView(
             withText(
                 containsString(
@@ -114,14 +127,21 @@ class HomeScreenRobot {
                 ),
             ),
         ).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyNoCollectionsText: Verified empty collections placeholder text is displayed")
+    }
 
     fun verifyHomeWordmark() {
+        Log.i(TAG, "verifyHomeWordmark: Trying to scroll 3x to the beginning of the home screen")
         homeScreenList().scrollToBeginning(3)
+        Log.i(TAG, "verifyHomeWordmark: Scrolled 3x to the beginning of the home screen")
         assertUIObjectExists(homepageWordmark())
     }
-    fun verifyHomeComponent() =
+    fun verifyHomeComponent() {
+        Log.i(TAG, "verifyHomeComponent: Trying to verify home screen view is visible")
         onView(ViewMatchers.withResourceName("sessionControlRecyclerView"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyHomeComponent: Verified home screen view is visible")
+    }
 
     fun verifyTabCounter(numberOfOpenTabs: String) =
         assertUIObjectExists(tabCounter(numberOfOpenTabs))
@@ -132,95 +152,130 @@ class HomeScreenRobot {
     // Upgrading users onboarding dialog
     fun verifyUpgradingUserOnboardingFirstScreen(testRule: ComposeTestRule) {
         testRule.also {
+            Log.i(TAG, "verifyUpgradingUserOnboardingFirstScreen: Trying to verify that the upgrading user first onboarding screen title is displayed")
             it.onNodeWithText(getStringResource(R.string.onboarding_home_welcome_title_2))
                 .assertIsDisplayed()
-
+            Log.i(TAG, "verifyUpgradingUserOnboardingFirstScreen: Verified that the upgrading user first onboarding screen title is displayed")
+            Log.i(TAG, "verifyUpgradingUserOnboardingFirstScreen: Trying to verify that the upgrading user first onboarding screen description is displayed")
             it.onNodeWithText(getStringResource(R.string.onboarding_home_welcome_description))
                 .assertIsDisplayed()
-
+            Log.i(TAG, "verifyUpgradingUserOnboardingFirstScreen: Verified that the upgrading user first onboarding screen description is displayed")
+            Log.i(TAG, "verifyUpgradingUserOnboardingFirstScreen: Trying to verify that the upgrading user first onboarding \"Get started\" button is displayed")
             it.onNodeWithText(getStringResource(R.string.onboarding_home_get_started_button))
                 .assertIsDisplayed()
+            Log.i(TAG, "verifyUpgradingUserOnboardingFirstScreen: Verified that the upgrading user first onboarding  \"Get started\" button is displayed")
         }
     }
 
     fun verifyFirstOnboardingCard(composeTestRule: ComposeTestRule) {
         composeTestRule.also {
+            Log.i(TAG, "verifyFirstOnboardingCard: Trying to verify that the first onboarding screen title exists")
             it.onNodeWithText(
                 getStringResource(R.string.juno_onboarding_default_browser_title_nimbus_2),
             ).assertExists()
-
+            Log.i(TAG, "verifyFirstOnboardingCard: Verified that the first onboarding screen title exists")
+            Log.i(TAG, "verifyFirstOnboardingCard: Trying to verify that the first onboarding screen description exists")
             it.onNodeWithText(
                 getStringResource(R.string.juno_onboarding_default_browser_description_nimbus_3),
             ).assertExists()
-
+            Log.i(TAG, "verifyFirstOnboardingCard: Verified that the first onboarding screen description exists")
+            Log.i(TAG, "verifyFirstOnboardingCard: Trying to verify that the first onboarding \"Set as default browser\" button exists")
             it.onNodeWithText(
                 getStringResource(R.string.juno_onboarding_default_browser_positive_button),
             ).assertExists()
-
+            Log.i(TAG, "verifyFirstOnboardingCard: Verified that the first onboarding \"Set as default browser\" button exists")
+            Log.i(TAG, "verifyFirstOnboardingCard: Trying to verify that the first onboarding \"Not now\" button exists")
             it.onNodeWithText(
                 getStringResource(R.string.juno_onboarding_default_browser_negative_button),
             ).assertExists()
+            Log.i(TAG, "verifyFirstOnboardingCard: Verified that the first onboarding \"Not now\" button exists")
         }
     }
 
     fun verifySecondOnboardingCard(composeTestRule: ComposeTestRule) {
         composeTestRule.also {
+            Log.i(TAG, "verifySecondOnboardingCard: Trying to verify that the second onboarding screen title exists")
             it.onNodeWithText(
                 getStringResource(R.string.juno_onboarding_sign_in_title_2),
             ).assertExists()
-
+            Log.i(TAG, "verifySecondOnboardingCard: Verified that the second onboarding screen title exists")
+            Log.i(TAG, "verifySecondOnboardingCard: Trying to verify that the  second onboarding screen description exists")
             it.onNodeWithText(
                 getStringResource(R.string.juno_onboarding_sign_in_description_2),
             ).assertExists()
-
+            Log.i(TAG, "verifySecondOnboardingCard: Verified that the second onboarding screen description exists")
+            Log.i(TAG, "verifySecondOnboardingCard: Trying to verify that the first onboarding \"Sign in\" button exists")
             it.onNodeWithText(
                 getStringResource(R.string.juno_onboarding_sign_in_positive_button),
             ).assertExists()
-
+            Log.i(TAG, "verifySecondOnboardingCard: Verified that the first onboarding \"Sign in\" button exists")
+            Log.i(TAG, "verifySecondOnboardingCard: Trying to verify that the first onboarding \"Not now\" button exists")
             it.onNodeWithText(
                 getStringResource(R.string.juno_onboarding_sign_in_negative_button),
             ).assertExists()
+            Log.i(TAG, "verifySecondOnboardingCard: Verified that the first onboarding \"Not now\" button exists")
         }
     }
 
-    fun clickNotNowOnboardingButton(composeTestRule: ComposeTestRule) =
+    fun clickNotNowOnboardingButton(composeTestRule: ComposeTestRule) {
+        Log.i(TAG, "clickNotNowOnboardingButton: Trying to click \"Not now\" onboarding button")
         composeTestRule.onNodeWithText(
             getStringResource(R.string.juno_onboarding_default_browser_negative_button),
         ).performClick()
+        Log.i(TAG, "clickNotNowOnboardingButton: Clicked \"Not now\" onboarding button")
+    }
 
-    fun swipeSecondOnboardingCardToRight() =
+    fun swipeSecondOnboardingCardToRight() {
+        Log.i(TAG, "swipeSecondOnboardingCardToRight: Trying to perform swipe right action on second onboarding card")
         mDevice.findObject(
             UiSelector().textContains(
                 getStringResource(R.string.juno_onboarding_sign_in_title_2),
             ),
         ).swipeRight(3)
+        Log.i(TAG, "swipeSecondOnboardingCardToRight: Performed swipe right action on second onboarding card")
+    }
 
-    fun clickGetStartedButton(testRule: ComposeTestRule) =
-        testRule.onNodeWithText(getStringResource(R.string.onboarding_home_get_started_button)).performClick()
+    fun clickGetStartedButton(testRule: ComposeTestRule) {
+        Log.i(TAG, "clickGetStartedButton: Trying to click \"Get started\" onboarding button")
+        testRule.onNodeWithText(getStringResource(R.string.onboarding_home_get_started_button))
+            .performClick()
+        Log.i(TAG, "clickGetStartedButton: Clicked \"Get started\" onboarding button")
+    }
 
-    fun clickCloseButton(testRule: ComposeTestRule) =
+    fun clickCloseButton(testRule: ComposeTestRule) {
+        Log.i(TAG, "clickCloseButton: Trying to click close onboarding button")
         testRule.onNode(hasContentDescription("Close")).performClick()
+        Log.i(TAG, "clickCloseButton: Clicked close onboarding button")
+    }
 
     fun verifyUpgradingUserOnboardingSecondScreen(testRule: ComposeTestRule) {
         testRule.also {
+            Log.i(TAG, "verifyUpgradingUserOnboardingSecondScreen: Trying to verify that the upgrading user second onboarding screen title is displayed")
             it.onNodeWithText(getStringResource(R.string.onboarding_home_sync_title_3))
                 .assertIsDisplayed()
-
+            Log.i(TAG, "verifyUpgradingUserOnboardingSecondScreen: Verified that the upgrading user second onboarding screen title is displayed")
+            Log.i(TAG, "verifyUpgradingUserOnboardingSecondScreen: Trying to verify that the upgrading user second onboarding screen description is displayed")
             it.onNodeWithText(getStringResource(R.string.onboarding_home_sync_description))
                 .assertIsDisplayed()
-
+            Log.i(TAG, "verifyUpgradingUserOnboardingSecondScreen: Verified that the upgrading user second onboarding screen description is displayed")
+            Log.i(TAG, "verifyUpgradingUserOnboardingSecondScreen: Trying to verify that the upgrading user second onboarding \"Sign in\" button is displayed")
             it.onNodeWithText(getStringResource(R.string.onboarding_home_sign_in_button))
                 .assertIsDisplayed()
-
+            Log.i(TAG, "verifyUpgradingUserOnboardingSecondScreen: Verified that the upgrading user second onboarding \"Sign in\" button is displayed")
+            Log.i(TAG, "verifyUpgradingUserOnboardingSecondScreen: Trying to that the verify upgrading user second onboarding \"Skip\" button is displayed")
             it.onNodeWithText(getStringResource(R.string.onboarding_home_skip_button))
                 .assertIsDisplayed()
+            Log.i(TAG, "verifyUpgradingUserOnboardingSecondScreen: Verified that the upgrading user second onboarding \"Skip\" button is displayed")
         }
     }
 
-    fun clickSkipButton(testRule: ComposeTestRule) =
+    fun clickSkipButton(testRule: ComposeTestRule) {
+        Log.i(TAG, "clickSkipButton: Trying to click \"Skip\" onboarding button")
         testRule
             .onNodeWithText(getStringResource(R.string.onboarding_home_skip_button))
             .performClick()
+        Log.i(TAG, "clickSkipButton: Clicked \"Skip\" onboarding button")
+    }
 
     fun verifyCommonMythsLink() =
         assertUIObjectExists(itemContainingText(getStringResource(R.string.private_browsing_common_myths)))
@@ -229,7 +284,9 @@ class HomeScreenRobot {
         assertUIObjectExists(itemWithResId("$packageName:id/top_sites_list"))
 
     fun verifyNotExistingTopSitesList(title: String) {
+        Log.i(TAG, "verifyNotExistingTopSitesList: Waiting for $waitingTime ms for top site: $title to be gone")
         mDevice.findObject(UiSelector().text(title)).waitUntilGone(waitingTime)
+        Log.i(TAG, "verifyNotExistingTopSitesList: Waited for $waitingTime ms for top site: $title to be gone")
         assertUIObjectExists(
             itemWithResIdContainingText(
                 "$packageName:id/top_site_title",
@@ -257,16 +314,21 @@ class HomeScreenRobot {
         )
 
     fun verifyExistingTopSitesTabs(title: String) {
+        Log.i(TAG, "verifyExistingTopSitesTabs: Trying to scroll into view the top sites list")
         homeScreenList().scrollIntoView(itemWithResId("$packageName:id/top_sites_list"))
+        Log.i(TAG, "verifyExistingTopSitesTabs: Scrolled into view the top sites list")
+        Log.i(TAG, "verifyExistingTopSitesTabs: Waiting for $waitingTime ms for top site: $title to exist")
         mDevice.findObject(
             UiSelector()
                 .resourceId("$packageName:id/top_site_title")
                 .textContains(title),
         ).waitForExists(waitingTime)
-
+        Log.i(TAG, "verifyExistingTopSitesTabs: Waited for $waitingTime ms for top site: $title to exist")
+        Log.i(TAG, "verifyExistingTopSitesTabs: Trying to verify top site: $title is visible")
         onView(allOf(withId(R.id.top_sites_list)))
             .check(matches(hasDescendant(withText(title))))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyExistingTopSitesTabs: Verified top site: $title is visible")
     }
     fun verifySponsoredShortcutDetails(sponsoredShortcutTitle: String, position: Int) {
         assertUIObjectExists(
@@ -308,10 +370,17 @@ class HomeScreenRobot {
     }
     fun verifyJumpBackInSectionIsNotDisplayed() =
         assertUIObjectExists(itemContainingText(getStringResource(R.string.recent_tabs_header)), exists = false)
-    fun verifyJumpBackInItemTitle(testRule: ComposeTestRule, itemTitle: String) =
-        testRule.onNodeWithTag("recent.tab.title", useUnmergedTree = true).assert(hasText(itemTitle))
-    fun verifyJumpBackInItemWithUrl(testRule: ComposeTestRule, itemUrl: String) =
+    fun verifyJumpBackInItemTitle(testRule: ComposeTestRule, itemTitle: String) {
+        Log.i(TAG, "verifyJumpBackInItemTitle: Trying to verify jump back in item with title: $itemTitle")
+        testRule.onNodeWithTag("recent.tab.title", useUnmergedTree = true)
+            .assert(hasText(itemTitle))
+        Log.i(TAG, "verifyJumpBackInItemTitle: Verified jump back in item with title: $itemTitle")
+    }
+    fun verifyJumpBackInItemWithUrl(testRule: ComposeTestRule, itemUrl: String) {
+        Log.i(TAG, "verifyJumpBackInItemWithUrl: Trying to verify jump back in item with URL: $itemUrl")
         testRule.onNodeWithTag("recent.tab.url", useUnmergedTree = true).assert(hasText(itemUrl))
+        Log.i(TAG, "verifyJumpBackInItemWithUrl: Verified jump back in item with URL: $itemUrl")
+    }
     fun verifyJumpBackInShowAllButton() = assertUIObjectExists(itemContainingText(getStringResource(R.string.recent_tabs_show_all)))
     fun verifyRecentlyVisitedSectionIsDisplayed(exists: Boolean) =
         assertUIObjectExists(itemContainingText(getStringResource(R.string.history_metadata_header_2)), exists = exists)
@@ -344,8 +413,10 @@ class HomeScreenRobot {
     }
 
     fun togglePrivateBrowsingModeOnOff() {
+        Log.i(TAG, "togglePrivateBrowsingModeOnOff: Trying to click private browsing home screen button")
         onView(ViewMatchers.withResourceName("privateBrowsingButton"))
             .perform(click())
+        Log.i(TAG, "togglePrivateBrowsingModeOnOff: Clicked private browsing home screen button")
     }
 
     fun verifyThoughtProvokingStories(enabled: Boolean) {
@@ -353,20 +424,26 @@ class HomeScreenRobot {
             scrollToElementByText(getStringResource(R.string.pocket_stories_header_1))
             assertUIObjectExists(itemContainingText(getStringResource(R.string.pocket_stories_header_1)))
         } else {
+            Log.i(TAG, "verifyThoughtProvokingStories: Trying to perform ${LISTS_MAXSWIPES}x a scroll action to the end of the home screen")
             homeScreenList().scrollToEnd(LISTS_MAXSWIPES)
+            Log.i(TAG, "verifyThoughtProvokingStories: Performed ${LISTS_MAXSWIPES}x a scroll action to the end of the home screen")
             assertUIObjectExists(itemContainingText(getStringResource(R.string.pocket_stories_header_1)), exists = false)
         }
     }
 
     fun scrollToPocketProvokingStories() {
+        Log.i(TAG, "scrollToPocketProvokingStories: Trying to scroll into view the featured pocket stories")
         homeScreenList().scrollIntoView(
             mDevice.findObject(UiSelector().resourceId("pocket.recommended.story").index(2)),
         )
+        Log.i(TAG, "scrollToPocketProvokingStories: Scrolled into view the featured pocket stories")
     }
 
     fun verifyPocketRecommendedStoriesItems() {
         for (position in 0..8) {
+            Log.i(TAG, "verifyPocketRecommendedStoriesItems: Trying to scroll into view the featured pocket story from position: $position")
             pocketStoriesList().scrollIntoView(UiSelector().index(position))
+            Log.i(TAG, "verifyPocketRecommendedStoriesItems: Scrolled into view the featured pocket story from position: $position")
             assertUIObjectExists(itemWithIndex(position))
         }
     }
@@ -387,7 +464,9 @@ class HomeScreenRobot {
 //    }
 
     fun verifyDiscoverMoreStoriesButton() {
+        Log.i(TAG, "verifyDiscoverMoreStoriesButton: Trying to scroll into view the Pocket \"Discover more\" button")
         pocketStoriesList().scrollIntoView(UiSelector().text("Discover more"))
+        Log.i(TAG, "verifyDiscoverMoreStoriesButton: Scrolled into view the Pocket \"Discover more\" button")
         assertUIObjectExists(itemWithText("Discover more"))
     }
 
@@ -396,33 +475,54 @@ class HomeScreenRobot {
             scrollToElementByText(getStringResource(R.string.pocket_stories_categories_header))
             assertUIObjectExists(itemContainingText(getStringResource(R.string.pocket_stories_categories_header)))
         } else {
+            Log.i(TAG, "verifyStoriesByTopic: Trying to perform ${LISTS_MAXSWIPES}x a scroll action to the end of the home screen")
             homeScreenList().scrollToEnd(LISTS_MAXSWIPES)
+            Log.i(TAG, "verifyStoriesByTopic: Performed ${LISTS_MAXSWIPES}x a scroll action to the end of the home screen")
             assertUIObjectExists(itemContainingText(getStringResource(R.string.pocket_stories_categories_header)), exists = false)
         }
     }
 
     fun verifyStoriesByTopicItems() {
+        Log.i(TAG, "verifyStoriesByTopicItems: Trying to scroll into view the stories by topic home screen section")
         homeScreenList().scrollIntoView(UiSelector().resourceId("pocket.categories"))
+        Log.i(TAG, "verifyStoriesByTopicItems: Scrolled into view the stories by topic home screen section")
+        Log.i(TAG, "verifyStoriesByTopicItems: Trying to verify that there are more than 1 \"Stories by topic\" categories")
         assertTrue(mDevice.findObject(UiSelector().resourceId("pocket.categories")).childCount > 1)
+        Log.i(TAG, "verifyStoriesByTopicItems: Verified that there are more than 1 \"Stories by topic\" categories")
     }
 
     fun verifyStoriesByTopicItemState(composeTestRule: ComposeTestRule, isSelected: Boolean, position: Int) {
+        Log.i(TAG, "verifyStoriesByTopicItemState: Trying to scroll into view \"Powered By Pocket\" home screen section")
         homeScreenList().scrollIntoView(mDevice.findObject(UiSelector().resourceId("pocket.header")))
+        Log.i(TAG, "verifyStoriesByTopicItemState: Scrolled into view \"Powered By Pocket\" home screen section")
 
         if (isSelected) {
+            Log.i(TAG, "verifyStoriesByTopicItemState: Trying verify that the stories by topic home screen section is displayed")
             composeTestRule.onNodeWithTag("pocket.categories").assertIsDisplayed()
+            Log.i(TAG, "verifyStoriesByTopicItemState: Verified that the stories by topic home screen section is displayed")
+            Log.i(TAG, "verifyStoriesByTopicItemState: Trying verify that the stories by topic item at position: $position is selected")
             storyByTopicItem(composeTestRule, position).assertIsSelected()
+            Log.i(TAG, "verifyStoriesByTopicItemState: Verified that the stories by topic item at position: $position is selected")
         } else {
+            Log.i(TAG, "verifyStoriesByTopicItemState: Trying verify that the stories by topic home screen section is displayed")
             composeTestRule.onNodeWithTag("pocket.categories").assertIsDisplayed()
+            Log.i(TAG, "verifyStoriesByTopicItemState: Verified that the stories by topic home screen section is displayed")
+            Log.i(TAG, "verifyStoriesByTopicItemState: Trying to verify that the stories by topic item at position: $position is not selected")
             storyByTopicItem(composeTestRule, position).assertIsNotSelected()
+            Log.i(TAG, "verifyStoriesByTopicItemState: Verified that the stories by topic item at position: $position is not selected")
         }
     }
 
-    fun clickStoriesByTopicItem(composeTestRule: ComposeTestRule, position: Int) =
+    fun clickStoriesByTopicItem(composeTestRule: ComposeTestRule, position: Int) {
+        Log.i(TAG, "clickStoriesByTopicItem: Trying to click stories by topic item from position: $position")
         storyByTopicItem(composeTestRule, position).performClick()
+        Log.i(TAG, "clickStoriesByTopicItem: Clicked stories by topic item from position: $position")
+    }
 
     fun verifyPoweredByPocket() {
+        Log.i(TAG, "verifyPoweredByPocket: Trying to scroll into view \"Powered By Pocket\" home screen section")
         homeScreenList().scrollIntoView(mDevice.findObject(UiSelector().resourceId("pocket.header")))
+        Log.i(TAG, "verifyPoweredByPocket: Scrolled into view \"Powered By Pocket\" home screen section")
         assertUIObjectExists(itemWithResId("pocket.header.title"))
     }
 
@@ -431,16 +531,21 @@ class HomeScreenRobot {
             scrollToElementByText(getStringResource(R.string.browser_menu_customize_home_1))
             assertUIObjectExists(itemContainingText("Customize homepage"))
         } else {
+            Log.i(TAG, "verifyCustomizeHomepageButton: Trying to perform ${LISTS_MAXSWIPES}x a scroll action to the end of the home screen")
             homeScreenList().scrollToEnd(LISTS_MAXSWIPES)
+            Log.i(TAG, "verifyCustomizeHomepageButton: Performed ${LISTS_MAXSWIPES}x a scroll action to the end of the home screen")
             assertUIObjectExists(itemContainingText("Customize homepage"), exists = false)
         }
     }
 
-    fun verifyJumpBackInMessage(composeTestRule: ComposeTestRule) =
+    fun verifyJumpBackInMessage(composeTestRule: ComposeTestRule) {
+        Log.i(TAG, "verifyJumpBackInMessage: Trying to verify jump back in contextual message")
         composeTestRule
             .onNodeWithText(
                 getStringResource(R.string.onboarding_home_screen_jump_back_contextual_hint_2),
             ).assertExists()
+        Log.i(TAG, "verifyJumpBackInMessage: Verified jump back in contextual message")
+    }
 
     fun getProvokingStoryPublisher(position: Int): String {
         val publisher = mDevice.findObject(
@@ -457,6 +562,7 @@ class HomeScreenRobot {
     }
 
     fun verifyToolbarPosition(defaultPosition: Boolean) {
+        Log.i(TAG, "verifyToolbarPosition: Trying to verify toolbar is set to top: $defaultPosition")
         onView(withId(R.id.toolbarLayout))
             .check(
                 if (defaultPosition) {
@@ -465,6 +571,7 @@ class HomeScreenRobot {
                     isCompletelyAbove(withId(R.id.homeAppBar))
                 },
             )
+        Log.i(TAG, "verifyToolbarPosition: Verified toolbar position is set to top: $defaultPosition")
     }
     fun verifyNimbusMessageCard(title: String, text: String, action: String) {
         val textView = UiSelector()
@@ -483,17 +590,22 @@ class HomeScreenRobot {
     }
 
     fun verifyIfInPrivateOrNormalMode(privateBrowsingEnabled: Boolean) {
+        Log.i(TAG, "verifyIfInPrivateOrNormalMode: Trying to verify private browsing mode is enabled")
         assert(isPrivateModeEnabled() == privateBrowsingEnabled)
+        Log.i(TAG, "verifyIfInPrivateOrNormalMode: Verified private browsing mode is enabled: $privateBrowsingEnabled")
     }
 
     class Transition {
 
         fun openTabDrawer(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
+            Log.i(TAG, "openTabDrawer: Waiting for $waitingTime ms for tab counter button to exist")
             mDevice.findObject(
                 UiSelector().descriptionContains("open tab. Tap to switch tabs."),
             ).waitForExists(waitingTime)
-
+            Log.i(TAG, "openTabDrawer: Waited for $waitingTime ms for tab counter button to exist")
+            Log.i(TAG, "openTabDrawer: Trying to click tab counter button")
             tabsCounter().click()
+            Log.i(TAG, "openTabDrawer: Clicked tab counter button")
             mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/tab_layout")))
 
             TabDrawerRobot().interact()
@@ -501,9 +613,15 @@ class HomeScreenRobot {
         }
 
         fun openComposeTabDrawer(composeTestRule: HomeActivityComposeTestRule, interact: ComposeTabDrawerRobot.() -> Unit): ComposeTabDrawerRobot.Transition {
+            Log.i(TAG, "openComposeTabDrawer: Waiting for device to be idle for $waitingTime ms")
             mDevice.waitForIdle(waitingTime)
+            Log.i(TAG, "openComposeTabDrawer: Device was idle for $waitingTime ms")
+            Log.i(TAG, "openComposeTabDrawer: Trying to click tab counter button")
             onView(withId(R.id.tab_button)).click()
+            Log.i(TAG, "openComposeTabDrawer: Clicked tab counter button")
+            Log.i(TAG, "openComposeTabDrawer: Trying to verify the tabs tray exists")
             composeTestRule.onNodeWithTag(TabsTrayTestTag.tabsTray).assertExists()
+            Log.i(TAG, "openComposeTabDrawer: Verified the tabs tray exists")
 
             ComposeTabDrawerRobot(composeTestRule).interact()
             return ComposeTabDrawerRobot.Transition(composeTestRule)
@@ -513,17 +631,18 @@ class HomeScreenRobot {
             // Issue: https://github.com/mozilla-mobile/fenix/issues/21578
             try {
                 Log.i(TAG, "openThreeDotMenu: Try block")
-                Log.i(TAG, "openThreeDotMenu: Looking for main menu button")
                 mDevice.waitNotNull(
                     Until.findObject(By.res("$packageName:id/menuButton")),
                     waitingTime,
                 )
             } catch (e: AssertionError) {
                 Log.i(TAG, "openThreeDotMenu: Catch block")
+                Log.i(TAG, "openThreeDotMenu: Trying to click device back button")
                 mDevice.pressBack()
-                Log.i(TAG, "openThreeDotMenu: Pressed device back button")
+                Log.i(TAG, "openThreeDotMenu: Clicked device back button")
             } finally {
                 Log.i(TAG, "openThreeDotMenu: Finally block")
+                Log.i(TAG, "openThreeDotMenu: Trying to click main menu button")
                 threeDotButton().perform(click())
                 Log.i(TAG, "openThreeDotMenu: Clicked main menu button")
             }
@@ -533,9 +652,15 @@ class HomeScreenRobot {
         }
 
         fun openSearch(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
+            Log.i(TAG, "openSearch: Waiting for $waitingTime ms for the navigation toolbar to exist")
             navigationToolbar().waitForExists(waitingTime)
+            Log.i(TAG, "openSearch: Waited for $waitingTime ms for the navigation toolbar to exist")
+            Log.i(TAG, "openSearch: Trying to click navigation toolbar")
             navigationToolbar().click()
+            Log.i(TAG, "openSearch: Clicked navigation toolbar")
+            Log.i(TAG, "openSearch: Waiting for device to be idle")
             mDevice.waitForIdle()
+            Log.i(TAG, "openSearch: Device was idle")
 
             SearchRobot().interact()
             return SearchRobot.Transition()
@@ -545,7 +670,9 @@ class HomeScreenRobot {
             testRule: ComposeTestRule,
             interact: SyncSignInRobot.() -> Unit,
         ): SyncSignInRobot.Transition {
+            Log.i(TAG, "clickUpgradingUserOnboardingSignInButton: Trying to click the upgrading user onboarding \"Sign in\" button")
             testRule.onNodeWithText("Sign in").performClick()
+            Log.i(TAG, "clickUpgradingUserOnboardingSignInButton: Clicked the upgrading user onboarding \"Sign in\" button")
 
             SyncSignInRobot().interact()
             return SyncSignInRobot.Transition()
@@ -554,26 +681,38 @@ class HomeScreenRobot {
         fun togglePrivateBrowsingMode(switchPBModeOn: Boolean = true) {
             // Switch to private browsing homescreen
             if (switchPBModeOn && !isPrivateModeEnabled()) {
+                Log.i(TAG, "togglePrivateBrowsingMode: Waiting for $waitingTime ms for private browsing button to exist")
                 privateBrowsingButton().waitForExists(waitingTime)
+                Log.i(TAG, "togglePrivateBrowsingMode: Waited for $waitingTime ms for private browsing button to exist")
+                Log.i(TAG, "togglePrivateBrowsingMode: Trying to click private browsing button")
                 privateBrowsingButton().click()
+                Log.i(TAG, "togglePrivateBrowsingMode: Clicked private browsing button")
             }
 
             // Switch to normal browsing homescreen
             if (!switchPBModeOn && isPrivateModeEnabled()) {
+                Log.i(TAG, "togglePrivateBrowsingMode: Waiting for $waitingTime ms for private browsing button to exist")
                 privateBrowsingButton().waitForExists(waitingTime)
+                Log.i(TAG, "togglePrivateBrowsingMode: Waited for $waitingTime ms for private browsing button to exist")
+                Log.i(TAG, "togglePrivateBrowsingMode: Trying to click private browsing button")
+                privateBrowsingButton().click()
                 privateBrowsingButton().click()
+                Log.i(TAG, "togglePrivateBrowsingMode: Clicked private browsing button")
             }
         }
 
         fun triggerPrivateBrowsingShortcutPrompt(interact: AddToHomeScreenRobot.() -> Unit): AddToHomeScreenRobot.Transition {
             // Loop to press the PB icon for 5 times to display the Add the Private Browsing Shortcut CFR
             for (i in 1..5) {
+                Log.i(TAG, "triggerPrivateBrowsingShortcutPrompt: Waiting for $waitingTime ms for private browsing button to exist")
                 mDevice.findObject(UiSelector().resourceId("$packageName:id/privateBrowsingButton"))
                     .waitForExists(
                         waitingTime,
                     )
-
+                Log.i(TAG, "triggerPrivateBrowsingShortcutPrompt: Waited for $waitingTime ms for private browsing button to exist")
+                Log.i(TAG, "triggerPrivateBrowsingShortcutPrompt: Trying to click private browsing button")
                 privateBrowsingButton().click()
+                Log.i(TAG, "triggerPrivateBrowsingShortcutPrompt: Clicked private browsing button")
             }
 
             AddToHomeScreenRobot().interact()
@@ -581,13 +720,19 @@ class HomeScreenRobot {
         }
 
         fun pressBack() {
+            Log.i(TAG, "pressBack: Trying to click device back button")
             onView(ViewMatchers.isRoot()).perform(ViewActions.pressBack())
+            Log.i(TAG, "pressBack: Clicked device back button")
         }
 
         fun openNavigationToolbar(interact: NavigationToolbarRobot.() -> Unit): NavigationToolbarRobot.Transition {
+            Log.i(TAG, "openNavigationToolbar: Waiting for $waitingTime ms for navigation the toolbar to exist")
             mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))
                 .waitForExists(waitingTime)
+            Log.i(TAG, "openNavigationToolbar: Waited for $waitingTime ms for the navigation toolbar to exist")
+            Log.i(TAG, "openNavigationToolbar: Trying to click the navigation toolbar")
             navigationToolbar().click()
+            Log.i(TAG, "openNavigationToolbar: Clicked the navigation toolbar")
 
             NavigationToolbarRobot().interact()
             return NavigationToolbarRobot.Transition()
@@ -597,20 +742,23 @@ class HomeScreenRobot {
             title: String,
             interact: HomeScreenRobot.() -> Unit,
         ): Transition {
+            Log.i(TAG, "openContextMenuOnTopSitesWithTitle: Trying to long click top site with title: $title")
             onView(withId(R.id.top_sites_list)).perform(
                 actionOnItem<RecyclerView.ViewHolder>(
                     hasDescendant(withText(title)),
                     ViewActions.longClick(),
                 ),
             )
+            Log.i(TAG, "openContextMenuOnTopSitesWithTitle: Long clicked top site with title: $title")
 
             HomeScreenRobot().interact()
             return Transition()
         }
 
         fun openContextMenuOnSponsoredShortcut(sponsoredShortcutTitle: String, interact: HomeScreenRobot.() -> Unit): Transition {
+            Log.i(TAG, "openContextMenuOnSponsoredShortcut: Trying to long click: $sponsoredShortcutTitle sponsored shortcut")
             sponsoredShortcut(sponsoredShortcutTitle).perform(longClick())
-            Log.i(TAG, "openContextMenuOnSponsoredShortcut: Long clicked to open context menu for $sponsoredShortcutTitle sponsored shortcut")
+            Log.i(TAG, "openContextMenuOnSponsoredShortcut: Long clicked: $sponsoredShortcutTitle sponsored shortcut")
 
             HomeScreenRobot().interact()
             return Transition()
@@ -620,86 +768,112 @@ class HomeScreenRobot {
             title: String,
             interact: BrowserRobot.() -> Unit,
         ): BrowserRobot.Transition {
+            Log.i(TAG, "openTopSiteTabWithTitle: Trying to click top site with title $title")
             onView(withId(R.id.top_sites_list)).perform(
                 actionOnItem<RecyclerView.ViewHolder>(hasDescendant(withText(title)), click()),
             )
+            Log.i(TAG, "openTopSiteTabWithTitle:Clicked top site with title $title")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun openSponsoredShortcut(sponsoredShortcutTitle: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "openSponsoredShortcut: Trying to click sponsored top site with title: $sponsoredShortcutTitle")
             sponsoredShortcut(sponsoredShortcutTitle).click()
+            Log.i(TAG, "openSponsoredShortcut: Clicked sponsored top site with title: $sponsoredShortcutTitle")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun renameTopSite(title: String, interact: HomeScreenRobot.() -> Unit): Transition {
+            Log.i(TAG, "renameTopSite: Trying to click context menu \"Rename\" button")
             onView(withText("Rename"))
                 .check((matches(withEffectiveVisibility(Visibility.VISIBLE))))
                 .perform(click())
+            Log.i(TAG, "renameTopSite: Clicked context menu \"Rename\" button")
+            Log.i(TAG, "renameTopSite: Trying to set top site title to: $title")
             onView(Matchers.allOf(withId(R.id.top_site_title), instanceOf(EditText::class.java)))
                 .perform(ViewActions.replaceText(title))
+            Log.i(TAG, "renameTopSite: Set top site title to: $title")
+            Log.i(TAG, "renameTopSite: Trying to click \"Ok\" rename top site dialog button")
             onView(withId(android.R.id.button1)).perform((click()))
+            Log.i(TAG, "renameTopSite: Clicked \"Ok\" rename top site dialog button")
 
             HomeScreenRobot().interact()
             return Transition()
         }
 
         fun removeTopSite(interact: HomeScreenRobot.() -> Unit): Transition {
+            Log.i(TAG, "removeTopSite: Trying to click context menu \"Remove\" button")
             onView(withText("Remove"))
                 .check((matches(withEffectiveVisibility(Visibility.VISIBLE))))
                 .perform(click())
+            Log.i(TAG, "removeTopSite: Clicked context menu \"Remove\" button")
 
             HomeScreenRobot().interact()
             return Transition()
         }
 
         fun deleteTopSiteFromHistory(interact: HomeScreenRobot.() -> Unit): Transition {
+            Log.i(TAG, "deleteTopSiteFromHistory: Waiting for $waitingTime ms for context menu \"Remove from history\" button to exist")
             mDevice.findObject(
                 UiSelector().resourceId("$packageName:id/simple_text"),
             ).waitForExists(waitingTime)
+            Log.i(TAG, "deleteTopSiteFromHistory: Waited for $waitingTime ms for context menu \"Remove from history\" button to exist")
+            Log.i(TAG, "deleteTopSiteFromHistory: Trying to click context menu \"Remove from history\" button")
             deleteFromHistory().click()
+            Log.i(TAG, "deleteTopSiteFromHistory: Clicked context menu \"Remove from history\" button")
 
             HomeScreenRobot().interact()
             return Transition()
         }
 
         fun openTopSiteInPrivateTab(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "openTopSiteInPrivateTab: Trying to click context menu \"Open in private tab\" button")
             onView(withText("Open in private tab"))
                 .check((matches(withEffectiveVisibility(Visibility.VISIBLE))))
                 .perform(click())
+            Log.i(TAG, "openTopSiteInPrivateTab: Clicked context menu \"Open in private tab\" button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun clickSponsorsAndPrivacyButton(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "clickSponsorsAndPrivacyButton: Waiting for $waitingTime ms for context menu \"Our sponsors & your privacy\" button to exist")
             sponsorsAndPrivacyButton().waitForExists(waitingTime)
+            Log.i(TAG, "clickSponsorsAndPrivacyButton: Waited for $waitingTime ms for context menu \"Our sponsors & your privacy\" button to exist")
+            Log.i(TAG, "clickSponsorsAndPrivacyButton: Trying to click \"Our sponsors & your privacy\" context menu button and wait for $waitingTime ms for a new window")
             sponsorsAndPrivacyButton().clickAndWaitForNewWindow(waitingTime)
+            Log.i(TAG, "clickSponsorsAndPrivacyButton: Clicked \"Our sponsors & your privacy\" context menu button and waited for $waitingTime ms for a new window")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun clickSponsoredShortcutsSettingsButton(interact: SettingsSubMenuHomepageRobot.() -> Unit): SettingsSubMenuHomepageRobot.Transition {
-            Log.i(TAG, "clickSponsoredShortcutsSettingsButton: Looking for: ${sponsoredShortcutsSettingsButton().selector}")
+            Log.i(TAG, "clickSponsoredShortcutsSettingsButton: Waiting for $waitingTime ms for context menu \"Settings\" button to exist")
             sponsoredShortcutsSettingsButton().waitForExists(waitingTime)
+            Log.i(TAG, "clickSponsoredShortcutsSettingsButton: Waited for $waitingTime ms for context menu \"Settings\" button to exist")
+            Log.i(TAG, "clickSponsoredShortcutsSettingsButton: Trying to click \"Settings\" context menu button and wait for $waitingTime for a new window")
             sponsoredShortcutsSettingsButton().clickAndWaitForNewWindow(waitingTime)
-            Log.i(TAG, "clickSponsoredShortcutsSettingsButton: Clicked ${sponsoredShortcutsSettingsButton().selector} and waiting for $waitingTime for a new window")
+            Log.i(TAG, "clickSponsoredShortcutsSettingsButton: Clicked \"Settings\" context menu button and waited for $waitingTime for a new window")
 
             SettingsSubMenuHomepageRobot().interact()
             return SettingsSubMenuHomepageRobot.Transition()
         }
 
         fun openCommonMythsLink(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "openCommonMythsLink: Trying to click private browsing home screen common myths link")
             mDevice.findObject(
                 UiSelector()
                     .textContains(
                         getStringResource(R.string.private_browsing_common_myths),
                     ),
             ).also { it.click() }
+            Log.i(TAG, "openCommonMythsLink: Clicked private browsing home screen common myths link")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -707,7 +881,9 @@ class HomeScreenRobot {
 
         fun clickSaveTabsToCollectionButton(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
             scrollToElementByText(getStringResource(R.string.no_collections_description2))
+            Log.i(TAG, "clickSaveTabsToCollectionButton: Trying to click save tabs to collection button")
             saveTabsToCollectionButton().click()
+            Log.i(TAG, "clickSaveTabsToCollectionButton: Clicked save tabs to collection button")
 
             TabDrawerRobot().interact()
             return TabDrawerRobot.Transition()
@@ -715,15 +891,18 @@ class HomeScreenRobot {
 
         fun clickSaveTabsToCollectionButton(composeTestRule: HomeActivityComposeTestRule, interact: ComposeTabDrawerRobot.() -> Unit): ComposeTabDrawerRobot.Transition {
             scrollToElementByText(getStringResource(R.string.no_collections_description2))
+            Log.i(TAG, "clickSaveTabsToCollectionButton: Trying to click save tabs to collection button")
             saveTabsToCollectionButton().click()
-
+            Log.i(TAG, "clickSaveTabsToCollectionButton: Clicked save tabs to collection button")
             ComposeTabDrawerRobot(composeTestRule).interact()
             return ComposeTabDrawerRobot.Transition(composeTestRule)
         }
 
         fun expandCollection(title: String, interact: CollectionRobot.() -> Unit): CollectionRobot.Transition {
             assertUIObjectExists(itemContainingText(title))
+            Log.i(TAG, "expandCollection: Trying to click collection with title: $title and wait for $waitingTimeShort ms for a new window")
             itemContainingText(title).clickAndWaitForNewWindow(waitingTimeShort)
+            Log.i(TAG, "expandCollection: Clicked collection with title: $title and waited for $waitingTimeShort ms for a new window")
             assertUIObjectExists(itemWithDescription(getStringResource(R.string.remove_tab_from_collection)))
 
             CollectionRobot().interact()
@@ -733,49 +912,62 @@ class HomeScreenRobot {
         fun openRecentlyVisitedSearchGroupHistoryList(title: String, interact: HistoryRobot.() -> Unit): HistoryRobot.Transition {
             scrollToElementByText("Recently visited")
             val searchGroup = mDevice.findObject(UiSelector().text(title))
+            Log.i(TAG, "openRecentlyVisitedSearchGroupHistoryList: Waiting for $waitingTimeShort ms for recently visited search group with title: $title to exist")
             searchGroup.waitForExists(waitingTimeShort)
+            Log.i(TAG, "openRecentlyVisitedSearchGroupHistoryList: Waited for $waitingTimeShort ms for recently visited search group with title: $title to exist")
+            Log.i(TAG, "openRecentlyVisitedSearchGroupHistoryList: Trying to click recently visited search group with title: $title")
             searchGroup.click()
+            Log.i(TAG, "openRecentlyVisitedSearchGroupHistoryList: Clicked recently visited search group with title: $title")
 
             HistoryRobot().interact()
             return HistoryRobot.Transition()
         }
 
         fun openCustomizeHomepage(interact: SettingsSubMenuHomepageRobot.() -> Unit): SettingsSubMenuHomepageRobot.Transition {
+            Log.i(TAG, "openCustomizeHomepage: Trying to perform ${LISTS_MAXSWIPES}x a scroll action to the end of the home screen")
             homeScreenList().scrollToEnd(LISTS_MAXSWIPES)
+            Log.i(TAG, "openCustomizeHomepage: Performed ${LISTS_MAXSWIPES}x a scroll action to the end of the home screen")
+            Log.i(TAG, "openCustomizeHomepage: Trying to click \"Customize homepage\" button and wait for $waitingTime ms for a new window")
             mDevice.findObject(
                 UiSelector()
                     .textContains(
                         "Customize homepage",
                     ),
             ).clickAndWaitForNewWindow(waitingTime)
+            Log.i(TAG, "openCustomizeHomepage: Clicked \"Customize homepage\" button and wait for $waitingTime ms for a new window")
 
             SettingsSubMenuHomepageRobot().interact()
             return SettingsSubMenuHomepageRobot.Transition()
         }
 
         fun clickJumpBackInShowAllButton(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
+            Log.i(TAG, "clickJumpBackInShowAllButton: Trying to click \"Show all\" button and wait for $waitingTime ms for a new window")
             mDevice
                 .findObject(
                     UiSelector()
                         .textContains(getStringResource(R.string.recent_tabs_show_all)),
                 ).clickAndWaitForNewWindow(waitingTime)
+            Log.i(TAG, "clickJumpBackInShowAllButton: Clicked \"Show all\" button and wait for $waitingTime ms for a new window")
 
             TabDrawerRobot().interact()
             return TabDrawerRobot.Transition()
         }
 
         fun clickJumpBackInShowAllButton(composeTestRule: HomeActivityComposeTestRule, interact: ComposeTabDrawerRobot.() -> Unit): ComposeTabDrawerRobot.Transition {
+            Log.i(TAG, "clickJumpBackInShowAllButton: Trying to click \"Show all\" button and wait for $waitingTime ms for a new window")
             mDevice
                 .findObject(
                     UiSelector()
                         .textContains(getStringResource(R.string.recent_tabs_show_all)),
                 ).clickAndWaitForNewWindow(waitingTime)
+            Log.i(TAG, "clickJumpBackInShowAllButton: Clicked \"Show all\" button and wait for $waitingTime ms for a new window")
 
             ComposeTabDrawerRobot(composeTestRule).interact()
             return ComposeTabDrawerRobot.Transition(composeTestRule)
         }
 
         fun clickPocketStoryItem(publisher: String, position: Int, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "clickPocketStoryItem: Trying to click pocket story item published by: $publisher at position: $position and wait for $waitingTime ms for a new window")
             mDevice.findObject(
                 UiSelector()
                     .className("android.view.View")
@@ -786,18 +978,25 @@ class HomeScreenRobot {
                     .index(1)
                     .textContains(publisher),
             ).clickAndWaitForNewWindow(waitingTime)
+            Log.i(TAG, "clickPocketStoryItem: Clicked pocket story item published by: $publisher at position: $position and wait for $waitingTime ms for a new window")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun clickPocketDiscoverMoreButton(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "clickPocketDiscoverMoreButton: Trying to scroll into view the \"Discover more\" button")
             pocketStoriesList()
                 .scrollIntoView(UiSelector().text("Discover more"))
+            Log.i(TAG, "clickPocketDiscoverMoreButton: Scrolled into view the \"Discover more\" button")
 
             mDevice.findObject(UiSelector().text("Discover more")).also {
+                Log.i(TAG, "clickPocketDiscoverMoreButton: Waiting for $waitingTime ms for \"Discover more\" button to exist")
                 it.waitForExists(waitingTimeShort)
+                Log.i(TAG, "clickPocketDiscoverMoreButton: Waited for $waitingTime ms for \"Discover more\" button to exist")
+                Log.i(TAG, "clickPocketDiscoverMoreButton: Trying to click \"Discover more\" button")
                 it.click()
+                Log.i(TAG, "clickPocketDiscoverMoreButton: Clicked \"Discover more\" button")
             }
 
             BrowserRobot().interact()
@@ -805,7 +1004,9 @@ class HomeScreenRobot {
         }
 
         fun clickPocketLearnMoreLink(composeTestRule: ComposeTestRule, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "clickPocketLearnMoreLink: Trying to click pocket \"Learn more\" link")
             composeTestRule.onNodeWithTag("pocket.header.subtitle", true).performClick()
+            Log.i(TAG, "clickPocketLearnMoreLink: Clicked pocket \"Learn more\" link")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -815,9 +1016,11 @@ class HomeScreenRobot {
             composeTestRule: ComposeTestRule,
             interact: SettingsRobot.() -> Unit,
         ): SettingsRobot.Transition {
+            Log.i(TAG, "clickSetAsDefaultBrowserOnboardingButton: Trying to click \"Set as default browser\" onboarding button")
             composeTestRule.onNodeWithText(
                 getStringResource(R.string.juno_onboarding_default_browser_positive_button),
             ).performClick()
+            Log.i(TAG, "clickSetAsDefaultBrowserOnboardingButton: Clicked \"Set as default browser\" onboarding button")
 
             SettingsRobot().interact()
             return SettingsRobot.Transition()
@@ -827,9 +1030,11 @@ class HomeScreenRobot {
             composeTestRule: ComposeTestRule,
             interact: SyncSignInRobot.() -> Unit,
         ): SyncSignInRobot.Transition {
+            Log.i(TAG, "clickSignInOnboardingButton: Trying to click \"Sign in\" onboarding button")
             composeTestRule.onNodeWithText(
                 getStringResource(R.string.juno_onboarding_sign_in_positive_button),
             ).performClick()
+            Log.i(TAG, "clickSignInOnboardingButton: Clicked \"Sign in\" onboarding button")
 
             SyncSignInRobot().interact()
             return SyncSignInRobot.Transition()

From 6890d9ecdd872d1e88a67b27085cf52d61ea8905 Mon Sep 17 00:00:00 2001
From: "oana.horvath" <ohorvath@mozilla.com>
Date: Tue, 6 Feb 2024 14:44:20 +0200
Subject: [PATCH 116/222] Bug 1878868 - Create TestSetup helper: Test classes
 A-C

---
 .../org/mozilla/fenix/helpers/TestSetup.kt    | 50 +++++++++++++++++++
 .../mozilla/fenix/ui/AddressAutofillTest.kt   | 22 +-------
 .../org/mozilla/fenix/ui/BookmarksTest.kt     | 33 ++----------
 .../fenix/ui/BrowsingErrorPagesTest.kt        | 23 +--------
 .../org/mozilla/fenix/ui/CollectionTest.kt    | 26 ++--------
 .../org/mozilla/fenix/ui/ContextMenusTest.kt  | 30 ++---------
 .../fenix/ui/CookieBannerBlockerTest.kt       |  3 +-
 .../mozilla/fenix/ui/CrashReportingTest.kt    | 26 ++--------
 .../fenix/ui/CreditCardAutofillTest.kt        | 22 +-------
 .../org/mozilla/fenix/ui/CustomTabsTest.kt    | 30 ++---------
 10 files changed, 74 insertions(+), 191 deletions(-)
 create mode 100644 app/src/androidTest/java/org/mozilla/fenix/helpers/TestSetup.kt

diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestSetup.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestSetup.kt
new file mode 100644
index 000000000..d19f50c3f
--- /dev/null
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestSetup.kt
@@ -0,0 +1,50 @@
+package org.mozilla.fenix.helpers
+
+import android.util.Log
+import kotlinx.coroutines.runBlocking
+import mozilla.appservices.places.BookmarkRoot
+import mozilla.components.browser.storage.sync.PlacesBookmarksStorage
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.Before
+import org.mozilla.fenix.helpers.Constants.TAG
+import org.mozilla.fenix.helpers.TestHelper.appContext
+import org.mozilla.fenix.ui.robots.notificationShade
+
+open class TestSetup {
+    lateinit var mockWebServer: MockWebServer
+    private val bookmarksStorage = PlacesBookmarksStorage(appContext.applicationContext)
+
+    @Before
+    fun setUp() {
+        Log.i(TAG, "TestSetup: Starting the @Before setup")
+        // Clear pre-existing notifications
+        notificationShade {
+            cancelAllShownNotifications()
+        }
+        runBlocking {
+            // Reset locale to EN-US if needed.
+            AppAndSystemHelper.resetSystemLocaleToEnUS()
+            // Check and clear the downloads folder
+            AppAndSystemHelper.clearDownloadsFolder()
+            // Make sure the Wifi and Mobile Data connections are on
+            AppAndSystemHelper.setNetworkEnabled(true)
+            // Clear bookmarks left after a failed test
+            val bookmarks = bookmarksStorage.getTree(BookmarkRoot.Mobile.id)?.children
+            Log.i(TAG, "Before cleanup: Bookmarks storage contains: $bookmarks")
+            bookmarks?.forEach { bookmarksStorage.deleteNode(it.guid) }
+            // TODO: Follow-up with a method to handle the DB update; the logs will still show the bookmarks in the storage before the test starts.
+            Log.i(TAG, "After cleanup: Bookmarks storage contains: $bookmarks")
+        }
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+        }
+        try {
+            Log.i(TAG, "Try starting mockWebServer")
+            mockWebServer.start()
+        } catch (e: Exception) {
+            Log.i(TAG, "Exception caught. Re-starting mockWebServer")
+            mockWebServer.shutdown()
+            mockWebServer.start()
+        }
+    }
+}
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
index 4631b8a7a..b8b675778 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
@@ -4,27 +4,22 @@
 
 package org.mozilla.fenix.ui
 
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.packageName
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.autofillScreen
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
-class AddressAutofillTest {
-    private lateinit var mockWebServer: MockWebServer
-
+class AddressAutofillTest : TestSetup() {
     object FirstAddressAutofillDetails {
         var navigateToAutofillSettings = true
         var isAddressAutofillEnabled = true
@@ -58,19 +53,6 @@ class AddressAutofillTest {
     @get:Rule
     val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
 
-    @Before
-    fun setUp() {
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836845
     @SmokeTest
     @Test
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index 2d2a1fc97..8b7b220ce 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -8,20 +8,13 @@ import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
-import androidx.test.uiautomator.UiDevice
 import kotlinx.coroutines.runBlocking
-import mozilla.appservices.places.BookmarkRoot
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.ext.bookmarkStorage
 import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.registerAndCleanupIdlingResources
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MockBrowserDataHelper.createBookmarkItem
@@ -31,8 +24,10 @@ import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.appContext
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
+import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.restartApp
 import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.bookmarksMenu
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -42,9 +37,7 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
 /**
  *  Tests for verifying basic functionality of bookmarks
  */
-class BookmarksTest {
-    private lateinit var mockWebServer: MockWebServer
-    private lateinit var mDevice: UiDevice
+class BookmarksTest : TestSetup() {
     private val bookmarksFolderName = "New Folder"
     private val testBookmark = object {
         var title: String = "Bookmark title"
@@ -61,26 +54,6 @@ class BookmarksTest {
     @JvmField
     val retryTestRule = RetryTestRule(3)
 
-    @Before
-    fun setUp() {
-        mDevice = UiDevice.getInstance(getInstrumentation())
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-        // Clearing all bookmarks data after each test to avoid overlapping data
-        val bookmarksStorage = activityTestRule.activity?.bookmarkStorage
-        runBlocking {
-            val bookmarks = bookmarksStorage?.getTree(BookmarkRoot.Mobile.id)?.children
-            bookmarks?.forEach { bookmarksStorage.deleteNode(it.guid) }
-        }
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/522919
     @Test
     fun verifyEmptyBookmarksMenuTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt
index de05a516a..608c0e919 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt
@@ -5,20 +5,17 @@
 package org.mozilla.fenix.ui
 
 import androidx.core.net.toUri
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.setNetworkEnabled
 import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.navigationToolbar
@@ -26,13 +23,12 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
 /**
  * Tests that verify errors encountered while browsing websites: unsafe pages, connection errors, etc
  */
-class BrowsingErrorPagesTest {
+class BrowsingErrorPagesTest : TestSetup() {
     private val malwareWarning = getStringResource(R.string.mozac_browser_errorpages_safe_browsing_malware_uri_title)
     private val phishingWarning = getStringResource(R.string.mozac_browser_errorpages_safe_phishing_uri_title)
     private val unwantedSoftwareWarning =
         getStringResource(R.string.mozac_browser_errorpages_safe_browsing_unwanted_uri_title)
     private val harmfulSiteWarning = getStringResource(R.string.mozac_browser_errorpages_safe_harmful_uri_title)
-    private lateinit var mockWebServer: MockWebServer
 
     @get: Rule
     val mActivityTestRule = HomeActivityTestRule.withDefaultSettingsOverrides()
@@ -41,21 +37,6 @@ class BrowsingErrorPagesTest {
     @JvmField
     val retryTestRule = RetryTestRule(3)
 
-    @Before
-    fun setUp() {
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        // Restoring network connection
-        setNetworkEnabled(true)
-        mockWebServer.shutdown()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2326774
     @SmokeTest
     @Test
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
index c917f4d3f..74e7b136c 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
@@ -5,20 +5,16 @@
 package org.mozilla.fenix.ui
 
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.uiautomator.UiDevice
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
+import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.collectionRobot
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -30,9 +26,7 @@ import org.mozilla.fenix.ui.robots.tabDrawer
  *
  */
 
-class CollectionTest {
-    private lateinit var mDevice: UiDevice
-    private lateinit var mockWebServer: MockWebServer
+class CollectionTest : TestSetup() {
     private val firstCollectionName = "testcollection_1"
     private val secondCollectionName = "testcollection_2"
     private val collectionName = "First Collection"
@@ -51,20 +45,6 @@ class CollectionTest {
             ),
         ) { it.activity }
 
-    @Before
-    fun setUp() {
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/353823
     @SmokeTest
     @Test
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
index eeeec68a7..80f2d2a75 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
@@ -5,15 +5,8 @@
 package org.mozilla.fenix.ui
 
 import androidx.core.net.toUri
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.uiautomator.UiDevice
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.assertExternalAppOpens
 import org.mozilla.fenix.helpers.Constants.PackageName.YOUTUBE_APP
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
@@ -22,7 +15,9 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
+import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.clickContextMenuItem
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.downloadRobot
@@ -44,32 +39,15 @@ import org.mozilla.fenix.ui.robots.shareOverlay
  *
  */
 
-class ContextMenusTest {
-    private lateinit var mDevice: UiDevice
-    private lateinit var mockWebServer: MockWebServer
+class ContextMenusTest : TestSetup() {
 
     @get:Rule
-    val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
+    val activityIntentTestRule = HomeActivityIntentTestRule(isJumpBackInCFREnabled = false)
 
     @Rule
     @JvmField
     val retryTestRule = RetryTestRule(3)
 
-    @Before
-    fun setUp() {
-        activityIntentTestRule.activity.applicationContext.settings().shouldShowJumpBackInCFR = false
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/243837
     @Test
     fun verifyOpenLinkNewTabContextMenuOptionTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerBlockerTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerBlockerTest.kt
index 7ff48e390..cc9fff3d1 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerBlockerTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerBlockerTest.kt
@@ -12,13 +12,14 @@ import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.AppAndSystemHelper.runWithCondition
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.TestHelper.appContext
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
 /**
  *  Tests for verifying the new Cookie banner blocker option and functionality.
  */
-class CookieBannerBlockerTest {
+class CookieBannerBlockerTest : TestSetup() {
     @get:Rule
     val activityTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides(skipOnboarding = true)
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
index f246930bd..84083e014 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
@@ -5,29 +5,23 @@
 package org.mozilla.fenix.ui
 
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.uiautomator.UiDevice
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.packageName
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
-class CrashReportingTest {
-    private lateinit var mDevice: UiDevice
-    private lateinit var mockWebServer: MockWebServer
+class CrashReportingTest : TestSetup() {
     private val tabCrashMessage = getStringResource(R.string.tab_crash_title_2)
 
     @get:Rule
@@ -40,20 +34,6 @@ class CrashReportingTest {
         ),
     ) { it.activity }
 
-    @Before
-    fun setUp() {
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/308906
     @Test
     fun closeTabFromCrashedTabReporterTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
index f9eb0891b..9a9b5697b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
@@ -4,13 +4,9 @@
 
 package org.mozilla.fenix.ui
 
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.bringAppToForeground
 import org.mozilla.fenix.helpers.AppAndSystemHelper.putAppToBackground
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
@@ -19,14 +15,13 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.packageName
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 import java.time.LocalDate
 
-class CreditCardAutofillTest {
-    private lateinit var mockWebServer: MockWebServer
-
+class CreditCardAutofillTest : TestSetup() {
     object MockCreditCard1 {
         const val MOCK_CREDIT_CARD_NUMBER = "5555555555554444"
         const val MOCK_LAST_CARD_DIGITS = "4444"
@@ -48,19 +43,6 @@ class CreditCardAutofillTest {
     @get:Rule
     val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
 
-    @Before
-    fun setUp() {
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512792
     @SmokeTest
     @Test
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt
index b014dbb61..1e2aa93e8 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt
@@ -7,25 +7,20 @@
 package org.mozilla.fenix.ui
 
 import androidx.core.net.toUri
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
-import androidx.test.uiautomator.UiDevice
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.IntentReceiverActivity
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.openAppFromExternalLink
 import org.mozilla.fenix.helpers.DataGenerationHelper.createCustomTabIntent
-import org.mozilla.fenix.helpers.FeatureSettingsHelperDelegate
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
+import org.mozilla.fenix.helpers.TestHelper.mDevice
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.customTabScreen
@@ -36,9 +31,7 @@ import org.mozilla.fenix.ui.robots.notificationShade
 import org.mozilla.fenix.ui.robots.openEditURLView
 import org.mozilla.fenix.ui.robots.searchScreen
 
-class CustomTabsTest {
-    private lateinit var mDevice: UiDevice
-    private lateinit var mockWebServer: MockWebServer
+class CustomTabsTest : TestSetup() {
     private val customMenuItem = "TestMenuItem"
     private val customTabActionButton = "CustomActionButton"
 
@@ -58,23 +51,6 @@ class CustomTabsTest {
         false,
     )
 
-    private val featureSettingsHelper = FeatureSettingsHelperDelegate()
-
-    @Before
-    fun setUp() {
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-        featureSettingsHelper.resetAllFeatureFlags()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/249659
     @SmokeTest
     @Test

From 767a0ea036f5c048329971ee40aef2390df5f920 Mon Sep 17 00:00:00 2001
From: Noah Bond <nbond@mozilla.com>
Date: Tue, 6 Feb 2024 15:50:25 -0800
Subject: [PATCH 117/222] Bug 1860778 - Remove increased fab shadow while it's
 pressed

---
 .../org/mozilla/fenix/compose/button/FloatingActionButton.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/compose/button/FloatingActionButton.kt b/app/src/main/java/org/mozilla/fenix/compose/button/FloatingActionButton.kt
index 29ed7f83f..954e40a61 100644
--- a/app/src/main/java/org/mozilla/fenix/compose/button/FloatingActionButton.kt
+++ b/app/src/main/java/org/mozilla/fenix/compose/button/FloatingActionButton.kt
@@ -47,7 +47,10 @@ fun FloatingActionButton(
     modifier: Modifier = Modifier,
     contentDescription: String? = null,
     label: String? = null,
-    elevation: FloatingActionButtonElevation = FloatingActionButtonDefaults.elevation(defaultElevation = 5.dp),
+    elevation: FloatingActionButtonElevation = FloatingActionButtonDefaults.elevation(
+        defaultElevation = 5.dp,
+        pressedElevation = 5.dp,
+    ),
     onClick: () -> Unit,
 ) {
     FloatingActionButton(

From 38d89f7e0f536f87fd031edf4a1e6af38749a2ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 14:05:00 +0000
Subject: [PATCH 118/222] Bump cryptography

Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.6 to 42.0.0.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/41.0.6...42.0.0)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../fenix/syncintegration/Pipfile.lock        | 59 +++++++++++--------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/syncintegration/Pipfile.lock b/app/src/androidTest/java/org/mozilla/fenix/syncintegration/Pipfile.lock
index 3e3d538a0..b42b86bfb 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/syncintegration/Pipfile.lock
+++ b/app/src/androidTest/java/org/mozilla/fenix/syncintegration/Pipfile.lock
@@ -95,7 +95,7 @@
                 "sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956",
                 "sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357"
             ],
-            "markers": "python_version >= '3.8'",
+            "markers": "platform_python_implementation != 'PyPy'",
             "version": "==1.16.0"
         },
         "charset-normalizer": {
@@ -196,33 +196,42 @@
         },
         "cryptography": {
             "hashes": [
-                "sha256:068bc551698c234742c40049e46840843f3d98ad7ce265fd2bd4ec0d11306596",
-                "sha256:0f27acb55a4e77b9be8d550d762b0513ef3fc658cd3eb15110ebbcbd626db12c",
-                "sha256:2132d5865eea673fe6712c2ed5fb4fa49dba10768bb4cc798345748380ee3660",
-                "sha256:3288acccef021e3c3c10d58933f44e8602cf04dba96d9796d70d537bb2f4bbc4",
-                "sha256:35f3f288e83c3f6f10752467c48919a7a94b7d88cc00b0668372a0d2ad4f8ead",
-                "sha256:398ae1fc711b5eb78e977daa3cbf47cec20f2c08c5da129b7a296055fbb22aed",
-                "sha256:422e3e31d63743855e43e5a6fcc8b4acab860f560f9321b0ee6269cc7ed70cc3",
-                "sha256:48783b7e2bef51224020efb61b42704207dde583d7e371ef8fc2a5fb6c0aabc7",
-                "sha256:4d03186af98b1c01a4eda396b137f29e4e3fb0173e30f885e27acec8823c1b09",
-                "sha256:5daeb18e7886a358064a68dbcaf441c036cbdb7da52ae744e7b9207b04d3908c",
-                "sha256:60e746b11b937911dc70d164060d28d273e31853bb359e2b2033c9e93e6f3c43",
-                "sha256:742ae5e9a2310e9dade7932f9576606836ed174da3c7d26bc3d3ab4bd49b9f65",
-                "sha256:7e00fb556bda398b99b0da289ce7053639d33b572847181d6483ad89835115f6",
-                "sha256:85abd057699b98fce40b41737afb234fef05c67e116f6f3650782c10862c43da",
-                "sha256:8efb2af8d4ba9dbc9c9dd8f04d19a7abb5b49eab1f3694e7b5a16a5fc2856f5c",
-                "sha256:ae236bb8760c1e55b7a39b6d4d32d2279bc6c7c8500b7d5a13b6fb9fc97be35b",
-                "sha256:afda76d84b053923c27ede5edc1ed7d53e3c9f475ebaf63c68e69f1403c405a8",
-                "sha256:b27a7fd4229abef715e064269d98a7e2909ebf92eb6912a9603c7e14c181928c",
-                "sha256:b648fe2a45e426aaee684ddca2632f62ec4613ef362f4d681a9a6283d10e079d",
-                "sha256:c5a550dc7a3b50b116323e3d376241829fd326ac47bc195e04eb33a8170902a9",
-                "sha256:da46e2b5df770070412c46f87bac0849b8d685c5f2679771de277a422c7d0b86",
-                "sha256:f39812f70fc5c71a15aa3c97b2bbe213c3f2a460b79bd21c40d033bb34a9bf36",
-                "sha256:ff369dd19e8fe0528b02e8df9f2aeb2479f89b1270d90f96a63500afe9af5cae"
+                "sha256:0a68bfcf57a6887818307600c3c0ebc3f62fbb6ccad2240aa21887cda1f8df1b",
+                "sha256:146e971e92a6dd042214b537a726c9750496128453146ab0ee8971a0299dc9bd",
+                "sha256:14e4b909373bc5bf1095311fa0f7fcabf2d1a160ca13f1e9e467be1ac4cbdf94",
+                "sha256:206aaf42e031b93f86ad60f9f5d9da1b09164f25488238ac1dc488334eb5e221",
+                "sha256:3005166a39b70c8b94455fdbe78d87a444da31ff70de3331cdec2c568cf25b7e",
+                "sha256:324721d93b998cb7367f1e6897370644751e5580ff9b370c0a50dc60a2003513",
+                "sha256:33588310b5c886dfb87dba5f013b8d27df7ffd31dc753775342a1e5ab139e59d",
+                "sha256:35cf6ed4c38f054478a9df14f03c1169bb14bd98f0b1705751079b25e1cb58bc",
+                "sha256:3ca482ea80626048975360c8e62be3ceb0f11803180b73163acd24bf014133a0",
+                "sha256:56ce0c106d5c3fec1038c3cca3d55ac320a5be1b44bf15116732d0bc716979a2",
+                "sha256:5a217bca51f3b91971400890905a9323ad805838ca3fa1e202a01844f485ee87",
+                "sha256:678cfa0d1e72ef41d48993a7be75a76b0725d29b820ff3cfd606a5b2b33fda01",
+                "sha256:69fd009a325cad6fbfd5b04c711a4da563c6c4854fc4c9544bff3088387c77c0",
+                "sha256:6cf9b76d6e93c62114bd19485e5cb003115c134cf9ce91f8ac924c44f8c8c3f4",
+                "sha256:74f18a4c8ca04134d2052a140322002fef535c99cdbc2a6afc18a8024d5c9d5b",
+                "sha256:85f759ed59ffd1d0baad296e72780aa62ff8a71f94dc1ab340386a1207d0ea81",
+                "sha256:87086eae86a700307b544625e3ba11cc600c3c0ef8ab97b0fda0705d6db3d4e3",
+                "sha256:8814722cffcfd1fbd91edd9f3451b88a8f26a5fd41b28c1c9193949d1c689dc4",
+                "sha256:8fedec73d590fd30c4e3f0d0f4bc961aeca8390c72f3eaa1a0874d180e868ddf",
+                "sha256:9515ea7f596c8092fdc9902627e51b23a75daa2c7815ed5aa8cf4f07469212ec",
+                "sha256:988b738f56c665366b1e4bfd9045c3efae89ee366ca3839cd5af53eaa1401bce",
+                "sha256:a2a8d873667e4fd2f34aedab02ba500b824692c6542e017075a2efc38f60a4c0",
+                "sha256:bd7cf7a8d9f34cc67220f1195884151426ce616fdc8285df9054bfa10135925f",
+                "sha256:bdce70e562c69bb089523e75ef1d9625b7417c6297a76ac27b1b8b1eb51b7d0f",
+                "sha256:be14b31eb3a293fc6e6aa2807c8a3224c71426f7c4e3639ccf1a2f3ffd6df8c3",
+                "sha256:be41b0c7366e5549265adf2145135dca107718fa44b6e418dc7499cfff6b4689",
+                "sha256:c310767268d88803b653fffe6d6f2f17bb9d49ffceb8d70aed50ad45ea49ab08",
+                "sha256:c58115384bdcfe9c7f644c72f10f6f42bed7cf59f7b52fe1bf7ae0a622b3a139",
+                "sha256:c640b0ef54138fde761ec99a6c7dc4ce05e80420262c20fa239e694ca371d434",
+                "sha256:ca20550bb590db16223eb9ccc5852335b48b8f597e2f6f0878bbfd9e7314eb17",
+                "sha256:d97aae66b7de41cdf5b12087b5509e4e9805ed6f562406dfcf60e8481a9a28f8",
+                "sha256:e9326ca78111e4c645f7e49cbce4ed2f3f85e17b61a563328c85a5208cf34440"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==41.0.6"
+            "version": "==42.0.0"
         },
         "distro": {
             "hashes": [

From 15d7df99bfabe6c782f85820ee49349eef06fc8e Mon Sep 17 00:00:00 2001
From: Aaron Train <aaron.train@gmail.com>
Date: Wed, 7 Feb 2024 14:15:50 -0500
Subject: [PATCH 119/222] Revert "Bug 1878868 - Create TestSetup helper: Test
 classes A-C"

This reverts commit 56ae080d8374021e87617e53757c244fcca47284.
---
 .../org/mozilla/fenix/helpers/TestSetup.kt    | 50 -------------------
 .../mozilla/fenix/ui/AddressAutofillTest.kt   | 22 +++++++-
 .../org/mozilla/fenix/ui/BookmarksTest.kt     | 33 ++++++++++--
 .../fenix/ui/BrowsingErrorPagesTest.kt        | 23 ++++++++-
 .../org/mozilla/fenix/ui/CollectionTest.kt    | 26 ++++++++--
 .../org/mozilla/fenix/ui/ContextMenusTest.kt  | 30 +++++++++--
 .../fenix/ui/CookieBannerBlockerTest.kt       |  3 +-
 .../mozilla/fenix/ui/CrashReportingTest.kt    | 26 ++++++++--
 .../fenix/ui/CreditCardAutofillTest.kt        | 22 +++++++-
 .../org/mozilla/fenix/ui/CustomTabsTest.kt    | 30 +++++++++--
 10 files changed, 191 insertions(+), 74 deletions(-)
 delete mode 100644 app/src/androidTest/java/org/mozilla/fenix/helpers/TestSetup.kt

diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestSetup.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestSetup.kt
deleted file mode 100644
index d19f50c3f..000000000
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestSetup.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.mozilla.fenix.helpers
-
-import android.util.Log
-import kotlinx.coroutines.runBlocking
-import mozilla.appservices.places.BookmarkRoot
-import mozilla.components.browser.storage.sync.PlacesBookmarksStorage
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.Before
-import org.mozilla.fenix.helpers.Constants.TAG
-import org.mozilla.fenix.helpers.TestHelper.appContext
-import org.mozilla.fenix.ui.robots.notificationShade
-
-open class TestSetup {
-    lateinit var mockWebServer: MockWebServer
-    private val bookmarksStorage = PlacesBookmarksStorage(appContext.applicationContext)
-
-    @Before
-    fun setUp() {
-        Log.i(TAG, "TestSetup: Starting the @Before setup")
-        // Clear pre-existing notifications
-        notificationShade {
-            cancelAllShownNotifications()
-        }
-        runBlocking {
-            // Reset locale to EN-US if needed.
-            AppAndSystemHelper.resetSystemLocaleToEnUS()
-            // Check and clear the downloads folder
-            AppAndSystemHelper.clearDownloadsFolder()
-            // Make sure the Wifi and Mobile Data connections are on
-            AppAndSystemHelper.setNetworkEnabled(true)
-            // Clear bookmarks left after a failed test
-            val bookmarks = bookmarksStorage.getTree(BookmarkRoot.Mobile.id)?.children
-            Log.i(TAG, "Before cleanup: Bookmarks storage contains: $bookmarks")
-            bookmarks?.forEach { bookmarksStorage.deleteNode(it.guid) }
-            // TODO: Follow-up with a method to handle the DB update; the logs will still show the bookmarks in the storage before the test starts.
-            Log.i(TAG, "After cleanup: Bookmarks storage contains: $bookmarks")
-        }
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-        }
-        try {
-            Log.i(TAG, "Try starting mockWebServer")
-            mockWebServer.start()
-        } catch (e: Exception) {
-            Log.i(TAG, "Exception caught. Re-starting mockWebServer")
-            mockWebServer.shutdown()
-            mockWebServer.start()
-        }
-    }
-}
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
index b8b675778..4631b8a7a 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
@@ -4,22 +4,27 @@
 
 package org.mozilla.fenix.ui
 
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.packageName
-import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.autofillScreen
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
-class AddressAutofillTest : TestSetup() {
+class AddressAutofillTest {
+    private lateinit var mockWebServer: MockWebServer
+
     object FirstAddressAutofillDetails {
         var navigateToAutofillSettings = true
         var isAddressAutofillEnabled = true
@@ -53,6 +58,19 @@ class AddressAutofillTest : TestSetup() {
     @get:Rule
     val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
 
+    @Before
+    fun setUp() {
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+    }
+
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836845
     @SmokeTest
     @Test
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index 8b7b220ce..2d2a1fc97 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -8,13 +8,20 @@ import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import androidx.test.uiautomator.UiDevice
 import kotlinx.coroutines.runBlocking
+import mozilla.appservices.places.BookmarkRoot
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
 import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.ext.bookmarkStorage
 import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.registerAndCleanupIdlingResources
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MockBrowserDataHelper.createBookmarkItem
@@ -24,10 +31,8 @@ import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.appContext
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
-import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.restartApp
 import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
-import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.bookmarksMenu
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -37,7 +42,9 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
 /**
  *  Tests for verifying basic functionality of bookmarks
  */
-class BookmarksTest : TestSetup() {
+class BookmarksTest {
+    private lateinit var mockWebServer: MockWebServer
+    private lateinit var mDevice: UiDevice
     private val bookmarksFolderName = "New Folder"
     private val testBookmark = object {
         var title: String = "Bookmark title"
@@ -54,6 +61,26 @@ class BookmarksTest : TestSetup() {
     @JvmField
     val retryTestRule = RetryTestRule(3)
 
+    @Before
+    fun setUp() {
+        mDevice = UiDevice.getInstance(getInstrumentation())
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+        // Clearing all bookmarks data after each test to avoid overlapping data
+        val bookmarksStorage = activityTestRule.activity?.bookmarkStorage
+        runBlocking {
+            val bookmarks = bookmarksStorage?.getTree(BookmarkRoot.Mobile.id)?.children
+            bookmarks?.forEach { bookmarksStorage.deleteNode(it.guid) }
+        }
+    }
+
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/522919
     @Test
     fun verifyEmptyBookmarksMenuTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt
index 608c0e919..de05a516a 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt
@@ -5,17 +5,20 @@
 package org.mozilla.fenix.ui
 
 import androidx.core.net.toUri
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
 import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.setNetworkEnabled
 import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
-import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.navigationToolbar
@@ -23,12 +26,13 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
 /**
  * Tests that verify errors encountered while browsing websites: unsafe pages, connection errors, etc
  */
-class BrowsingErrorPagesTest : TestSetup() {
+class BrowsingErrorPagesTest {
     private val malwareWarning = getStringResource(R.string.mozac_browser_errorpages_safe_browsing_malware_uri_title)
     private val phishingWarning = getStringResource(R.string.mozac_browser_errorpages_safe_phishing_uri_title)
     private val unwantedSoftwareWarning =
         getStringResource(R.string.mozac_browser_errorpages_safe_browsing_unwanted_uri_title)
     private val harmfulSiteWarning = getStringResource(R.string.mozac_browser_errorpages_safe_harmful_uri_title)
+    private lateinit var mockWebServer: MockWebServer
 
     @get: Rule
     val mActivityTestRule = HomeActivityTestRule.withDefaultSettingsOverrides()
@@ -37,6 +41,21 @@ class BrowsingErrorPagesTest : TestSetup() {
     @JvmField
     val retryTestRule = RetryTestRule(3)
 
+    @Before
+    fun setUp() {
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        // Restoring network connection
+        setNetworkEnabled(true)
+        mockWebServer.shutdown()
+    }
+
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2326774
     @SmokeTest
     @Test
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
index 74e7b136c..c917f4d3f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
@@ -5,16 +5,20 @@
 package org.mozilla.fenix.ui
 
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
-import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
-import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.collectionRobot
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -26,7 +30,9 @@ import org.mozilla.fenix.ui.robots.tabDrawer
  *
  */
 
-class CollectionTest : TestSetup() {
+class CollectionTest {
+    private lateinit var mDevice: UiDevice
+    private lateinit var mockWebServer: MockWebServer
     private val firstCollectionName = "testcollection_1"
     private val secondCollectionName = "testcollection_2"
     private val collectionName = "First Collection"
@@ -45,6 +51,20 @@ class CollectionTest : TestSetup() {
             ),
         ) { it.activity }
 
+    @Before
+    fun setUp() {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+    }
+
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/353823
     @SmokeTest
     @Test
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
index 80f2d2a75..eeeec68a7 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
@@ -5,8 +5,15 @@
 package org.mozilla.fenix.ui
 
 import androidx.core.net.toUri
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.assertExternalAppOpens
 import org.mozilla.fenix.helpers.Constants.PackageName.YOUTUBE_APP
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
@@ -15,9 +22,7 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
-import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
-import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.clickContextMenuItem
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.downloadRobot
@@ -39,15 +44,32 @@ import org.mozilla.fenix.ui.robots.shareOverlay
  *
  */
 
-class ContextMenusTest : TestSetup() {
+class ContextMenusTest {
+    private lateinit var mDevice: UiDevice
+    private lateinit var mockWebServer: MockWebServer
 
     @get:Rule
-    val activityIntentTestRule = HomeActivityIntentTestRule(isJumpBackInCFREnabled = false)
+    val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
 
     @Rule
     @JvmField
     val retryTestRule = RetryTestRule(3)
 
+    @Before
+    fun setUp() {
+        activityIntentTestRule.activity.applicationContext.settings().shouldShowJumpBackInCFR = false
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+    }
+
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/243837
     @Test
     fun verifyOpenLinkNewTabContextMenuOptionTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerBlockerTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerBlockerTest.kt
index cc9fff3d1..7ff48e390 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerBlockerTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerBlockerTest.kt
@@ -12,14 +12,13 @@ import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.AppAndSystemHelper.runWithCondition
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.TestHelper.appContext
-import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
 /**
  *  Tests for verifying the new Cookie banner blocker option and functionality.
  */
-class CookieBannerBlockerTest : TestSetup() {
+class CookieBannerBlockerTest {
     @get:Rule
     val activityTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides(skipOnboarding = true)
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
index 84083e014..f246930bd 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
@@ -5,23 +5,29 @@
 package org.mozilla.fenix.ui
 
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
 import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.TestAssetHelper
-import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.packageName
-import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
-class CrashReportingTest : TestSetup() {
+class CrashReportingTest {
+    private lateinit var mDevice: UiDevice
+    private lateinit var mockWebServer: MockWebServer
     private val tabCrashMessage = getStringResource(R.string.tab_crash_title_2)
 
     @get:Rule
@@ -34,6 +40,20 @@ class CrashReportingTest : TestSetup() {
         ),
     ) { it.activity }
 
+    @Before
+    fun setUp() {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+    }
+
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/308906
     @Test
     fun closeTabFromCrashedTabReporterTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
index 9a9b5697b..f9eb0891b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
@@ -4,9 +4,13 @@
 
 package org.mozilla.fenix.ui
 
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.bringAppToForeground
 import org.mozilla.fenix.helpers.AppAndSystemHelper.putAppToBackground
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
@@ -15,13 +19,14 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.packageName
-import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 import java.time.LocalDate
 
-class CreditCardAutofillTest : TestSetup() {
+class CreditCardAutofillTest {
+    private lateinit var mockWebServer: MockWebServer
+
     object MockCreditCard1 {
         const val MOCK_CREDIT_CARD_NUMBER = "5555555555554444"
         const val MOCK_LAST_CARD_DIGITS = "4444"
@@ -43,6 +48,19 @@ class CreditCardAutofillTest : TestSetup() {
     @get:Rule
     val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
 
+    @Before
+    fun setUp() {
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+    }
+
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512792
     @SmokeTest
     @Test
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt
index 1e2aa93e8..b014dbb61 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt
@@ -7,20 +7,25 @@
 package org.mozilla.fenix.ui
 
 import androidx.core.net.toUri
+import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
+import androidx.test.uiautomator.UiDevice
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.IntentReceiverActivity
 import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.openAppFromExternalLink
 import org.mozilla.fenix.helpers.DataGenerationHelper.createCustomTabIntent
+import org.mozilla.fenix.helpers.FeatureSettingsHelperDelegate
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
-import org.mozilla.fenix.helpers.TestHelper.mDevice
-import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.customTabScreen
@@ -31,7 +36,9 @@ import org.mozilla.fenix.ui.robots.notificationShade
 import org.mozilla.fenix.ui.robots.openEditURLView
 import org.mozilla.fenix.ui.robots.searchScreen
 
-class CustomTabsTest : TestSetup() {
+class CustomTabsTest {
+    private lateinit var mDevice: UiDevice
+    private lateinit var mockWebServer: MockWebServer
     private val customMenuItem = "TestMenuItem"
     private val customTabActionButton = "CustomActionButton"
 
@@ -51,6 +58,23 @@ class CustomTabsTest : TestSetup() {
         false,
     )
 
+    private val featureSettingsHelper = FeatureSettingsHelperDelegate()
+
+    @Before
+    fun setUp() {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+        featureSettingsHelper.resetAllFeatureFlags()
+    }
+
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/249659
     @SmokeTest
     @Test

From 5672f64abb9c0840b4c780d8f42b55cf12757c52 Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Mon, 5 Feb 2024 13:53:30 -0500
Subject: [PATCH 120/222] Bug 1832357 - Fallback to loading new window requests
 in custom tab

---
 .../customtabs/ExternalAppBrowserFragment.kt   | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
index be147c039..c2df28f24 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
@@ -5,7 +5,6 @@
 package org.mozilla.fenix.customtabs
 
 import android.content.Context
-import android.content.Intent
 import android.view.View
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.isVisible
@@ -28,7 +27,6 @@ import mozilla.components.feature.pwa.feature.WebAppHideToolbarFeature
 import mozilla.components.feature.pwa.feature.WebAppSiteControlsFeature
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import mozilla.components.support.ktx.android.arch.lifecycle.addObservers
-import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.BaseBrowserFragment
 import org.mozilla.fenix.browser.CustomTabContextMenuCandidate
@@ -80,21 +78,7 @@ class ExternalAppBrowserFragment : BaseBrowserFragment() {
         )
 
         windowFeature.set(
-            feature = CustomTabWindowFeature(
-                activity,
-                components.core.store,
-                customTabSessionId,
-            ) { uri ->
-                val intent =
-                    Intent.parseUri("${BuildConfig.DEEP_LINK_SCHEME}://open?url=$uri", 0)
-                if (intent.action == Intent.ACTION_VIEW) {
-                    intent.addCategory(Intent.CATEGORY_BROWSABLE)
-                    intent.component = null
-                    intent.selector = null
-                    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                }
-                activity.startActivity(intent)
-            },
+            feature = CustomTabWindowFeature(activity, components.core.store, customTabSessionId),
             owner = this,
             view = view,
         )

From 8fbfcc2bce70b8ae7ad4644d9d9ea07972fbbb70 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Thu, 8 Feb 2024 00:03:17 +0000
Subject: [PATCH 121/222] Import translations from android-l10n

---
 app/src/main/res/values-azb/strings.xml    | 97 ++++++++++++++++++++++
 app/src/main/res/values-bg/strings.xml     |  3 +
 app/src/main/res/values-cy/strings.xml     |  3 +
 app/src/main/res/values-de/strings.xml     |  3 +
 app/src/main/res/values-es-rAR/strings.xml |  3 +
 app/src/main/res/values-hsb/strings.xml    |  3 +
 app/src/main/res/values-it/strings.xml     |  3 +
 app/src/main/res/values-iw/strings.xml     |  3 +
 app/src/main/res/values-ko/strings.xml     |  3 +
 app/src/main/res/values-nn-rNO/strings.xml |  6 ++
 app/src/main/res/values-pt-rPT/strings.xml |  3 +
 app/src/main/res/values-ru/strings.xml     |  3 +
 app/src/main/res/values-sl/strings.xml     |  4 +-
 app/src/main/res/values-sv-rSE/strings.xml |  3 +
 14 files changed, 139 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index d3b9fa554..0e3f87e96 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -295,6 +295,8 @@
     <string name="search_scan_button">اسکن</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">آختاریش موتورونون تنظیم‌لری</string>
+    <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
+    <string name="awesomebar_clipboard_title">باغلانتی‌نی کلیپ بورددان آل</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
     <string name="search_suggestions_onboarding_allow_button">ایجازه وئر</string>
     <!-- Button in the search suggestions onboarding that does not allow search suggestions in private sessions -->
@@ -303,9 +305,76 @@
     <string name="search_suggestions_onboarding_title">اؤزل اوتورم‌لاردا آختاریش تکلیف‌لرینه ایجازه وئریلسین؟</string>
 
 
+    <!-- Search suggestion onboarding hint description text, first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="search_suggestions_onboarding_text">%s آدرس چوبوغونا یازدیغینیز هر شئیی وارساییلان آختاریش موتورونوزلا پایلاشاجاق.</string>
     <!-- Search engine suggestion title text. The first parameter is the name of the suggested engine-->
     <string name="search_engine_suggestions_title">%s ایله آختار</string>
 
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">موستقیم آدرس چوبوغوندان آختارین</string>
+    <!-- Menu option in the search selector menu to open the search settings -->
+    <string name="search_settings_menu_item">آختاریش تنظیم‌لری</string>
+    <!-- Header text for the search selector menu -->
+    <string name="search_header_menu_item_2">بو دفعه بوردا آختار:</string>
+
+    <!-- Content description (not visible, for screen readers etc.): Search engine icon. The first parameter is the search engine name (for example: DuckDuckGo). -->
+    <string name="search_engine_icon_content_description" tools:ignore="UnusedResources">%s آختاریش موتورو</string>
+
+    <!-- Home onboarding -->
+    <!-- Onboarding home screen popup dialog, shown on top of the Jump back in section. -->
+    <string name="onboarding_home_screen_jump_back_contextual_hint_2">اؤزللشدیریلمیش آنایارپاق‌نان تانیش اولون. سون تاغلار، بوکمارک‌لار و آختاریش سونوچلاری بورادا گؤرونه‌جک.</string>
+    <!-- Home onboarding dialog welcome screen title text. -->
+    <string name="onboarding_home_welcome_title_2">داها اؤزل اینترنته خوش گلیبسیز</string>
+    <!-- Home onboarding dialog welcome screen description text. -->
+    <string name="onboarding_home_welcome_description">داها رنگلی، داها گیزلی. پول اوچون دئییل، اینسانلیک اوچون.</string>
+    <!-- Home onboarding dialog sign into sync screen title text. -->
+    <string name="onboarding_home_sync_title_3">اکرانلاری دگیشمک همیشه‌دن داها آساندیر</string>
+    <!-- Home onboarding dialog sign into sync screen description text. -->
+    <string name="onboarding_home_sync_description">ایندی آیری جهازلارداکی تاغلارلا، قالدیغینیز یئردن ایدامه وئرین.</string>
+    <!-- Text for the button to continue the onboarding on the home onboarding dialog. -->
+    <string name="onboarding_home_get_started_button">باشلایین</string>
+    <!-- Text for the button to navigate to the sync sign in screen on the home onboarding dialog. -->
+    <string name="onboarding_home_sign_in_button">گیریش</string>
+    <!-- Text for the button to skip the onboarding on the home onboarding dialog. -->
+    <string name="onboarding_home_skip_button">گئچ</string>
+    <!-- Onboarding home screen sync popup dialog message, shown on top of Recent Synced Tabs in the Jump back in section. -->
+    <string name="sync_cfr_message">تاغلارینیز دونگل‌لنیر! آیری جهازینیزدا قالدیغینیز یئردن دوام ائدین.</string>
+    <!-- Content description (not visible, for screen readers etc.): Close button for the home onboarding dialog -->
+    <string name="onboarding_home_content_description_close_button">باغلا</string>
+
+    <!-- Notification pre-permission dialog -->
+    <!-- Enable notification pre permission dialog title
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">بیلدیریش‌لر %s ایله داها چوخ شئی ائتمه‌گه کومک ائدیر.</string>
+    <!-- Enable notification pre permission dialog description with rationale
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">تاغلارینیزی جهازلار آراسیندا دؤنگل‌ ائله‌یین، یئندیرمه‌لری ایداره ائله‌یین، %s گیزلیلیک قوروماسیندان لاب یاخچی یارارلانماق حاقیندا اطلاعات آلین و آیری شئی‌لر.</string>
+    <!-- Text for the button to request notification permission on the device -->
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">ایدامه وئر</string>
+    <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">ایندی یوخ</string>
+
+    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">فایرفاکس گیزللیک بیلدیریمی</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_2">سیزی قوروماغی سئویریک</string>
+    <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
+    This is part of the string with the key "juno_onboarding_default_browser_description". -->
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">گیزلیلیک بیلدیریمی</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
+    <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">وارساییلان مورورچو ائله</string>
+    <!-- Text for the button dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_default_browser_negative_button" tools:ignore="UnusedResources">ایندی یوخ</string>
+    <!-- Text for the button to sign in to sync on the device -->
+    <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">گیریش</string>
+    <!-- Text for the button dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">ایندی یوخ</string>
+    <!-- Text for the button to request notification permission on the device -->
+    <string name="juno_onboarding_enable_notifications_positive_button" tools:ignore="UnusedResources">بیلدیریش‌لری آچ</string>
+    <!-- Text for the button dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">ایندی یوخ</string>
     <!-- Text for the button to dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">ایندی یوخ</string>
 
@@ -326,6 +395,34 @@
     <string name="preferences_category_general">عمومی</string>
 
 
+    <!-- Preference for settings related to Search -->
+    <string name="preferences_search">آختاریش</string>
+
+    <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
+    <string name="cookie_banner_handling_details_site_is_not_supported_cancel_button">لغو</string>
+
+
+    <!-- Toolbar Preferences -->
+    <!-- Preference for using top toolbar -->
+    <string name="preference_top_toolbar">اوست</string>
+    <!-- Preference for using bottom toolbar -->
+    <string name="preference_bottom_toolbar">آلت</string>
+
+    <!-- Theme Preferences -->
+    <!-- Preference for using light theme -->
+    <string name="preference_light_theme">آچیق</string>
+    <!-- Preference for using dark theme -->
+    <string name="preference_dark_theme">قارانلیق</string>
+    <!-- Preference for using using dark or light theme automatically set by battery -->
+    <string name="preference_auto_battery_theme">باتری ساخلیان طرفیندن تنظیم‌لنیر</string>
+
+    <!-- Gestures Preferences-->
+    <!-- Preferences for using pull to refresh in a webpage -->
+    <string name="preference_gestures_website_pull_to_refresh">رفرش اوچون چک</string>
+    <!-- Preference for using the dynamic toolbar -->
+    <string name="preference_gestures_dynamic_toolbar">آلت‌لر چوبوغونو گیزلتمک اوچون اسکرول ائله‌</string>
+
+
     <!-- Translations feature-->
 
     </resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 36085508a..04883adee 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -2183,6 +2183,9 @@
     <string name="other_default_search_engine_suggestion_header">Търсене с %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Сменете браузъра по подразбиране</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Задайте Firefox като стандартно приложение за отваряне на страници, електронна поща и съобщения.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 37ff8d461..bc5f735d6 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -2170,6 +2170,9 @@
     <string name="other_default_search_engine_suggestion_header">Chwilio gan %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Newidiwch eich porwr rhagosodedig</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Gosod dolenni o wefannau, e-byst, a negeseuon i agor yn awtomatig yn Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f970da8ca..6cbb619a2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2205,6 +2205,9 @@
     <string name="other_default_search_engine_suggestion_header">%s-Suche</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Ihren Standardbrowser wechseln</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Stellen Sie Links von Websites, E-Mails und Nachrichten so ein, dass sie in Firefox automatisch geöffnet werden.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 82c069db9..91f8340b8 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -2198,6 +2198,9 @@
     <string name="other_default_search_engine_suggestion_header">Buscar en %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Cambia tu navegador predeterminado</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Configurar enlaces de sitios web, correos electrónicos y mensajes para que se abran automáticamente en Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-hsb/strings.xml b/app/src/main/res/values-hsb/strings.xml
index c3b5c4e7c..a43969e12 100644
--- a/app/src/main/res/values-hsb/strings.xml
+++ b/app/src/main/res/values-hsb/strings.xml
@@ -2179,6 +2179,9 @@
     <string name="other_default_search_engine_suggestion_header">Z %s pytać</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Waš standardny wobhladowak změnić</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Nastajće wotkazy z websydłow, mejlkow a powěsćow, zo bychu so awtomatisce we Firefox wočinili.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8e50ec4f7..3a6cd2169 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -2214,6 +2214,9 @@
     <string name="other_default_search_engine_suggestion_header">Ricerca %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Cambia il browser predefinito</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Apri link da siti web, email e messaggi in Firefox per impostazione predefinita.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 72c8c8a79..58167cd3b 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -2178,6 +2178,9 @@
     <string name="other_default_search_engine_suggestion_header">חיפוש ב־%s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">החלפת דפדפן ברירת המחדל שלך</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">הגדרת קישורים מאתרים, מהודעות דוא״ל ומהודעות לפתיחה אוטומטית ב־Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 539fed7c0..c327340f9 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -2225,6 +2225,9 @@
     <string name="other_default_search_engine_suggestion_header">%s 검색</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">기본 브라우저 전환</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Firefox에서 자동으로 열리도록 웹 사이트, 이메일 및 메시지의 링크를 설정합니다.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index c4b58e1d2..ce0c47f0c 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -248,6 +248,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Tilpasse startsida</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Startskjerm</string>
@@ -255,6 +256,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Slett nettlesarhistorikk</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Omset sida</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valt språk</string>
@@ -2383,6 +2387,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Omsetjing i framdrift</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Vel eit språk</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Det oppstod eit problem med å omsetje. Prøv på nytt.</string>
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index cfc3e91f1..1885805a7 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -2180,6 +2180,9 @@
     <string name="other_default_search_engine_suggestion_header">Pesquisa %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Alterar o seu navegador predefinido</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Definir para que as ligações de sites, e-mails e mensagens sejam abertas automaticamente no Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6c1ec56f5..93e9cd3c1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2200,6 +2200,9 @@
     <string name="other_default_search_engine_suggestion_header">Поиск в %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Смените браузер по умолчанию</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Настройте автоматическое открытие ссылок с сайтов, из электронных писем и сообщений в Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 1376022d9..91d638d45 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -2027,6 +2027,8 @@
     <string name="login_menu_edit_button">Uredi</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Ali ste prepričani, da želite izbrisati to prijavo?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Ali ste prepričani, da želite izbrisati to geslo?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Izbriši</string>
     <!-- Negative action of a dialog asking to delete login -->
@@ -2168,7 +2170,7 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Iskalnik %s</string>
 
-    <!-- Default browser experiment -->
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Nastavite, naj se povezave s spletnih strani, e-pošte in sporočil samodejno odpirajo v Firefoxu.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index a7ab3de34..b4c270ba6 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -2189,6 +2189,9 @@
     <string name="other_default_search_engine_suggestion_header">Sök med %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Ändra din standardwebbläsare</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Ställ in länkar från webbplatser, e-post och meddelanden så att de öppnas automatiskt i Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->

From 487705b91a590daab3e35ce63402e305b82ccbc1 Mon Sep 17 00:00:00 2001
From: JohanLorenzo <JohanLorenzo@users.noreply.github.com>
Date: Wed, 7 Feb 2024 20:02:40 +0000
Subject: [PATCH 122/222] Update Fenix initial_experiments.json based on the
 current first-run experiments in experimenter

---
 app/src/main/res/raw/initial_experiments.json | 82 -------------------
 1 file changed, 82 deletions(-)

diff --git a/app/src/main/res/raw/initial_experiments.json b/app/src/main/res/raw/initial_experiments.json
index 9369f46a4..f7397a63c 100644
--- a/app/src/main/res/raw/initial_experiments.json
+++ b/app/src/main/res/raw/initial_experiments.json
@@ -389,88 +389,6 @@
       "localizations": null,
       "locales": null,
       "publishedDate": null
-    },
-    {
-      "schemaVersion": "1.12.0",
-      "slug": "splash-screen-test",
-      "id": "splash-screen-test",
-      "arguments": {},
-      "application": "org.mozilla.firefox",
-      "appName": "fenix",
-      "appId": "org.mozilla.firefox",
-      "channel": "release",
-      "userFacingName": "Splash screen Test",
-      "userFacingDescription": "Testing a splasshcreen on app launch.",
-      "isEnrollmentPaused": true,
-      "isRollout": false,
-      "bucketConfig": {
-        "randomizationUnit": "nimbus_id",
-        "namespace": "fenix-splash-screen-release-2",
-        "start": 0,
-        "count": 10000,
-        "total": 10000
-      },
-      "featureIds": [
-        "splash-screen"
-      ],
-      "probeSets": [],
-      "outcomes": [
-        {
-          "slug": "onboarding",
-          "priority": "primary"
-        }
-      ],
-      "branches": [
-        {
-          "slug": "control",
-          "ratio": 1,
-          "feature": {
-            "featureId": "this-is-included-for-mobile-pre-96-support",
-            "enabled": false,
-            "value": {}
-          },
-          "features": [
-            {
-              "featureId": "splash-screen",
-              "enabled": true,
-              "value": {
-                "enabled": false,
-                "maximum_duration_ms": 0
-              }
-            }
-          ]
-        },
-        {
-          "slug": "treatment-b",
-          "ratio": 1,
-          "feature": {
-            "featureId": "this-is-included-for-mobile-pre-96-support",
-            "enabled": false,
-            "value": {}
-          },
-          "features": [
-            {
-              "featureId": "splash-screen",
-              "enabled": true,
-              "value": {
-                "enabled": true,
-                "maximum_duration_ms": 6000
-              }
-            }
-          ]
-        }
-      ],
-      "targeting": "((is_already_enrolled) || ((isFirstRun == 'true') && (app_version|versionCompare('121.!') >= 0) && (region in ['AD', 'AE', 'AF', 'AG', 'AI', 'AL', 'AM', 'AO', 'AQ', 'AR', 'AS', 'AT', 'AU', 'AW', 'AX', 'AZ', 'BA', 'BB', 'BD', 'BE', 'BF', 'BG', 'BH', 'BI', 'BJ', 'BL', 'BM', 'BN', 'BO', 'BQ', 'BR', 'BS', 'BT', 'BV', 'BW', 'BY', 'BZ', 'CA', 'CC', 'CD', 'CF', 'CG', 'CH', 'CI', 'CK', 'CL', 'CM', 'CN', 'CO', 'CR', 'CU', 'CV', 'CW', 'CX', 'CY', 'CZ', 'DE', 'DJ', 'DK', 'DM', 'DO', 'DZ', 'EC', 'EE', 'EG', 'EH', 'ER', 'ES', 'ET', 'FI', 'FJ', 'FK', 'FM', 'FO', 'FR', 'GA', 'GB', 'GD', 'GE', 'GF', 'GG', 'GH', 'GI', 'GL', 'GM', 'GN', 'GP', 'GQ', 'GR', 'GS', 'GT', 'GU', 'GW', 'GY', 'HK', 'HM', 'HN', 'HR', 'HT', 'HU', 'ID', 'IE', 'IL', 'IM', 'IN', 'IO', 'IQ', 'IR', 'IS', 'IT', 'JE', 'JM', 'JO', 'JP', 'KE', 'KG', 'KH', 'KI', 'KM', 'KN', 'KP', 'KR', 'KW', 'KY', 'KZ', 'LA', 'LB', 'LC', 'LI', 'LK', 'LR', 'LS', 'LT', 'LU', 'LV', 'LY', 'MA', 'MC', 'MD', 'ME', 'MF', 'MG', 'MH', 'MK', 'ML', 'MM', 'MN', 'MO', 'MP', 'MQ', 'MR', 'MS', 'MT', 'MU', 'MV', 'MW', 'MX', 'MY', 'MZ', 'NA', 'NC', 'NE', 'NF', 'NG', 'NI', 'NL', 'NO', 'NP', 'NR', 'NU', 'NZ', 'OM', 'PA', 'PE', 'PF', 'PG', 'PH', 'PK', 'PL', 'PM', 'PN', 'PR', 'PS', 'PT', 'PW', 'PY', 'QA', 'RE', 'RO', 'RS', 'RU', 'RW', 'SA', 'SB', 'SC', 'SD', 'SE', 'SG', 'SH', 'SI', 'SJ', 'SK', 'SL', 'SM', 'SN', 'SO', 'SR', 'SS', 'ST', 'SV', 'SX', 'SY', 'SZ', 'TC', 'TD', 'TF', 'TG', 'TH', 'TJ', 'TK', 'TL', 'TM', 'TN', 'TO', 'TR', 'TT', 'TV', 'TW', 'TZ', 'UA', 'UG', 'UM', 'US', 'UY', 'UZ', 'VA', 'VC', 'VE', 'VG', 'VI', 'VN', 'VU', 'WF', 'WS', 'YE', 'YT', 'ZA', 'ZM', 'ZW'])))",
-      "startDate": "2023-12-06",
-      "enrollmentEndDate": "2024-01-10",
-      "endDate": null,
-      "proposedDuration": 49,
-      "proposedEnrollment": 21,
-      "referenceBranch": "control",
-      "featureValidationOptOut": false,
-      "localizations": null,
-      "locales": null,
-      "publishedDate": null
     }
   ]
 }

From ec85d157feed9e2a50b3decfb4cf0395c07100e7 Mon Sep 17 00:00:00 2001
From: William Durand <will+git@drnd.me>
Date: Thu, 8 Feb 2024 10:00:21 +0100
Subject: [PATCH 123/222] Bug 1870329 - Add add-on name to the content
 description of each install button

---
 .../fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
index 3c73bc82a..94c5c3f50 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
@@ -204,7 +204,7 @@ class SettingsSubMenuAddonsManagerRobot {
     private fun installButtonForAddon(addonName: String) =
         onView(
             allOf(
-                withContentDescription(R.string.mozac_feature_addons_install_addon_content_description),
+                withContentDescription("Install $addonName"),
                 isDescendantOfA(withId(R.id.add_on_item)),
                 hasSibling(hasDescendant(withText(addonName))),
             ),

From bee6feaa0fbc51e3741ba59550f1d19cee6180a1 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Fri, 9 Feb 2024 00:03:29 +0000
Subject: [PATCH 124/222] Import translations from android-l10n

---
 app/src/main/res/values-azb/strings.xml    |  97 +++++++++++
 app/src/main/res/values-de/strings.xml     |   2 +-
 app/src/main/res/values-el/strings.xml     |   3 +
 app/src/main/res/values-es-rAR/strings.xml |   2 +-
 app/src/main/res/values-et/strings.xml     | 132 +++++----------
 app/src/main/res/values-fr/strings.xml     |   3 +
 app/src/main/res/values-ia/strings.xml     |   3 +
 app/src/main/res/values-kk/strings.xml     |   3 +
 app/src/main/res/values-nl/strings.xml     |   3 +
 app/src/main/res/values-pa-rIN/strings.xml |   3 +
 app/src/main/res/values-pt-rBR/strings.xml |   3 +
 app/src/main/res/values-ro/strings.xml     | 179 ++++++++++++++-------
 app/src/main/res/values-zh-rTW/strings.xml |   3 +
 13 files changed, 280 insertions(+), 156 deletions(-)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index 0e3f87e96..dd604a09a 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -360,6 +360,10 @@
     <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">سیزی قوروماغی سئویریک</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_3">نفع آختارمیان مورورچوموز، شیرکتلرین سیزی وب‌ده گیزلیجه تعقیب ائتمه‌سینی مسدود ائلییر.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">نفع آختارمیان مورورچوموز، شیرکتلرین سیزی گیزلیجه اینترنتده تعقیب ائتمه‌لرینی مسدود ائلییر.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
     <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">گیزلیلیک بیلدیریمی</string>
@@ -367,14 +371,34 @@
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">وارساییلان مورورچو ائله</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_default_browser_negative_button" tools:ignore="UnusedResources">ایندی یوخ</string>
+    <!-- Title for sign in to sync screen. -->
+    <string name="juno_onboarding_sign_in_title_2">جهازلار آراسیندا گئچیش ائلین زامان رمزلنمیش قالین.</string>
+    <!-- Description for sign in to sync screen. Nimbus experiments do not support string placeholders.
+     Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_sign_in_description_2">گیریش و دؤنگل ائتدیگینیز زامان داها گوونلی اولورسوز. فایرفاکس رمزلری، بوکمارکلاری و آیری شئی‌لری رمزلشدیریر.</string>
     <!-- Text for the button to sign in to sync on the device -->
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">گیریش</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">ایندی یوخ</string>
+    <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_enable_notifications_title_nimbus_2">بیلدیریش‌لر فایرفاکس ایله داها امن قالماغینیزا کومک ائدیر.</string>
+    <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+       Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_enable_notifications_description_nimbus_2">تاغلاری جهازلاریز آراسیندا گوونلی شکلده گؤندرین و فایرفاکسین آیری اؤزللیکلرینی کشف ائله‌یین.</string>
     <!-- Text for the button to request notification permission on the device -->
     <string name="juno_onboarding_enable_notifications_positive_button" tools:ignore="UnusedResources">بیلدیریش‌لری آچ</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">ایندی یوخ</string>
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">فایرفاکس آختاریش ویجتینی ایمتیحان ائله‌یین</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">فایرفاکسی آنا اکرانیزا آرتیرساز گیزلیلیگه اؤنجه‌لیک وئرن مورورچونوزا آسانلیق‌لا الینیز چاتار.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">فایرفاکس ویجتینی آرتیر</string>
     <!-- Text for the button to dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">ایندی یوخ</string>
 
@@ -395,13 +419,86 @@
     <string name="preferences_category_general">عمومی</string>
 
 
+    <!-- Preference category for all links about Fenix -->
+    <string name="preferences_category_about">حاقیندا</string>
+    <!-- Preference category for settings related to changing the default search engine -->
+    <string name="preferences_category_select_default_search_engine">بیرینی سئچ</string>
+    <!-- Preference for settings related to managing search shortcuts for the quick search menu -->
+    <string name="preferences_manage_search_shortcuts_2">باشقا آختارما موتورلارینی ایداره ائدین</string>
+    <!-- Summary for preference for settings related to managing search shortcuts for the quick search menu -->
+    <string name="preferences_manage_search_shortcuts_summary">آختاریش منوسوندا گؤرونن موتورلاری دوزه‌لیش ائدین</string>
+    <!-- Preference category for settings related to managing search shortcuts for the quick search menu -->
+    <string name="preferences_category_engines_in_search_menu">آختاریش منوسوندا گؤرونن موتورلار</string>
+    <!-- Preference for settings related to changing the default search engine -->
+    <string name="preferences_default_search_engine">وارساییلان آختاریش موتورو</string>
     <!-- Preference for settings related to Search -->
     <string name="preferences_search">آختاریش</string>
 
+    <!-- Preference for settings related to Search engines -->
+    <string name="preferences_search_engines">آختاریش موتورلاری</string>
+    <!-- Preference for settings related to Search engines suggestions-->
+    <string name="preferences_search_engines_suggestions">آختاریش موتورلاریندان تکلیف‌لر</string>
+    <!-- Preference Category for settings related to Search address bar -->
+    <string name="preferences_settings_address_bar">آدرس چوبوغو ترجیح‌لری</string>
+    <!-- Preference Category for settings to Firefox Suggest -->
+    <string name="preference_search_address_bar_fx_suggest">آدرس چوبوغو -فایرفاکس تکلیفی</string>
+    <!-- Preference link to Learn more about Firefox Suggest -->
+    <string name="preference_search_learn_about_fx_suggest">فایرفاکس تکلیفی حاقیندا آرتیق بیلگی آلین</string>
+    <!-- Preference link to rating Fenix on the Play Store -->
+    <string name="preferences_rate">قوقل پلی‌ده امتیاز وئر</string>
+    <!-- Preference linking to about page for Fenix
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="preferences_about">%1$s حاقیندا</string>
+    <!-- Preference for settings related to changing the default browser -->
+    <string name="preferences_set_as_default_browser">وارساییلان مورورچو ائله</string>
+    <!-- Preference category for advanced settings -->
+    <string name="preferences_category_advanced">قاباغجیل</string>
+
+    <!-- Preference category for privacy and security settings -->
+    <string name="preferences_category_privacy_security">گیزلیلیک و گوونلیک</string>
+    <!-- Preference for advanced site permissions -->
+    <string name="preferences_site_permissions">سایت ایجازه‌لری</string>
+    <!-- Preference for private browsing options -->
+    <string name="preferences_private_browsing_options">گیزلی مورور</string>
+    <!-- Preference for opening links in a private tab-->
+    <string name="preferences_open_links_in_a_private_tab">باغلانتی‌نی گیزلی تاغدا آچ</string>
+
+    <!-- Preference for allowing screenshots to be taken while in a private tab-->
+    <string name="preferences_allow_screenshots_in_private_mode">گیزلی موروردا اسکرین شاتا ایجازه وئر</string>
+    <!-- Will inform the user of the risk of activating Allow screenshots in private browsing option -->
+    <string name="preferences_screenshots_in_private_mode_disclaimer">اگر اجازه وئریلیرسه، گیزلی تاغلار بیرنئچه اپلیکیشن آچیلدیغی زامان‌دا گؤرونه‌جک</string>
+    <!-- Preference for adding private browsing shortcut -->
+    <string name="preferences_add_private_browsing_shortcut">گیزلی مورور شورتکاتینی آرتیر</string>
+    <!-- Preference for enabling "HTTPS-Only" mode -->
+    <string name="preferences_https_only_title">یالنیز HTTPS حالتی</string>
+
+    <!-- Label for cookie banner section in quick settings panel. -->
+    <string name="cookie_banner_blocker">کوکی بنر مسدود ائلیه‌نی</string>
+    <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
+    <string name="preferences_cookie_banner_reduction_private_mode">گیزلی موروردا کوکی بنر مسدود ائلینی</string>
+    <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
+    <string name="reduce_cookie_banner_off_for_site">بو سایتدا باغلی</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
     <string name="cookie_banner_handling_details_site_is_not_supported_cancel_button">لغو</string>
 
 
+    <!-- Text for request support button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
+    <string name="cookie_banner_handling_details_site_is_not_supported_request_support_button_2">ایستک یوللا</string>
+    <!-- Text for title indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
+    <string name="cookie_banner_handling_details_site_is_not_supported_title_2">بو سایت اوچون آرخالاما ایستنسین؟</string>
+    <!-- Label for the snackBar, after the user reports with success a website where cookie banner reducer did not work -->
+    <string name="cookie_banner_handling_report_site_snack_bar_text_2">ایستک گؤندریلدی</string>
+    <!-- Text for indicating cookie banner handling is on this site, this is shown as part of the protections panel with the tracking protection toggle -->
+    <string name="reduce_cookie_banner_on_for_site">بو سایت اوچون آچیق</string>
+    <!-- Text for indicating that a request for unsupported site was sent to Nimbus (it's a Mozilla library for experiments), this is shown as part of the protections panel with the tracking protection toggle -->
+    <string name="reduce_cookie_banner_unsupported_site_request_submitted_2">آرخالاما ایستکی گوندریلدی</string>
+    <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
+    <string name="reduce_cookie_banner_unsupported_site">سایت هله‌لیک آرخالانمیر</string>
+    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
+    <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">%1$s اوچون کوکی بنر مسدود ائلین ایشله‌سین؟</string>
+    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
+    <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">%1$s اوچون کوکی بنر مسدود ائلین ایشدن سالینسین؟</string>
+
     <!-- Toolbar Preferences -->
     <!-- Preference for using top toolbar -->
     <string name="preference_top_toolbar">اوست</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6cbb619a2..d31cb9ca6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2206,7 +2206,7 @@
 
     <!-- Default browser experiment -->
     <!-- Default browser card title -->
-    <string name="default_browser_experiment_card_title">Ihren Standardbrowser wechseln</string>
+    <string name="default_browser_experiment_card_title">Wechseln Sie Ihren Standardbrowser</string>
     <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Stellen Sie Links von Websites, E-Mails und Nachrichten so ein, dass sie in Firefox automatisch geöffnet werden.</string>
 
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 7f8b4eb65..f99fb52bd 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -2195,6 +2195,9 @@
     <string name="other_default_search_engine_suggestion_header">Αναζήτηση %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Αλλαγή προεπιλεγμένου προγράμματος περιήγησης</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Αυτόματο άνοιγμα συνδέσμων από ιστοτόπους, email και μηνύματα στο Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 91f8340b8..36b024d21 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -2199,7 +2199,7 @@
 
     <!-- Default browser experiment -->
     <!-- Default browser card title -->
-    <string name="default_browser_experiment_card_title">Cambia tu navegador predeterminado</string>
+    <string name="default_browser_experiment_card_title">Cambiá tu navegador predeterminado</string>
     <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Configurar enlaces de sitios web, correos electrónicos y mensajes para que se abran automáticamente en Firefox.</string>
 
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index c60c50315..998bcdd8f 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -192,6 +192,7 @@
     <string name="browser_menu_edit">Muuda</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Kohanda avalehte</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Avaleht</string>
@@ -208,8 +209,6 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skanni</string>
 
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button">Otsingumootor</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Otsingumootori sätted</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -223,7 +222,7 @@
     <!-- Search suggestion onboarding hint description text, first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="search_suggestions_onboarding_text">%s jagab vaikeotsingumootoriga kõike, mida aadressiribale sisestad.</string>
 
-    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <!-- Search engine suggestion title text. The first parameter is the name of the suggested engine-->
     <string name="search_engine_suggestions_title">Otsi otsingumootoriga %s</string>
     <!-- Search engine suggestion description text -->
     <string name="search_engine_suggestions_description">Otsi otse aadressiribalt</string>
@@ -231,6 +230,9 @@
     <!-- Menu option in the search selector menu to open the search settings -->
     <string name="search_settings_menu_item">Otsingusätted</string>
 
+    <!-- Header text for the search selector menu -->
+    <string name="search_header_menu_item_2">Otsi seekord järgneva otsingumootoriga:</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. The first parameter is the name of the application.-->
     <string name="search_widget_content_description_2">Ava uus kaart %1$sis</string>
@@ -253,8 +255,6 @@
     <string name="preferences_default_search_engine">Vaikeotsingumootor</string>
     <!-- Preference for settings related to Search -->
     <string name="preferences_search">Otsimine</string>
-    <!-- Preference for settings related to Search address bar -->
-    <string name="preferences_search_address_bar">Aadressiriba</string>
     <!-- Preference link to rating Fenix on the Play Store -->
     <string name="preferences_rate">Hinda Google Plays</string>
     <!-- Preference linking to about page for Fenix
@@ -283,10 +283,13 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Ainult HTTPS-režiim</string>
 
+    <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
+    <string name="reduce_cookie_banner_off_for_site">Sellel saidil väljas</string>
+    <!-- Text for indicating cookie banner handling is on this site, this is shown as part of the protections panel with the tracking protection toggle -->
+    <string name="reduce_cookie_banner_on_for_site">Sellel saidil sees</string>
+
     <!-- Description of the preference to enable "HTTPS-Only" mode. -->
     <string name="preferences_https_only_summary">Kõrgendatud turvalisuse nimel üritatakse saitidega ühenduda ainult HTTPSi krüptitud protokolli vahendusel.</string>
-    <!-- Summary of tracking protection preference if tracking protection is set to on -->
-    <string name="preferences_https_only_on" moz:removedIn="111" tools:ignore="UnusedResources">Sees</string>
     <!-- Summary of https only preference if https only is set to off -->
     <string name="preferences_https_only_off">Väljas</string>
     <!-- Text displayed that links to website containing documentation about "HTTPS-Only" mode -->
@@ -303,12 +306,8 @@
     <string name="errorpage_httpsonly_message_summary">Siiski on võimalik, et sellega on seotud ka ründaja. Saidi külastamise jätkamisel ära sisesta tundliku teavet. Jätkamisel lülitatakse saidi jaoks ajutiselt ainult HTTPSi režiim välja.</string>
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Hõlbustus</string>
-    <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Kohandatud Firefoxi konto server</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Kohandatud sünkroonimise server</string>
-    <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefoxi konto/sünkroniseerimise server muutus. Muudatuste rakendumiseks väljutakse äpist…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Konto</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -321,8 +320,6 @@
     <string name="preferences_gestures">Žestid</string>
     <!-- Preference for settings related to visual options -->
     <string name="preferences_customize">Kohandamine</string>
-    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefoxi konto</string>
 
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Sünkroniseerimise jätkamiseks loo ühendus uuesti</string>
@@ -334,8 +331,6 @@
     <string name="preferences_data_collection">Andmete kogumine</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Remote debugging via USB</string>
-    <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Kuvatakse otsingumootoreid</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Kuvatakse otsingu soovitusi</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -364,6 +359,7 @@
     <string name="preferences_open_links_in_apps_never">Mitte kunagi</string>
     <!-- Preference for open download with an external download manager app -->
     <string name="preferences_external_download_manager">Kasutatakse välist allalaadimishaldurit</string>
+
     <!-- Preference for add_ons -->
     <string name="preferences_addons">Lisad</string>
 
@@ -413,13 +409,6 @@
     <!-- Snackbar label for action to view selected wallpaper -->
     <string name="wallpaper_updated_snackbar_action">Vaata</string>
 
-    <!-- Add-on Installation from AMO-->
-    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Lisa pole toetatud</string>
-    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Lisa on juba paigaldatud</string>
-
-    <!-- Account Preferences -->
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sünkroniseeri kohe</string>
     <!-- Preference category for sync -->
@@ -558,13 +547,6 @@
     <!-- Dialog button text for canceling open all tabs -->
     <string name="open_all_warning_cancel">Loobu</string>
 
-    <!-- Text to show users they have one site in the history group section of the History fragment.
-    %d is a placeholder for the number of sites in the group. -->
-    <string name="history_search_group_site" moz:RemovedIn="111" tools:ignore="UnusedResources">%d sait</string>
-    <!-- Text to show users they have multiple sites in the history group section of the History fragment.
-    %d is a placeholder for the number of sites in the group. -->
-    <string name="history_search_group_sites" moz:RemovedIn="111" tools:ignore="UnusedResources">%d saiti</string>
-
     <!-- Option in library for Recently Closed Tabs -->
     <string name="library_recently_closed_tabs">Hiljuti suletud kaardid</string>
 
@@ -699,10 +681,10 @@
     <string name="collection_open_tabs">Ava kaardid</string>
     <!-- Hint for adding name of a collection -->
     <string name="collection_name_hint">Kollektsiooni nimi</string>
-	<!-- Text for the menu button to rename a top site -->
-	<string name="rename_top_site">Muuda nime</string>
-	<!-- Text for the menu button to remove a top site -->
-	<string name="remove_top_site">Eemalda</string>
+    <!-- Text for the menu button to rename a top site -->
+    <string name="rename_top_site">Muuda nime</string>
+    <!-- Text for the menu button to remove a top site -->
+    <string name="remove_top_site">Eemalda</string>
 
     <!-- Text for the menu button to delete a top site from history -->
     <string name="delete_from_history">Kustuta ajaloost</string>
@@ -879,10 +861,10 @@
     <string name="phone_feature_blocked_by_android">Keelatud Androidi poolt</string>
     <!-- Preference for showing a list of websites that the default configurations won't apply to them -->
     <string name="preference_exceptions">Erandid</string>
-    <!-- Summary of tracking protection preference if tracking protection is set to on -->
-    <string name="tracking_protection_on" moz:removedIn="111" tools:ignore="UnusedResources">Sees</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Väljas</string>
+    <!-- Summary of tracking protection preference if tracking protection is set to standard -->
+    <string name="tracking_protection_standard">Tavaline</string>
     <!-- Summary of tracking protection preference if tracking protection is set to strict -->
     <string name="tracking_protection_strict">Range</string>
     <!-- Summary of tracking protection preference if tracking protection is set to custom -->
@@ -971,7 +953,7 @@
     <string name="share_button_content_description">Jaga</string>
     <!-- Text for the Save to PDF feature in the share menu -->
     <string name="share_save_to_pdf">Salvesta PDFina</string>
-    <!-- Text for error message when generating a PDF file Text for error message when generating a PDF file. -->
+    <!-- Text for error message when generating a PDF file Text. -->
     <string name="unable_to_save_to_pdf_error">PDFi loomine pole võimalik</string>
     <!-- Sub-header in the dialog to share a link to another sync device -->
     <string name="share_device_subheader">Edasta seadmele</string>
@@ -1080,13 +1062,9 @@
     <string name="preferences_delete_browsing_data_tabs_title_2">Avatud kaardid</string>
     <!-- Subtitle for the tabs item in Delete browsing data, parameter will be replaced with the number of open tabs -->
     <string name="preferences_delete_browsing_data_tabs_subtitle">%d kaarti</string>
-    <!-- Title for the data and history items in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_browsing_data_title">Lehitsemise ajalugu ja saitide andmed</string>
     <!-- Subtitle for the data and history items in delete browsing data, parameter will be replaced with the
         number of history items the user has -->
     <string name="preferences_delete_browsing_data_browsing_data_subtitle">%d aadressi</string>
-    <!-- Title for the cookies item in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_cookies">Küpsised</string>
     <!-- Subtitle for the cookies item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cookies_subtitle">Sind logitakse enamikest saitidest välja</string>
     <!-- Title for the cached images and files item in Delete browsing data -->
@@ -1124,39 +1102,11 @@
     <!-- Text for the snackbar confirmation that the history group was deleted -->
     <string name="delete_history_group_snackbar">Grupp kustutatud</string>
 
+    <!-- Onboarding -->
     <!-- text to display in the snackbar once account is signed-in -->
     <string name="onboarding_firefox_account_sync_is_on">Sync on sisse lülitatud</string>
 
-    <!-- text for tracking protection radio button option for standard level of blocking -->
-    <string name="onboarding_tracking_protection_standard_button_2">Tavaline (vaikimisi)</string>
-    <!-- text for standard blocking option button description -->
-    <string name="onboarding_tracking_protection_standard_button_description_3">Tasakaalustatud privaatsuse ja jõudluse jaoks. Lehed laaditakse tavapäraselt.</string>
-    <!-- text for tracking protection radio button option for strict level of blocking -->
-    <string name="onboarding_tracking_protection_strict_option">Range</string>
-    <!-- text for strict blocking option button description -->
-    <string name="onboarding_tracking_protection_strict_button_description_3">Blokib rohkem jälitajaid ning lehed laadivad kiiremini, aga mõned lehtedel olevad funktsionaalsused võivad katki minna.</string>
-    <!-- text for the toolbar position card header  -->
-    <string name="onboarding_toolbar_placement_header_1">Vali oma tööriistariba asukoht</string>
-    <!-- Text for the button to read the privacy notice -->
-    <string name="onboarding_privacy_notice_read_button">Loe meie privaatsuspoliitikat</string>
-
-    <!-- text for the button to finish onboarding -->
-    <string name="onboarding_finish">Alusta veebilehitsemist</string>
-
     <!-- Onboarding theme -->
-    <!-- text for the theme picker onboarding card header -->
-    <string name="onboarding_theme_picker_header">Vali oma teema</string>
-    <!-- text for the theme picker onboarding card description -->
-    <string name="onboarding_theme_picker_description_2">Säästa akut ja oma silmi, lubades tume teema.</string>
-    <!-- Automatic theme setting (will follow device setting) -->
-    <string name="onboarding_theme_automatic_title">Automaatne</string>
-    <!-- Summary of automatic theme setting (will follow device setting) -->
-    <string name="onboarding_theme_automatic_summary">Kohandub sinu seadme sätetega</string>
-    <!-- Theme setting for dark mode -->
-    <string name="onboarding_theme_dark_title">Tume teema</string>
-    <!-- Theme setting for light mode -->
-    <string name="onboarding_theme_light_title">Hele teema</string>
-
     <!-- Text shown in snackbar when multiple tabs have been sent to device -->
     <string name="sync_sent_tabs_snackbar">Kaardid on saadetud!</string>
     <!-- Text shown in snackbar when one tab has been sent to device  -->
@@ -1192,23 +1142,21 @@
     <string name="etp_settings">Kaitse sätted</string>
     <!-- Preference title for enhanced tracking protection settings -->
     <string name="preference_enhanced_tracking_protection">Täiustatud jälitamisvastane kaitse</string>
-    <!-- Title for the description of enhanced tracking protection -->
-    <string name="preference_enhanced_tracking_protection_explanation_title">Lehitse veebi ilma jälitamiseta</string>
-    <!-- Description of enhanced tracking protection. The first parameter is the name of the application (For example: Fenix) -->
-    <string name="preference_enhanced_tracking_protection_explanation">Hoia oma andmed endale. %s kaitseb sind paljude tuntud jälitajate eest, kes jälgivad, mida sa võrgus olles teed.</string>
+    <!-- Description of enhanced tracking protection. The parameter is the name of the application (For example: Firefox Fenix) -->
+    <string name="preference_enhanced_tracking_protection_explanation_2">%s kaitseb sind paljude tuntud jälitajate eest, kes jälgivad, mida sa võrgus olles teed.</string>
     <!-- Text displayed that links to website about enhanced tracking protection -->
     <string name="preference_enhanced_tracking_protection_explanation_learn_more">Rohkem teavet</string>
 
     <!-- Preference for enhanced tracking protection for the standard protection settings -->
     <string name="preference_enhanced_tracking_protection_standard_default_1">Tavaline (vaikimisi)</string>
     <!-- Preference description for enhanced tracking protection for the standard protection settings -->
-    <string name="preference_enhanced_tracking_protection_standard_description_4">Tasakaalustatud privaatsuse ja jõudluse jaoks. Lehed laaditakse tavapäraselt.</string>
+    <string name="preference_enhanced_tracking_protection_standard_description_5">Lehed laadivad normaalselt, kuid blokitakse vähem jälitajaid.</string>
     <!--  Accessibility text for the Standard protection information icon  -->
     <string name="preference_enhanced_tracking_protection_standard_info_button">Mis on blokitud tavalise jälitamisvastase kaitse poolt</string>
     <!-- Preference for enhanced tracking protection for the strict protection settings -->
     <string name="preference_enhanced_tracking_protection_strict">Range</string>
     <!-- Preference description for enhanced tracking protection for the strict protection settings -->
-    <string name="preference_enhanced_tracking_protection_strict_description_3">Blokib rohkem jälitajaid ning lehed laadivad kiiremini, aga mõned lehtedel olevad funktsionaalsused võivad katki minna.</string>
+    <string name="preference_enhanced_tracking_protection_strict_description_4">Tugevam jälitamisvastane kaitse ja suurem jõudlus, kuid mõned saidid ei pruugi korralikult töötada.</string>
     <!--  Accessibility text for the Strict protection information icon  -->
     <string name="preference_enhanced_tracking_protection_strict_info_button">Mis on blokitud tugevama jälitamisvastase kaitse poolt</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
@@ -1228,6 +1176,10 @@
     <string name="preference_enhanced_tracking_protection_custom_cookies_3">kõik kolmanda osapoole küpsised (võib põhjustada mõnel veebisaidil probleeme)</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
     <string name="preference_enhanced_tracking_protection_custom_cookies_4">kõik küpsised (mõned veebisaidid lähevad katki)</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
+    <string name="preference_enhanced_tracking_protection_custom_cookies_5">Eraldatakse saidiülesed küpsised</string>
+    <!-- Preference for Global Privacy Control for the custom privacy settings for Global Privacy Control. '&amp;' is replaced with the ampersand symbol: &-->
+    <string name="preference_enhanced_tracking_protection_custom_global_privacy_control">Veebisaite juhendatakse andmeid mitte müüma ega jagama</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content">Jälitav sisu</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
@@ -1252,8 +1204,12 @@
     <!-- Category of trackers (cross-site tracking cookies) that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_cookies_title">Saitideülesed jälitamisküpsised</string>
 
+    <!-- Category of trackers (cross-site tracking cookies) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_cookies_title_2">Saidiülesed küpsised</string>
     <!-- Description of cross-site tracking cookies that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_cookies_description">Blokib küpsised, mida reklaami- ja analüüsiettevõtted üle paljude saitide sinu andmete kogumiseks kasutavad.</string>
+    <!-- Description of cross-site tracking cookies that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_cookies_description_2">Täielik küpsistevastane eraldab külastatava saidi küpsiseid, nii et jälitajad, nt reklaamivõrgustikud, ei saa nende abil sind saitide üleselt jälitada.</string>
     <!-- Category of trackers (cryptominers) that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_cryptominers_title">Krüptorahakaevurid</string>
     <!-- Description of cryptominers that can be blocked by Enhanced Tracking Protection -->
@@ -1557,21 +1513,11 @@
     <string name="search_engine_add_custom_search_engine_title">Otsingumootori lisamine</string>
     <!-- Title of the Edit search engine screen -->
     <string name="search_engine_edit_custom_search_engine_title">Otsingumootori muutmine</string>
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
-    <string name="search_engine_add_button_content_description">Lisa</string>
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Salvesta</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Muuda</string>
     <!-- Text for the menu button to delete a search engine -->
     <string name="search_engine_delete">Kustuta</string>
 
-    <!-- Text for the button to create a custom search engine on the Add search engine screen -->
-    <string name="search_add_custom_engine_label_other">Muu</string>
-    <!-- Placeholder text shown in the Search Engine Name TextField before a user enters text -->
-    <string name="search_add_custom_engine_name_hint">Nimi</string>
-    <!-- Placeholder text shown in the Search String TextField before a user enters text -->
-    <string name="search_add_custom_engine_search_string_hint">Kasutatav otsingustring</string>
     <!-- Description text for the Search String TextField. The %s is part of the string -->
     <string name="search_add_custom_engine_search_string_example" formatted="false">Päringu asendamiseks kasuta “%s”. Näiteks \nhttps://www.google.com/search?q=%s</string>
     <!-- Accessibility description for the form in which details about the custom search engine are entered -->
@@ -1702,14 +1648,14 @@
     <string name="top_sites_max_limit_confirmation_button">Olgu, sain aru</string>
     <!-- Label for the preference to show the shortcuts for the most visited top sites on the homepage -->
     <string name="top_sites_toggle_top_recent_sites_4">Otseteed</string>
-	<!-- Title text displayed in the rename top site dialog. -->
-	<string name="top_sites_rename_dialog_title">Nimi</string>
+    <!-- Title text displayed in the rename top site dialog. -->
+    <string name="top_sites_rename_dialog_title">Nimi</string>
     <!-- Hint for renaming title of a shortcut -->
     <string name="shortcut_name_hint">Otsetee nimi</string>
-	<!-- Button caption to confirm the renaming of the top site. -->
-	<string name="top_sites_rename_dialog_ok">Olgu</string>
-	<!-- Dialog button text for canceling the rename top site prompt. -->
-	<string name="top_sites_rename_dialog_cancel">Loobu</string>
+    <!-- Button caption to confirm the renaming of the top site. -->
+    <string name="top_sites_rename_dialog_ok">Olgu</string>
+    <!-- Dialog button text for canceling the rename top site prompt. -->
+    <string name="top_sites_rename_dialog_cancel">Loobu</string>
     <!-- Text for the menu button to open the homepage settings. -->
     <string name="top_sites_menu_settings">Sätted</string>
     <!-- Text for the menu button to navigate to sponsors and privacy support articles. '&amp;' is replaced with the ampersand symbol: & -->
@@ -1738,7 +1684,7 @@
     <!-- Text for the snackbar to confirm auto-close is enabled for inactive tabs -->
     <string name="inactive_tabs_auto_close_message_snackbar">Automaatne sulgemine on lubatud</string>
 
-    <!-- Default browser experiment -->
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Määra Firefox automaatselt avama linke, e-posti ja sõnumeid.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -1773,4 +1719,6 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Mine sätetesse</string>
 
+    <!-- Translations feature-->
+
     </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c6e72ec33..a99ae4fe9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -2204,6 +2204,9 @@
     <string name="other_default_search_engine_suggestion_header">Recherche %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Changez de navigateur par défaut</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Faites en sorte que les liens des sites web, des e-mails et des messages s’ouvrent automatiquement dans Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
index 9d9fe0724..0970b4b78 100644
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@@ -2223,6 +2223,9 @@
     <string name="other_default_search_engine_suggestion_header">Cercar %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Cambia tu navigator predefinite</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Stabilir qual ligamines de sitos web, e-mails e messages se aperi automaticamente in Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index a960da871..acd6830c3 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -2170,6 +2170,9 @@
     <string name="other_default_search_engine_suggestion_header">%s іздеуі</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Негізгі браузеріңізді ауыстыру</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Веб-сайттар, эл. пошта хаттары және хабарламалардан сілтемелерді Firefox-та автоматты түрде ашылатындай етіп баптау.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 27fb89c2f..bfd32fd02 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2184,6 +2184,9 @@
     <string name="other_default_search_engine_suggestion_header">Zoeken met %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Uw standaardbrowser wisselen</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Koppelingen van websites, e-mail en berichten automatisch in Firefox openen.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml
index f5c180e02..e9e3d83bf 100644
--- a/app/src/main/res/values-pa-rIN/strings.xml
+++ b/app/src/main/res/values-pa-rIN/strings.xml
@@ -2192,6 +2192,9 @@
     <string name="other_default_search_engine_suggestion_header">%s ਖੋਜ</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">ਆਪਣੇ ਮੂਲ ਬਰਾਊਜ਼ਰ ਨੂੰ ਬਦਲੋ</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">ਵੈੱਬਸਾਈਟਾਂ, ਈਮੇਲਾਂ ਅਤੇ ਸੁਨੇਹਿਆਂ ਨੂੰ Firefox ਵਿੱਚ ਆਪਣੇ ਖੋਲ੍ਹਣ ਲਈ ਲਿੰਕ ਸੈੱਟ ਕਰੋ।</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 332fdda58..e32bdb52c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -2182,6 +2182,9 @@
     <string name="other_default_search_engine_suggestion_header">Pesquisa do %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Mude seu navegador padrão</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Abra links, emails e mensagens automaticamente no Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 0c577c121..b6efef041 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -44,14 +44,39 @@
     <string name="private_browsing_placeholder_description_2">%1$s îți șterge istoricul de căutare și navigare din filele private când le închizi sau când ieși din aplicație. Deși nu te anonimizează pe site-urile web sau pentru furnizorul de servicii de internet, ușurează păstrarea confidențialității asupra a ce faci online față de oricine altcineva folosește acest dispozitiv.</string>
     <string name="private_browsing_common_myths">Mituri comune despre navigarea privată</string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Nu lăsa urme pe acest dispozitiv</string>
+
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle_2">%1$s îți șterge cookie-urile, istoricul și datele site-urilor când închizi toate ferestrele private. %2$s</string>
+    <!-- Clickable portion of the explanation for private browsing that links the user to our
+        about privacy page.
+        This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
+    <string name="felt_privacy_info_card_subtitle_link_text">Cine ar putea să-mi vadă activitatea?</string>
+
+    <!-- Text for the positive button to accept adding a Private Browsing shortcut to the Home screen -->
+    <string name="private_mode_cfr_pos_button_text">Adaugă în ecranul de start</string>
     <!-- Text for the negative button to decline adding a Private Browsing shortcut to the Home screen -->
     <string name="cfr_neg_button_text">Nu, mulțumesc</string>
 
+    <!-- Open in App "contextual feature recommendation" (CFR) -->
+    <!-- Text for the info message. The first parameter is the name of the application.-->
+    <string name="open_in_app_cfr_info_message_2">Poți seta %1$s să deschidă automat linkuri în aplicații.</string>
     <!-- Text for the positive action button -->
     <string name="open_in_app_cfr_positive_button_text">Mergi la setări</string>
     <!-- Text for the negative action button -->
     <string name="open_in_app_cfr_negative_button_text">Înlătură</string>
 
+
+    <!-- Private browsing erase action "contextual feature recommendation" (CFR) -->
+    <!-- Text for the message displayed in the contextual feature recommendation popup promoting the erase private browsing feature. -->
+    <string name="erase_action_cfr_message">Atinge aici pentru a începe o nouă sesiune privată. Șterge-ți istoricul, cookie-urile — totul.</string>
+
+
     <!-- Text for the negative action button to dismiss the dialog. -->
     <string name="camera_permissions_needed_negative_button_text">Înlătură</string>
 
@@ -70,12 +95,23 @@
     <!-- Shortcut action to open new private tab -->
     <string name="home_screen_shortcut_open_new_private_tab_2">Filă privată nouă</string>
 
+    <!-- Shortcut action to open Passwords screens -->
+    <string name="home_screen_shortcut_open_password_screen">Comandă rapidă pentru parole</string>
+
     <!-- Recent Tabs -->
     <!-- Header text for jumping back into the recent tab in the home screen -->
     <string name="recent_tabs_header">Revino la această filă</string>
     <!-- Button text for showing all the tabs in the tabs tray -->
     <string name="recent_tabs_show_all">Afișează toate</string>
 
+    <!-- Text for the dropdown menu to remove a recent synced tab from the homescreen -->
+    <string name="recent_synced_tab_menu_item_remove">Elimină</string>
+
+    <!-- History Metadata -->
+    <!-- Header text for a section on the home screen that displays grouped highlights from the
+         user's browsing history, such as topics they have researched or explored on the web -->
+    <string name="history_metadata_header_2">Vizitate recent</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate backward (browsing history) -->
     <string name="browser_menu_back">Înapoi</string>
@@ -99,12 +135,16 @@
     <string name="browser_menu_library">Bibliotecă</string>
     <!-- Browser menu toggle that requests a desktop site -->
     <string name="browser_menu_desktop_site">Versiune site de desktop</string>
+    <!-- Browser menu button that reopens a private tab as a regular tab -->
+    <string name="browser_menu_open_in_regular_tab">Deschide într-o filă nouă</string>
     <!-- Browser menu toggle that adds a shortcut to the site on the device home screen. -->
     <string name="browser_menu_add_to_homescreen">Adaugă în ecranul de start</string>
     <!-- Browser menu toggle that installs a Progressive Web App shortcut to the site on the device home screen. -->
     <string name="browser_menu_install_on_homescreen">Instalează</string>
     <!-- Browser menu button that opens the find in page menu -->
     <string name="browser_menu_find_in_page">Caută în pagină</string>
+    <!-- Browser menu button that opens the translations dialog, which has options to translate the current browser page. -->
+    <string name="browser_menu_translations">Tradu pagina</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">Salvează în colecție</string>
     <!-- Browser menu button that open a share menu to share the current site -->
@@ -131,6 +171,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Editează</string>
 
+    <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
+         history and go back to the home screen. -->
+    <string name="browser_toolbar_erase">Șterge istoricul de navigare</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Limbă selectată</string>
@@ -142,8 +186,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scanează</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button">Motor de căutare</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Setări pentru motorul de căutare</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -158,13 +200,36 @@
     <!-- Search suggestion onboarding hint description text, first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="search_suggestions_onboarding_text">%s va partaja tot ce tastezi în bara de adrese cu motorul de căutare implicit.</string>
 
-    <!-- Juno first user onboarding flow experiment -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title">Desemnează %s drept browserul implicit</string>
-    <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+    <!-- Content description (not visible, for screen readers etc.): Search engine icon. The first parameter is the search engine name (for example: DuckDuckGo). -->
+    <string name="search_engine_icon_content_description" tools:ignore="UnusedResources">Motor de căutare %s</string>
+
+    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_2">Ne place să te protejăm</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Browserul nostru, susținut de o organizație non-profit, ajută la oprirea companiilor să te urmărească în secret pe web.\n\nAflă mai multe în notificarea noastră privind confidențialitatea.</string>
+    <!-- Title for sign in to sync screen. -->
+    <string name="juno_onboarding_sign_in_title_2">Păstrează-ți datele criptate când treci de pe un dispozitiv pe altul</string>
+    <!-- Description for sign in to sync screen. Nimbus experiments do not support string placeholders.
+     Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_sign_in_description_2">Când ești autentificat și sincronizat, ești mai în siguranță. Firefox criptează parolele, marcajele și multe altele.</string>
+    <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_enable_notifications_title_nimbus_2">Notificările te ajută să fii mai în siguranță cu Firefox</string>
+    <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+       Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_enable_notifications_description_nimbus_2">Trimite-ți securizat file între dispozitive și descoperă alte funcții de confidențialitate în Firefox.</string>
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Încearcă widgetul de căutare Firefox</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Desemnează Firefox drept browserul implicit</string>
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Cu Firefox pe ecranul de start vei avea acces facil la primul browser orientat pe confidențailitate care blochează elementele de urmărire inter-site-uri.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Adaugă widgetul Firefox</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Nu acum</string>
 
     <!-- Text preview for smaller sized widgets -->
     <string name="search_widget_text_short">Căutare</string>
@@ -181,12 +246,22 @@
     <string name="preferences_category_general">Generalități</string>
     <!-- Preference category for all links about Fenix -->
     <string name="preferences_category_about">Despre</string>
+    <!-- Preference category for settings related to changing the default search engine -->
+    <string name="preferences_category_select_default_search_engine">Selectează una dintre opțiuni</string>
+    <!-- Preference for settings related to managing search shortcuts for the quick search menu -->
+    <string name="preferences_manage_search_shortcuts_2">Gestionează motoarele de căutare alternative</string>
+    <!-- Summary for preference for settings related to managing search shortcuts for the quick search menu -->
+    <string name="preferences_manage_search_shortcuts_summary">Editează motoarele vizibile în meniul de căutare</string>
+    <!-- Preference category for settings related to managing search shortcuts for the quick search menu -->
+    <string name="preferences_category_engines_in_search_menu">Motoare vizibile în meniul de căutare</string>
     <!-- Preference for settings related to changing the default search engine -->
     <string name="preferences_default_search_engine">Motor de căutare implicit</string>
     <!-- Preference for settings related to Search -->
     <string name="preferences_search">Căutare</string>
-    <!-- Preference for settings related to Search address bar -->
-    <string name="preferences_search_address_bar">Bară de adrese</string>
+    <!-- Preference for settings related to Search engines -->
+    <string name="preferences_search_engines">Motoare de căutare</string>
+    <!-- Preference for settings related to Search engines suggestions-->
+    <string name="preferences_search_engines_suggestions">Sugestii de la motoarele de căutare</string>
     <!-- Preference link to rating Fenix on the Play Store -->
     <string name="preferences_rate">Evaluează pe Google Play</string>
     <!-- Preference linking to about page for Fenix
@@ -211,22 +286,18 @@
 
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accesibilitate</string>
-    <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Server personalizat pentru contul Firefox</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Server personalizat de sincronizare</string>
-    <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Server de cont Firefox/sincronizare modificat. Se închide aplicația pentru implementarea modificărilor…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Cont</string>
     <!-- Preference for changing where the toolbar is positioned -->
     <string name="preferences_toolbar">Bară de unelte</string>
     <!-- Preference for changing default theme to dark or light mode -->
     <string name="preferences_theme">Temă</string>
+    <!-- Preference for customizing the home screen -->
+    <string name="preferences_home_2">Pagină de start</string>
     <!-- Preference for settings related to visual options -->
     <string name="preferences_customize">Personalizare</string>
-    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Cont Firefox</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Reconectează-te pentru a continua sincronizarea</string>
     <!-- Preference for language -->
@@ -237,8 +308,6 @@
     <string name="preferences_data_collection">Colectare de date</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Depanare de la distanță prin USB</string>
-    <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Afișează motoare de căutare</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Afișează sugestii de căutare</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -257,6 +326,7 @@
     <string name="preferences_open_links_in_apps">Deschide linkuri în aplicații</string>
     <!-- Preference for open download with an external download manager app -->
     <string name="preferences_external_download_manager">Manager extern pentru descărcări</string>
+
     <!-- Preference for add_ons -->
     <string name="preferences_addons">Suplimente</string>
 
@@ -268,7 +338,16 @@
     <!-- Hint displayed on input field for custom collection name -->
     <string name="customize_addon_collection_hint">Numele colecției</string>
 
-    <!-- Account Preferences -->
+    <!-- Title for the customize home screen section with recently saved bookmarks. -->
+    <string name="customize_toggle_recent_bookmarks">Marcaje recente</string>
+    <!-- Title for the customize home screen section with recently visited. Recently visited is
+    a section where users see a list of tabs that they have visited in the past few days -->
+    <string name="customize_toggle_recently_visited">Vizitate recent</string>
+    <!-- Title for the customize home screen section with sponsored Pocket stories. -->
+    <string name="customize_toggle_pocket_sponsored">Povești sponsorizate</string>
+    <!-- Title for the customize home screen section with sponsored shortcuts. -->
+    <string name="customize_toggle_contile">Comenzi rapide sponsorizate</string>
+
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincronizează acum</string>
     <!-- Preference category for sync -->
@@ -403,6 +482,10 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">După o lună</string>
 
+    <!-- Option for always opening the homepage when re-opening the app -->
+    <string name="opening_screen_homepage">Pagină de start</string>
+    <!-- Option for always opening the homepage when re-opening the app after four hours of inactivity -->
+    <string name="opening_screen_after_four_hours_of_inactivity">Pagina de start după patru ore de inactivitate</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Închide manual</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -412,6 +495,11 @@
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one month-->
     <string name="close_tabs_after_one_month_summary">Închide după o lună</string>
 
+    <!-- Summary for homepage preference indicating always opening the homepage when re-opening the app -->
+    <string name="opening_screen_homepage_summary">Deschide pe pagina de start</string>
+    <!-- Summary for homepage preference indicating always opening the last-open tab when re-opening the app -->
+    <string name="opening_screen_last_tab_summary">Deschide ultima filă</string>
+
     <!-- Dialog button to confirm the removing a study. -->
     <string name="studies_restart_dialog_ok">OK</string>
 
@@ -453,7 +541,7 @@
     <!-- Text for the button to open tabs of the selected collection -->
     <string name="collection_open_tabs">Deschide filele</string>
     <!-- Text for the menu button to remove a top site -->
-	<string name="remove_top_site">Șterge</string>
+    <string name="remove_top_site">Șterge</string>
 
     <!-- Text for the menu button to delete a top site from history -->
     <string name="delete_from_history">Șterge din istoric</string>
@@ -752,13 +840,9 @@
     <!-- Subtitle for the tabs item in Delete browsing data, parameter will be replaced with the number of open tabs -->
     <string name="preferences_delete_browsing_data_tabs_subtitle">%d (de) file</string>
 
-    <!-- Title for the data and history items in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_browsing_data_title">Istoric de navigare și date site-uri</string>
     <!-- Subtitle for the data and history items in delete browsing data, parameter will be replaced with the
         number of history items the user has -->
     <string name="preferences_delete_browsing_data_browsing_data_subtitle">%d (de) adrese</string>
-    <!-- Title for the cookies item in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_cookies">Cookie-uri</string>
     <!-- Subtitle for the cookies item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cookies_subtitle">Vei fi deconectat(ă) de pe majoritatea site-urilor</string>
     <!-- Title for the cached images and files item in Delete browsing data -->
@@ -787,31 +871,11 @@
     <!-- Text for the snackbar to show the user that the deletion of browsing data is in progress -->
     <string name="deleting_browsing_data_in_progress">Se șterg datele de navigare…</string>
 
+    <!-- Onboarding -->
     <!-- text to display in the snackbar once account is signed-in -->
     <string name="onboarding_firefox_account_sync_is_on">Sync este activat</string>
-    <!-- text for tracking protection radio button option for standard level of blocking -->
-    <string name="onboarding_tracking_protection_standard_button_2">Standard (implicit)</string>
-    <!-- text for tracking protection radio button option for strict level of blocking -->
-    <string name="onboarding_tracking_protection_strict_option">Strictă</string>
-
-    <!-- Text for the button to read the privacy notice -->
-    <string name="onboarding_privacy_notice_read_button">Citește notificarea noastră privind confidențialitatea</string>
-
-    <!-- text for the button to finish onboarding -->
-    <string name="onboarding_finish">Începe navigarea</string>
 
     <!-- Onboarding theme -->
-    <!-- text for the theme picker onboarding card header -->
-    <string name="onboarding_theme_picker_header">Alege o temă</string>
-    <!-- Automatic theme setting (will follow device setting) -->
-    <string name="onboarding_theme_automatic_title">Automat</string>
-    <!-- Summary of automatic theme setting (will follow device setting) -->
-    <string name="onboarding_theme_automatic_summary">Se adaptează la setările dispozitivului</string>
-    <!-- Theme setting for dark mode -->
-    <string name="onboarding_theme_dark_title">Temă întunecată</string>
-    <!-- Theme setting for light mode -->
-    <string name="onboarding_theme_light_title">Temă deschisă</string>
-
     <!-- Text shown in snackbar when multiple tabs have been sent to device -->
     <string name="sync_sent_tabs_snackbar">File trimise!</string>
     <!-- Text shown in snackbar when one tab has been sent to device  -->
@@ -844,11 +908,7 @@
     <string name="etp_settings">Setări de protecție</string>
     <!-- Preference title for enhanced tracking protection settings -->
     <string name="preference_enhanced_tracking_protection">Protecție îmbunătățită împotriva urmăririi</string>
-    <!-- Title for the description of enhanced tracking protection -->
-    <string name="preference_enhanced_tracking_protection_explanation_title" moz:removedIn="114" tools:ignore="UnusedResources">Navighează fără să fii urmărit(ă)</string>
 
-    <!-- Description of enhanced tracking protection. The first parameter is the name of the application (For example: Fenix) -->
-    <string name="preference_enhanced_tracking_protection_explanation" moz:removedIn="114" tools:ignore="UnusedResources">Păstrează-ți datele pentru tine. %s te protejează de multe dintre cele mai frecvente elemente de urmărire care monitorizează ce faci online.</string>
     <!-- Text displayed that links to website about enhanced tracking protection -->
     <string name="preference_enhanced_tracking_protection_explanation_learn_more">Află mai multe</string>
     <!-- Preference for enhanced tracking protection for the standard protection settings -->
@@ -969,6 +1029,9 @@
     <!-- Placeholder text for the TextView in the Add to Homescreen dialog -->
     <string name="add_to_homescreen_text_placeholder">Denumire comandă rapidă</string>
 
+    <!-- Describes the add to homescreen functionality -->
+    <string name="add_to_homescreen_description_2">Poți adăuga cu ușurință acest site web în ecranul de start al dispozitivului pentru acces instant și o navigare mai rapidă, ca și cum ai fi într-o aplicație.</string>
+
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Date de autentificare și parole</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
@@ -1047,21 +1110,11 @@
     <string name="search_engine_add_custom_search_engine_title">Adaugă un motor de căutare</string>
     <!-- Title of the Edit search engine screen -->
     <string name="search_engine_edit_custom_search_engine_title">Editează motorul de căutare</string>
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
-    <string name="search_engine_add_button_content_description">Adaugă</string>
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Salvează</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Editează</string>
     <!-- Text for the menu button to delete a search engine -->
     <string name="search_engine_delete">Șterge</string>
 
-    <!-- Text for the button to create a custom search engine on the Add search engine screen -->
-    <string name="search_add_custom_engine_label_other">Altele</string>
-    <!-- Placeholder text shown in the Search Engine Name TextField before a user enters text -->
-    <string name="search_add_custom_engine_name_hint">Denumire</string>
-    <!-- Placeholder text shown in the Search String TextField before a user enters text -->
-    <string name="search_add_custom_engine_search_string_hint">Șir de căutare de utilizat</string>
     <!-- Description text for the Search String TextField. The %s is part of the string -->
     <string name="search_add_custom_engine_search_string_example" formatted="false">Înlocuiește interogarea cu „%s”. Exemplu: \nhttps://www.google.com/search?q=%s</string>
     <!-- Accessibility description for the form in which details about the custom search engine are entered -->
@@ -1157,11 +1210,11 @@
 
     <!-- Label for the preference to show the shortcuts for the most visited top sites on the homepage -->
     <string name="top_sites_toggle_top_recent_sites_4">Comenzi rapide</string>
-	<!-- Title text displayed in the rename top site dialog. -->
-	<string name="top_sites_rename_dialog_title">Nume</string>
+    <!-- Title text displayed in the rename top site dialog. -->
+    <string name="top_sites_rename_dialog_title">Nume</string>
 
     <!-- Button caption to confirm the renaming of the top site. -->
-	<string name="top_sites_rename_dialog_ok">OK</string>
+    <string name="top_sites_rename_dialog_ok">OK</string>
 
     <!-- Inactive tabs in the tabs tray -->
     <!-- Title text displayed in the tabs tray when a tab has been unused for 14 days. -->
@@ -1170,4 +1223,6 @@
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Elimină</string>
 
+    <!-- Translations feature-->
+
     </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 6a8a722d6..78fe06934 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2205,6 +2205,9 @@
     <string name="other_default_search_engine_suggestion_header">%s 搜尋</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">切換您的預設瀏覽器</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">設定使用 Firefox 自動開啟網站、郵件、簡訊當中的鏈結。</string>
 
     <!-- Content description for close button in collection placeholder. -->

From 95b74cd8c61f47530c843c232ec6780c8bcf506c Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Wed, 7 Feb 2024 11:41:41 +0200
Subject: [PATCH 125/222] Bug 1874662 - Fix flaky closeAllTabsTest UI tests

---
 .../java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
index 62842aa21..38d5a4f84 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
@@ -144,7 +144,12 @@ class HomeScreenRobot {
     }
 
     fun verifyTabCounter(numberOfOpenTabs: String) =
-        assertUIObjectExists(tabCounter(numberOfOpenTabs))
+        onView(
+            allOf(
+                withId(R.id.counter_text),
+                withText(numberOfOpenTabs),
+            ),
+        ).check(matches(isDisplayed()))
 
     fun verifyWallpaperImageApplied(isEnabled: Boolean) =
         assertUIObjectExists(itemWithResId("$packageName:id/wallpaperImageView"), exists = isEnabled)

From 5ad9a003a685bd4f827e210ffb0d7732e003011f Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Wed, 7 Feb 2024 16:11:02 +0200
Subject: [PATCH 126/222] Bug 1879288 - Add missing pairs of logs to
 BrowserRobot

---
 .../mozilla/fenix/ui/robots/BrowserRobot.kt   | 172 +++++++++++++-----
 1 file changed, 124 insertions(+), 48 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
index c873372f2..d98e22a9c 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
@@ -71,6 +71,7 @@ class BrowserRobot {
 
     fun verifyCurrentPrivateSession(context: Context) {
         val selectedTab = context.components.core.store.state.selectedTab
+        Log.i(TAG, "verifyCurrentPrivateSession: Trying to verify that current browsing session is private")
         assertTrue("Current session is private", selectedTab?.content?.private ?: false)
         Log.i(TAG, "verifyCurrentPrivateSession: Verified that current browsing session is private")
     }
@@ -228,6 +229,7 @@ class BrowserRobot {
     fun verifyNavURLBarHidden() = assertUIObjectIsGone(navURLBar())
 
     fun verifyMenuButton() {
+        Log.i(TAG, "verifyMenuButton: Trying to verify main menu button is displayed")
         threeDotButton().check(matches(isDisplayed()))
         Log.i(TAG, "verifyMenuButton: Verified main menu button is displayed")
     }
@@ -249,6 +251,7 @@ class BrowserRobot {
         assertUIObjectExists(itemWithResId("$packageName:id/notification_dot"))
 
     fun dismissContentContextMenu() {
+        Log.i(TAG, "dismissContentContextMenu: Trying to click device back button")
         mDevice.pressBack()
         Log.i(TAG, "dismissContentContextMenu: Clicked device back button")
         assertUIObjectExists(itemWithResId("$packageName:id/engineView"))
@@ -280,7 +283,9 @@ class BrowserRobot {
     fun clickSubmitLoginButton() {
         clickPageObject(itemWithResId("submit"))
         assertUIObjectIsGone(itemWithResId("submit"))
+        Log.i(TAG, "clickSubmitLoginButton: Waiting for device to be idle for $waitingTimeLong ms")
         mDevice.waitForIdle(waitingTimeLong)
+        Log.i(TAG, "clickSubmitLoginButton: Waited for device to be idle for $waitingTimeLong ms")
     }
 
     fun enterPassword(password: String) {
@@ -323,11 +328,13 @@ class BrowserRobot {
         // failing to swipe on Firebase sometimes, so it tries again
         try {
             Log.i(TAG, "swipeNavBarRight: Try block")
+            Log.i(TAG, "swipeNavBarRight: Trying to perform swipe right action on navigation toolbar")
             navURLBar().swipeRight(2)
             Log.i(TAG, "swipeNavBarRight: Performed swipe right action on navigation toolbar")
             assertUIObjectIsGone(itemWithText(tabUrl))
         } catch (e: AssertionError) {
             Log.i(TAG, "swipeNavBarRight: AssertionError caught, executing fallback methods")
+            Log.i(TAG, "swipeNavBarRight: Trying to perform swipe right action on navigation toolbar")
             navURLBar().swipeRight(2)
             Log.i(TAG, "swipeNavBarRight: Performed swipe right action on navigation toolbar")
             assertUIObjectIsGone(itemWithText(tabUrl))
@@ -338,11 +345,13 @@ class BrowserRobot {
         // failing to swipe on Firebase sometimes, so it tries again
         try {
             Log.i(TAG, "swipeNavBarLeft: Try block")
+            Log.i(TAG, "swipeNavBarLeft: Trying to perform swipe left action on navigation toolbar")
             navURLBar().swipeLeft(2)
             Log.i(TAG, "swipeNavBarLeft: Performed swipe left action on navigation toolbar")
             assertUIObjectIsGone(itemWithText(tabUrl))
         } catch (e: AssertionError) {
             Log.i(TAG, "swipeNavBarLeft: AssertionError caught, executing fallback methods")
+            Log.i(TAG, "swipeNavBarLeft: Trying to perform swipe left action on navigation toolbar")
             navURLBar().swipeLeft(2)
             Log.i(TAG, "swipeNavBarLeft: Performed swipe left action on navigation toolbar")
             assertUIObjectIsGone(itemWithText(tabUrl))
@@ -354,6 +363,7 @@ class BrowserRobot {
             try {
                 Log.i(TAG, "clickSuggestedLoginsButton: Started try #$i")
                 mDevice.waitForObjects(suggestedLogins())
+                Log.i(TAG, "clickSuggestedLoginsButton: Trying to click suggested logins button")
                 suggestedLogins().click()
                 Log.i(TAG, "clickSuggestedLoginsButton: Clicked suggested logins button")
                 mDevice.waitForObjects(suggestedLogins())
@@ -370,6 +380,7 @@ class BrowserRobot {
     }
 
     fun setTextForApartmentTextBox(apartment: String) {
+        Log.i(TAG, "setTextForApartmentTextBox: Trying to set the text for the apartment text box to: $apartment")
         itemWithResId("apartment").setText(apartment)
         Log.i(TAG, "setTextForApartmentTextBox: The text for the apartment text box was set to: $apartment")
     }
@@ -388,8 +399,9 @@ class BrowserRobot {
             try {
                 Log.i(TAG, "clickSelectAddressButton: Started try #$i")
                 assertUIObjectExists(selectAddressButton())
+                Log.i(TAG, "clickSelectAddressButton: Trying to click the select address button and wait for $waitingTime ms for a new window")
                 selectAddressButton().clickAndWaitForNewWindow(waitingTime)
-                Log.i(TAG, "clickSelectAddressButton: Clicked select address button")
+                Log.i(TAG, "clickSelectAddressButton: Clicked the select address button and waited for $waitingTime ms for a new window")
 
                 break
             } catch (e: AssertionError) {
@@ -409,37 +421,51 @@ class BrowserRobot {
     fun verifySelectAddressButtonExists(exists: Boolean) = assertUIObjectExists(selectAddressButton(), exists = exists)
 
     fun changeCreditCardExpiryDate(expiryDate: String) {
+        Log.i(TAG, "changeCreditCardExpiryDate: Trying to set credit card expiry date to: $expiryDate")
         itemWithResId("expiryMonthAndYear").setText(expiryDate)
         Log.i(TAG, "changeCreditCardExpiryDate: Credit card expiry date was set to: $expiryDate")
     }
 
     fun clickCreditCardNumberTextBox() {
-        Log.i(TAG, "clickCreditCardNumberTextBox: Waiting for credit card number text box")
+        Log.i(TAG, "clickCreditCardNumberTextBox: Waiting for $waitingTime ms until finding the credit card number text box")
         mDevice.wait(Until.findObject(By.res("cardNumber")), waitingTime)
+        Log.i(TAG, "clickCreditCardNumberTextBox: Waited for $waitingTime ms until the credit card number text box was found")
+        Log.i(TAG, "clickCreditCardNumberTextBox: Trying to click the credit card number text box")
         mDevice.findObject(By.res("cardNumber")).click()
-        Log.i(TAG, "clickCreditCardNumberTextBox: Clicked credit card number text box")
+        Log.i(TAG, "clickCreditCardNumberTextBox: Clicked the credit card number text box")
+        Log.i(TAG, "clickCreditCardNumberTextBox: Waiting for $waitingTimeShort ms for $appName window to be updated")
         mDevice.waitForWindowUpdate(appName, waitingTimeShort)
+        Log.i(TAG, "clickCreditCardNumberTextBox: Waited for $waitingTimeShort ms for $appName window to be updated")
     }
 
     fun clickCreditCardFormSubmitButton() {
+        Log.i(TAG, "clickCreditCardFormSubmitButton: Trying to click the credit card form submit button and wait for $waitingTime ms for a new window")
         itemWithResId("submit").clickAndWaitForNewWindow(waitingTime)
-        Log.i(TAG, "clickCreditCardFormSubmitButton: Clicked credit card form submit button")
+        Log.i(TAG, "clickCreditCardFormSubmitButton: Clicked the credit card form submit button and waited for $waitingTime ms for a new window")
     }
 
     fun fillAndSaveCreditCard(cardNumber: String, cardName: String, expiryMonthAndYear: String) {
+        Log.i(TAG, "fillAndSaveCreditCard: Tying to set credit card number to: $cardNumber")
         itemWithResId("cardNumber").setText(cardNumber)
-        Log.i(TAG, "fillAndSaveCreditCard: Set card number to: $cardNumber")
+        Log.i(TAG, "fillAndSaveCreditCard: Credit card number was set to: $cardNumber")
         mDevice.waitForIdle(waitingTime)
+        Log.i(TAG, "fillAndSaveCreditCard: Trying to set credit card name to: $cardName")
         itemWithResId("nameOnCard").setText(cardName)
-        Log.i(TAG, "fillAndSaveCreditCard: Set card name to: $cardName")
+        Log.i(TAG, "fillAndSaveCreditCard: Credit card name was set to: $cardName")
         mDevice.waitForIdle(waitingTime)
+        Log.i(TAG, "fillAndSaveCreditCard: Trying to set credit card expiry month and year to: $expiryMonthAndYear")
         itemWithResId("expiryMonthAndYear").setText(expiryMonthAndYear)
-        Log.i(TAG, "fillAndSaveCreditCard: Set expiry month and year to: $expiryMonthAndYear")
+        Log.i(TAG, "fillAndSaveCreditCard: Credit card expiry month and year were set to: $expiryMonthAndYear")
+        Log.i(TAG, "fillAndSaveCreditCard: Waiting for device to be idle for $waitingTime ms")
         mDevice.waitForIdle(waitingTime)
+        Log.i(TAG, "fillAndSaveCreditCard: Waited for device to be idle for $waitingTime ms")
+        Log.i(TAG, "fillAndSaveCreditCard: Trying to click the credit card form submit button and wait for $waitingTime ms for a new window")
         itemWithResId("submit").clickAndWaitForNewWindow(waitingTime)
-        Log.i(TAG, "fillAndSaveCreditCard: Clicked credit card form submit button")
+        Log.i(TAG, "fillAndSaveCreditCard: Clicked the credit card form submit button and waited for $waitingTime ms for a new window")
         waitForPageToLoad()
+        Log.i(TAG, "fillAndSaveCreditCard: Waiting for $waitingTime ms for $packageName window to be updated")
         mDevice.waitForWindowUpdate(packageName, waitingTime)
+        Log.i(TAG, "fillAndSaveCreditCard: Waited for $waitingTime ms for $packageName window to be updated")
     }
 
     fun verifyUpdateOrSaveCreditCardPromptExists(exists: Boolean) =
@@ -463,7 +489,9 @@ class BrowserRobot {
     }
 
     fun verifySuggestedUserName(userName: String) {
+        Log.i(TAG, "verifySuggestedUserName: Waiting for $waitingTime ms for suggested logins fragment to exist")
         itemWithResId("$packageName:id/mozac_feature_login_multiselect_expand").waitForExists(waitingTime)
+        Log.i(TAG, "verifySuggestedUserName: Waited for $waitingTime ms for suggested logins fragment to exist")
         assertUIObjectExists(itemContainingText(userName))
     }
 
@@ -548,43 +576,54 @@ class BrowserRobot {
 
     fun verifyCookiesProtectionHintIsDisplayed(composeTestRule: HomeActivityComposeTestRule, isDisplayed: Boolean) {
         if (isDisplayed) {
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Trying to verify that the total cookie protection message is displayed")
             composeTestRule.onNodeWithTag("tcp_cfr.message").assertIsDisplayed()
             Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified total cookie protection message is displayed")
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Trying to verify that the total cookie protection learn more link is displayed")
             composeTestRule.onNodeWithTag("tcp_cfr.action").assertIsDisplayed()
-            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified total cookie protection learn more link is displayed")
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified that the total cookie protection learn more link is displayed")
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Trying to verify that the total cookie protection dismiss button is displayed")
             composeTestRule.onNodeWithTag("cfr.dismiss").assertIsDisplayed()
             Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified total cookie protection dismiss button is displayed")
         } else {
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Trying to verify that the total cookie protection message does not exist")
             composeTestRule.onNodeWithTag("tcp_cfr.message").assertDoesNotExist()
-            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified total cookie protection message does not exist")
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified that the total cookie protection message does not exist")
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Trying to verify that the total cookie protection learn more link does not exist")
             composeTestRule.onNodeWithTag("tcp_cfr.action").assertDoesNotExist()
             Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified total cookie protection learn more link does not exist")
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Trying to verify that the total cookie protection dismiss button does not exist")
             composeTestRule.onNodeWithTag("cfr.dismiss").assertDoesNotExist()
-            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified total cookie protection dismiss button does not exist")
+            Log.i(TAG, "verifyCookiesProtectionHintIsDisplayed: Verified that the total cookie protection dismiss button does not exist")
         }
     }
 
     fun clickTCPCFRLearnMore(composeTestRule: HomeActivityComposeTestRule) {
+        Log.i(TAG, "clickTCPCFRLearnMore: Trying to click the total cookie protection learn more link")
         composeTestRule.onNodeWithTag("tcp_cfr.action").performClick()
         Log.i(TAG, "clickTCPCFRLearnMore: Clicked total cookie protection learn more link")
     }
 
     fun dismissTCPCFRPopup(composeTestRule: HomeActivityComposeTestRule) {
+        Log.i(TAG, "dismissTCPCFRPopup: Trying to click the total cookie protection dismiss button")
         composeTestRule.onNodeWithTag("cfr.dismiss").performClick()
         Log.i(TAG, "dismissTCPCFRPopup: Clicked total cookie protection dismiss button")
     }
 
     fun verifyShouldShowCFRTCP(shouldShow: Boolean, settings: Settings) {
         if (shouldShow) {
+            Log.i(TAG, "verifyShouldShowCFRTCP: Trying to verify that the TCP CFR should be shown")
             assertTrue(settings.shouldShowTotalCookieProtectionCFR)
-            Log.i(TAG, "verifyShouldShowCFRTCP: Verified that TCP CFR should be shown")
+            Log.i(TAG, "verifyShouldShowCFRTCP: Verified that the TCP CFR should be shown")
         } else {
+            Log.i(TAG, "verifyShouldShowCFRTCP: Trying to verify that the TCP CFR should not be shown")
             assertFalse(settings.shouldShowTotalCookieProtectionCFR)
-            Log.i(TAG, "verifyShouldShowCFRTCP: Verified that TCP CFR should not be shown")
+            Log.i(TAG, "verifyShouldShowCFRTCP: Verified that the TCP CFR should not be shown")
         }
     }
 
     fun selectTime(hour: Int, minute: Int) {
+        Log.i(TAG, "selectTime: Trying to select time picker hour: $hour and minute: $minute")
         onView(
             isAssignableFrom(TimePicker::class.java),
         ).inRoot(
@@ -674,17 +713,18 @@ class BrowserRobot {
         for (i in 1..RETRY_COUNT) {
             try {
                 Log.i(TAG, "verifySelectedDropDownOption: Started try #$i")
-                Log.i(TAG, "verifySelectedDropDownOption: Looking for \"Submit drop down option\" form button")
+                Log.i(TAG, "verifySelectedDropDownOption: Waiting for $waitingTime ms for \"Submit drop down option\" form button to exist")
                 mDevice.findObject(
                     UiSelector()
                         .textContains("Submit drop down option")
                         .resourceId("submitOption"),
                 ).waitForExists(waitingTime)
-
+                Log.i(TAG, "verifySelectedDropDownOption: Waited for $waitingTime ms for \"Submit drop down option\" form button to exist")
                 assertUIObjectExists(itemContainingText("Selected option is: $optionName"))
 
                 break
             } catch (e: AssertionError) {
+                Log.i(TAG, "verifySelectedDropDownOption: AssertionError caught, executing fallback methods")
                 Log.e(TAG, "Selected option isn't displayed ${e.localizedMessage}")
 
                 clickPageObject(itemWithResId("dropDown"))
@@ -704,16 +744,18 @@ class BrowserRobot {
 
     fun verifyCookieBannerExists(exists: Boolean) {
         for (i in 1..RETRY_COUNT) {
-            Log.i(TAG, "verifyCookieBannerExists: For loop: $i")
+            Log.i(TAG, "verifyCookieBannerExists: Started try #$i")
             try {
                 // Wait for the blocker to kick-in and make the cookie banner disappear
+                Log.i(TAG, "verifyCookieBannerExists: Waiting for $waitingTime ms for cookie banner to be gone")
                 itemWithResId("CybotCookiebotDialog").waitUntilGone(waitingTime)
-                Log.i(TAG, "verifyCookieBannerExists: Waiting for window update")
+                Log.i(TAG, "verifyCookieBannerExists: Waited for $waitingTime ms for cookie banner to be gone")
                 // Assert that the blocker properly dismissed the cookie banner
                 assertUIObjectExists(itemWithResId("CybotCookiebotDialog"), exists = exists)
 
                 break
             } catch (e: AssertionError) {
+                Log.i(TAG, "verifyCookieBannerExists: AssertionError caught, executing fallback methods")
                 if (i == RETRY_COUNT) {
                     throw e
                 }
@@ -840,11 +882,12 @@ class BrowserRobot {
         assertUIObjectExists(itemWithDescription("Close"))
 
     fun clickOpenLinksInAppsDismissCFRButton() {
+        Log.i(TAG, "clickOpenLinksInAppsDismissCFRButton: Trying to click the open links in apps banner \"Dismiss\" button")
         itemWithResIdContainingText(
             "$packageName:id/dismiss",
             getStringResource(R.string.open_in_app_cfr_negative_button_text),
         ).click()
-        Log.i(TAG, "clickOpenLinksInAppsDismissCFRButton: Clicked open links in apps banner \"Dismiss\" button")
+        Log.i(TAG, "clickOpenLinksInAppsDismissCFRButton: Clicked the open links in apps banner \"Dismiss\" button")
     }
 
     fun clickTakeSurveyButton() {
@@ -871,6 +914,7 @@ class BrowserRobot {
     }
 
     fun longClickToolbar() {
+        Log.i(TAG, "longClickToolbar: Trying to long click the toolbar")
         onView(withId(R.id.mozac_browser_toolbar_url_view)).perform(longClick())
         Log.i(TAG, "longClickToolbar: Long clicked the toolbar")
     }
@@ -903,27 +947,31 @@ class BrowserRobot {
     }
 
     fun clickStayInPrivateBrowsingPromptButton() {
+        Log.i(TAG, "clickStayInPrivateBrowsingPromptButton: Trying to click the \"STAY IN PRIVATE BROWSING\" prompt button")
         itemWithResIdContainingText(
             "$packageName:id/deny_button",
             getStringResource(R.string.mozac_feature_downloads_cancel_active_private_downloads_deny),
         ).click()
-        Log.i(TAG, "clickStayInPrivateBrowsingPromptButton: Clicked \"STAY IN PRIVATE BROWSING\" prompt button")
+        Log.i(TAG, "clickStayInPrivateBrowsingPromptButton: Clicked the \"STAY IN PRIVATE BROWSING\" prompt button")
     }
 
     fun clickCancelPrivateDownloadsPromptButton() {
+        Log.i(TAG, "clickCancelPrivateDownloadsPromptButton: Trying to click the \"CANCEL DOWNLOADS\" prompt button")
         itemWithResIdContainingText(
             "$packageName:id/accept_button",
             getStringResource(R.string.mozac_feature_downloads_cancel_active_downloads_accept),
         ).click()
-        Log.i(TAG, "clickCancelPrivateDownloadsPromptButton: Clicked \"CANCEL DOWNLOADS\" prompt button")
-
+        Log.i(TAG, "clickCancelPrivateDownloadsPromptButton: Clicked the \"CANCEL DOWNLOADS\" prompt button")
+        Log.i(TAG, "clickCancelPrivateDownloadsPromptButton: Waiting for $waitingTime ms for $packageName window to be updated")
         mDevice.waitForWindowUpdate(packageName, waitingTime)
+        Log.i(TAG, "clickCancelPrivateDownloadsPromptButton: Waited for $waitingTime ms for $packageName window to be updated")
     }
 
     fun fillPdfForm(name: String) {
         // Set PDF form text for the text box
+        Log.i(TAG, "fillPdfForm: Trying to set the text of the PDF form text box to: $name")
         itemWithResId("pdfjs_internal_id_10R").setText(name)
-        Log.i(TAG, "fillPdfForm: Set PDF form text box text to: $name")
+        Log.i(TAG, "fillPdfForm: PDF form text box text was set to: $name")
         mDevice.waitForWindowUpdate(packageName, waitingTime)
         if (
             !itemWithResId("pdfjs_internal_id_11R").exists() &&
@@ -932,18 +980,22 @@ class BrowserRobot {
                 .contains("mInputShown=true")
         ) {
             // Close the keyboard
+            Log.i(TAG, "fillPdfForm: Trying to close the keyboard using device back button")
             mDevice.pressBack()
-            Log.i(TAG, "fillPdfForm: Closing the keyboard using device back button")
+            Log.i(TAG, "fillPdfForm: Closed the keyboard using device back button")
         }
         // Click PDF form check box
+        Log.i(TAG, "fillPdfForm: Trying to click the PDF form check box")
         itemWithResId("pdfjs_internal_id_11R").click()
         Log.i(TAG, "fillPdfForm: Clicked PDF form check box")
     }
 
     class Transition {
         fun openThreeDotMenu(interact: ThreeDotMenuMainRobot.() -> Unit): ThreeDotMenuMainRobot.Transition {
+            Log.i(TAG, "openThreeDotMenu: Waiting for device to be idle for $waitingTime ms")
             mDevice.waitForIdle(waitingTime)
             Log.i(TAG, "openThreeDotMenu: Device was idle for $waitingTime ms")
+            Log.i(TAG, "openThreeDotMenu: Trying to click the main menu button")
             threeDotButton().perform(click())
             Log.i(TAG, "openThreeDotMenu: Clicked the main menu button")
 
@@ -953,8 +1005,9 @@ class BrowserRobot {
 
         fun openNavigationToolbar(interact: NavigationToolbarRobot.() -> Unit): NavigationToolbarRobot.Transition {
             clickPageObject(navURLBar())
-            Log.i(TAG, "openNavigationToolbar: Looking for search bar")
+            Log.i(TAG, "openNavigationToolbar: Waiting for $waitingTime ms for for search bar to exist")
             searchBar().waitForExists(waitingTime)
+            Log.i(TAG, "openNavigationToolbar: Waited for $waitingTime ms for for search bar to exist")
 
             NavigationToolbarRobot().interact()
             return NavigationToolbarRobot.Transition()
@@ -971,7 +1024,7 @@ class BrowserRobot {
                         ),
                         waitingTime,
                     )
-
+                    Log.i(TAG, "openTabDrawer: Trying to click the tab counter button")
                     tabsCounter().click()
                     Log.i(TAG, "openTabDrawer: Clicked the tab counter button")
                     assertUIObjectExists(itemWithResId("$packageName:id/new_tab_button"))
@@ -982,8 +1035,9 @@ class BrowserRobot {
                     if (i == RETRY_COUNT) {
                         throw e
                     } else {
+                        Log.i(TAG, "openTabDrawer: Waiting for device to be idle")
                         mDevice.waitForIdle()
-                        Log.i(TAG, "openTabDrawer: Device waited to be idle")
+                        Log.i(TAG, "openTabDrawer: Waited for device to be idle")
                     }
                 }
             }
@@ -1005,10 +1059,10 @@ class BrowserRobot {
                         ),
                         waitingTime,
                     )
-
+                    Log.i(TAG, "openComposeTabDrawer: Trying to click the tab counter button")
                     tabsCounter().click()
                     Log.i(TAG, "openComposeTabDrawer: Clicked the tab counter button")
-
+                    Log.i(TAG, "openComposeTabDrawer: Trying to verify the tabs tray exists")
                     composeTestRule.onNodeWithTag(TabsTrayTestTag.tabsTray).assertExists()
                     Log.i(TAG, "openComposeTabDrawer: Verified the tabs tray exists")
 
@@ -1018,22 +1072,24 @@ class BrowserRobot {
                     if (i == RETRY_COUNT) {
                         throw e
                     } else {
+                        Log.i(TAG, "openComposeTabDrawer: Waiting for device to be idle")
                         mDevice.waitForIdle()
-                        Log.i(TAG, "openComposeTabDrawer: Device waited to be idle")
+                        Log.i(TAG, "openComposeTabDrawer: Waited for device to be idle")
                     }
                 }
             }
-
+            Log.i(TAG, "openComposeTabDrawer: Trying to verify the tabs tray new tab FAB button exists")
             composeTestRule.onNodeWithTag(TabsTrayTestTag.fab).assertExists()
-            Log.i(TAG, "openComposeTabDrawer: Verified the tabs tray new tab button exists")
+            Log.i(TAG, "openComposeTabDrawer: Verified the tabs tray new tab FAB button exists")
 
             ComposeTabDrawerRobot(composeTestRule).interact()
             return ComposeTabDrawerRobot.Transition(composeTestRule)
         }
 
         fun openNotificationShade(interact: NotificationRobot.() -> Unit): NotificationRobot.Transition {
+            Log.i(TAG, "openNotificationShade: Trying to open the notification tray")
             mDevice.openNotification()
-            Log.i(TAG, "openNotificationShade: Opened notification tray")
+            Log.i(TAG, "openNotificationShade: Opened the notification tray")
 
             NotificationRobot().interact()
             return NotificationRobot.Transition()
@@ -1041,8 +1097,7 @@ class BrowserRobot {
 
         fun goToHomescreen(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
             clickPageObject(itemWithDescription("Home screen"))
-
-            Log.i(TAG, "goToHomescreen: Looking for home screen layout or jump back in contextual hint")
+            Log.i(TAG, "goToHomescreen: Waiting for $waitingTime ms for for home screen layout or jump back in contextual hint to exist")
             mDevice.findObject(UiSelector().resourceId("$packageName:id/homeLayout"))
                 .waitForExists(waitingTime) ||
                 mDevice.findObject(
@@ -1050,6 +1105,7 @@ class BrowserRobot {
                         getStringResource(R.string.onboarding_home_screen_jump_back_contextual_hint_2),
                     ),
                 ).waitForExists(waitingTime)
+            Log.i(TAG, "goToHomescreen: Waited for $waitingTime ms for for home screen layout or jump back in contextual hint to exist")
 
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
@@ -1058,7 +1114,7 @@ class BrowserRobot {
         fun goToHomescreenWithComposeTopSites(composeTestRule: HomeActivityComposeTestRule, interact: ComposeTopSitesRobot.() -> Unit): ComposeTopSitesRobot.Transition {
             clickPageObject(itemWithDescription("Home screen"))
 
-            Log.i(TAG, "goToHomescreenWithComposeTopSites: Looking for home screen layout or jump back in contextual hint")
+            Log.i(TAG, "goToHomescreenWithComposeTopSites: Waiting for $waitingTime ms for for home screen layout or jump back in contextual hint to exist")
             mDevice.findObject(UiSelector().resourceId("$packageName:id/homeLayout"))
                 .waitForExists(waitingTime) ||
                 mDevice.findObject(
@@ -1066,12 +1122,14 @@ class BrowserRobot {
                         getStringResource(R.string.onboarding_home_screen_jump_back_contextual_hint_2),
                     ),
                 ).waitForExists(waitingTime)
+            Log.i(TAG, "goToHomescreenWithComposeTopSites: Waited for $waitingTime ms for for home screen layout or jump back in contextual hint to exist")
 
             ComposeTopSitesRobot(composeTestRule).interact()
             return ComposeTopSitesRobot.Transition(composeTestRule)
         }
 
         fun goBack(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
+            Log.i(TAG, "goBack: Trying to click device back button")
             mDevice.pressBack()
             Log.i(TAG, "goBack: Clicked device back button")
 
@@ -1081,7 +1139,9 @@ class BrowserRobot {
 
         fun clickTabCrashedCloseButton(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
             clickPageObject(itemWithText("Close tab"))
+            Log.i(TAG, "clickTabCrashedCloseButton: Waiting for device to be idle")
             mDevice.waitForIdle()
+            Log.i(TAG, "clickTabCrashedCloseButton: Waited for device to be idle")
 
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
@@ -1167,50 +1227,56 @@ class BrowserRobot {
         }
 
         fun openSiteSecuritySheet(interact: SiteSecurityRobot.() -> Unit): SiteSecurityRobot.Transition {
-            Log.i(TAG, "openSiteSecuritySheet: Looking for site security toolbar button")
+            Log.i(TAG, "openSiteSecuritySheet: Waiting for $waitingTime ms for site security toolbar button to exist")
             siteSecurityToolbarButton().waitForExists(waitingTime)
+            Log.i(TAG, "openSiteSecuritySheet: Waited for $waitingTime ms for site security toolbar button to exist")
+            Log.i(TAG, "openSiteSecuritySheet: Trying to click the site security toolbar button and wait for $waitingTime ms for a new window")
             siteSecurityToolbarButton().clickAndWaitForNewWindow(waitingTime)
-            Log.i(TAG, "openSiteSecuritySheet: Clicked site security toolbar button")
+            Log.i(TAG, "openSiteSecuritySheet: Clicked the site security toolbar button and waited for $waitingTime ms for a new window")
 
             SiteSecurityRobot().interact()
             return SiteSecurityRobot.Transition()
         }
 
         fun clickManageAddressButton(interact: SettingsSubMenuAutofillRobot.() -> Unit): SettingsSubMenuAutofillRobot.Transition {
+            Log.i(TAG, "clickManageAddressButton: Trying to click the manage address button and wait for $waitingTime ms for a new window")
             itemWithResId("$packageName:id/manage_addresses")
                 .clickAndWaitForNewWindow(waitingTime)
-            Log.i(TAG, "clickManageAddressButton: Clicked manage address button")
+            Log.i(TAG, "clickManageAddressButton: Clicked the manage address button and waited for $waitingTime ms for a new window")
 
             SettingsSubMenuAutofillRobot().interact()
             return SettingsSubMenuAutofillRobot.Transition()
         }
 
         fun clickManageCreditCardsButton(interact: SettingsSubMenuAutofillRobot.() -> Unit): SettingsSubMenuAutofillRobot.Transition {
+            Log.i(TAG, "clickManageCreditCardsButton: Trying to click the manage credit cards button and wait for $waitingTime ms for a new window")
             itemWithResId("$packageName:id/manage_credit_cards")
                 .clickAndWaitForNewWindow(waitingTime)
-            Log.i(TAG, "clickManageCreditCardsButton: Clicked manage credit cards button")
+            Log.i(TAG, "clickManageCreditCardsButton: Clicked the manage credit cards button and waited for $waitingTime ms for a new window")
 
             SettingsSubMenuAutofillRobot().interact()
             return SettingsSubMenuAutofillRobot.Transition()
         }
 
         fun clickOpenLinksInAppsGoToSettingsCFRButton(interact: SettingsRobot.() -> Unit): SettingsRobot.Transition {
+            Log.i(TAG, "clickOpenLinksInAppsGoToSettingsCFRButton: Trying to click the \"Go to settings\" open links in apps CFR button and wait for $waitingTime ms for a new window")
             itemWithResIdContainingText(
                 "$packageName:id/action",
                 getStringResource(R.string.open_in_app_cfr_positive_button_text),
             ).clickAndWaitForNewWindow(waitingTime)
-            Log.i(TAG, "clickOpenLinksInAppsGoToSettingsCFRButton: Clicked \"Go to settings\" open links in apps CFR button")
+            Log.i(TAG, "clickOpenLinksInAppsGoToSettingsCFRButton: Clicked the \"Go to settings\" open links in apps CFR button and waited for $waitingTime ms for a new window")
 
             SettingsRobot().interact()
             return SettingsRobot.Transition()
         }
 
         fun clickDownloadPDFButton(interact: DownloadRobot.() -> Unit): DownloadRobot.Transition {
+            Log.i(TAG, "clickDownloadPDFButton: Trying to click the download PDF button")
             itemWithResIdContainingText(
                 "download",
                 "Download",
             ).click()
-            Log.i(TAG, "clickDownloadPDFButton: Clicked download PDF button")
+            Log.i(TAG, "clickDownloadPDFButton: Clicked the download PDF button")
 
             DownloadRobot().interact()
             return DownloadRobot.Transition()
@@ -1270,8 +1336,10 @@ fun clickPageObject(item: UiObject) {
     for (i in 1..RETRY_COUNT) {
         try {
             Log.i(TAG, "clickPageObject: Started try #$i")
-            Log.i(TAG, "clickPageObject: Looking for ${item.selector}")
+            Log.i(TAG, "clickPageObject: Waiting for $waitingTime ms for ${item.selector} to exist")
             item.waitForExists(waitingTime)
+            Log.i(TAG, "clickPageObject: Waited for $waitingTime ms for ${item.selector} to exist")
+            Log.i(TAG, "clickPageObject: Trying to click ${item.selector}")
             item.click()
             Log.i(TAG, "clickPageObject: Clicked ${item.selector}")
 
@@ -1295,8 +1363,10 @@ fun longClickPageObject(item: UiObject) {
     for (i in 1..RETRY_COUNT) {
         try {
             Log.i(TAG, "longClickPageObject: Started try #$i")
-            Log.i(TAG, "longClickPageObject: Looking for ${item.selector}")
+            Log.i(TAG, "longClickPageObject: Waiting for $waitingTime ms for ${item.selector} to exist")
             item.waitForExists(waitingTime)
+            Log.i(TAG, "longClickPageObject: Waited for $waitingTime ms for ${item.selector} to exist")
+            Log.i(TAG, "longClickPageObject: Trying to long click ${item.selector}")
             item.longClick()
             Log.i(TAG, "longClickPageObject: Long clicked ${item.selector}")
 
@@ -1321,21 +1391,25 @@ fun clickContextMenuItem(item: String) {
         Until.findObject(text(item)),
         waitingTime,
     )
+    Log.i(TAG, "clickContextMenuItem: Trying to click context menu item: $item")
     mDevice.findObject(text(item)).click()
-    Log.i(TAG, "longClickPageObject: Clicked context menu item: $item")
+    Log.i(TAG, "clickContextMenuItem: Clicked context menu item: $item")
 }
 
 fun setPageObjectText(webPageItem: UiObject, text: String) {
     for (i in 1..RETRY_COUNT) {
-        Log.i(TAG, "setPageObjectText: For loop i = $i")
+        Log.i(TAG, "setPageObjectText: Started try #$i")
         try {
             webPageItem.also {
-                Log.i(TAG, "setPageObjectText: Looking for ${webPageItem.selector}")
+                Log.i(TAG, "setPageObjectText: Waiting for $waitingTime ms for ${webPageItem.selector} to exist")
                 it.waitForExists(waitingTime)
+                Log.i(TAG, "setPageObjectText: Waited for $waitingTime ms for ${webPageItem.selector} to exist")
+                Log.i(TAG, "setPageObjectText: Trying to clear ${webPageItem.selector} text field")
                 it.clearTextField()
                 Log.i(TAG, "setPageObjectText: Cleared ${webPageItem.selector} text field")
+                Log.i(TAG, "setPageObjectText: Trying to set ${webPageItem.selector} text to $text")
                 it.text = text
-                Log.i(TAG, "setPageObjectText: ${webPageItem.selector} text set to $text")
+                Log.i(TAG, "setPageObjectText: ${webPageItem.selector} text was set to $text")
             }
 
             break
@@ -1355,8 +1429,10 @@ fun setPageObjectText(webPageItem: UiObject, text: String) {
 }
 
 fun clearTextFieldItem(item: UiObject) {
-    Log.i(TAG, "clearTextFieldItem: Looking for ${item.selector}")
+    Log.i(TAG, "clearTextFieldItem: Waiting for $waitingTime ms for ${item.selector} to exist")
     item.waitForExists(waitingTime)
+    Log.i(TAG, "clearTextFieldItem: Waited for $waitingTime ms for ${item.selector} to exist")
+    Log.i(TAG, "clearTextFieldItem: Trying to clear ${item.selector} text field")
     item.clearTextField()
     Log.i(TAG, "clearTextFieldItem: Cleared ${item.selector} text field")
 }

From 499e533ac2bc49dbf88368fe68ff54f726ebad27 Mon Sep 17 00:00:00 2001
From: William Durand <will+git@drnd.me>
Date: Thu, 8 Feb 2024 13:10:49 +0100
Subject: [PATCH 127/222] Bug 1870362 - Add underline to each link in the
 add-on details view

---
 .../org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt  | 5 +++++
 .../mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt  | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
index 3ff2f85f6..fef044b05 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
@@ -22,6 +22,7 @@ import mozilla.components.feature.addons.ui.updatedAtDate
 import mozilla.components.support.ktx.android.content.getColorFromAttr
 import org.mozilla.fenix.R
 import org.mozilla.fenix.databinding.FragmentAddOnDetailsBinding
+import org.mozilla.fenix.ext.addUnderline
 import java.text.DateFormat
 import java.text.NumberFormat
 import java.util.Locale
@@ -70,6 +71,7 @@ class AddonDetailsBindingDelegate(
 
             if (addon.ratingUrl.isNotBlank()) {
                 binding.reviewCount.setTextColor(binding.root.context.getColorFromAttr(R.attr.textAccent))
+                binding.reviewCount.addUnderline()
                 binding.reviewCount.setOnClickListener {
                     interactor.openWebsite(addon.ratingUrl.toUri())
                 }
@@ -85,6 +87,7 @@ class AddonDetailsBindingDelegate(
             return
         }
 
+        binding.homePageLabel.addUnderline()
         binding.homePageLabel.setOnClickListener {
             interactor.openWebsite(addon.homepageUrl.toUri())
         }
@@ -134,6 +137,7 @@ class AddonDetailsBindingDelegate(
 
         if (author.url.isNotBlank()) {
             binding.authorText.setTextColor(binding.root.context.getColorFromAttr(R.attr.textAccent))
+            binding.authorText.addUnderline()
             binding.authorText.setOnClickListener {
                 interactor.openWebsite(author.url.toUri())
             }
@@ -181,6 +185,7 @@ class AddonDetailsBindingDelegate(
             return
         }
 
+        binding.detailUrl.addUnderline()
         binding.detailUrl.setOnClickListener {
             interactor.openWebsite(addon.detailUrl.toUri())
         }
diff --git a/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt b/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
index 8df9a2a29..91f27b9e9 100644
--- a/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
@@ -85,7 +85,7 @@ class AddonDetailsBindingDelegateTest {
                 ratingUrl = "https://example.org/",
             ),
         )
-        assertEquals("100", binding.reviewCount.text)
+        assertEquals("100", binding.reviewCount.text.toString())
 
         binding.reviewCount.performClick()
 
@@ -163,7 +163,7 @@ class AddonDetailsBindingDelegateTest {
             baseAddon.copy(author = Addon.Author(name = "Sarah Jane", url = "https://example.org/")),
         )
 
-        assertEquals("Sarah Jane", binding.authorText.text)
+        assertEquals("Sarah Jane", binding.authorText.text.toString())
         assertEquals(testContext.getColorFromAttr(R.attr.textAccent), binding.authorText.currentTextColor)
 
         binding.authorText.performClick()

From 95cf640fdc642d345bd47737a8047f340f99cd7d Mon Sep 17 00:00:00 2001
From: "oana.horvath" <ohorvath@mozilla.com>
Date: Tue, 6 Feb 2024 14:44:20 +0200
Subject: [PATCH 128/222] Bug 1878868 - Create TestSetup helper: Test classes
 A-C

---
 .../fenix/helpers/AppAndSystemHelper.kt       | 105 ++++++++++++------
 .../org/mozilla/fenix/helpers/TestSetup.kt    |  52 +++++++++
 .../mozilla/fenix/ui/AddressAutofillTest.kt   |  22 +---
 .../org/mozilla/fenix/ui/BookmarksTest.kt     |  33 +-----
 .../fenix/ui/BrowsingErrorPagesTest.kt        |  23 +---
 .../org/mozilla/fenix/ui/CollectionTest.kt    |  26 +----
 .../org/mozilla/fenix/ui/ContextMenusTest.kt  |  30 +----
 .../fenix/ui/CookieBannerBlockerTest.kt       |   3 +-
 .../mozilla/fenix/ui/CrashReportingTest.kt    |  26 +----
 .../fenix/ui/CreditCardAutofillTest.kt        |  22 +---
 .../org/mozilla/fenix/ui/CustomTabsTest.kt    |  30 +----
 11 files changed, 150 insertions(+), 222 deletions(-)
 create mode 100644 app/src/androidTest/java/org/mozilla/fenix/helpers/TestSetup.kt

diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt
index 4ef27f9e9..f9b95a2dc 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt
@@ -14,11 +14,11 @@ import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.net.Uri
 import android.os.Build
+import android.os.Environment
 import android.os.storage.StorageManager
 import android.os.storage.StorageVolume
 import android.provider.Settings
 import android.util.Log
-import androidx.annotation.RequiresApi
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.IdlingRegistry
@@ -33,6 +33,7 @@ import androidx.test.uiautomator.UiObject
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import junit.framework.AssertionFailedError
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.mozilla.fenix.Config
@@ -60,46 +61,88 @@ object AppAndSystemHelper {
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.R)
+    /**
+     * Checks if a specific download file is inside the device storage and deletes it.
+     * Different implementation needed for newer API levels,
+     * as Environment.getExternalStorageDirectory() is deprecated starting with API 29.
+     *
+     */
     fun deleteDownloadedFileOnStorage(fileName: String) {
-        val storageManager: StorageManager? = TestHelper.appContext.getSystemService(Context.STORAGE_SERVICE) as StorageManager?
-        val storageVolumes = storageManager!!.storageVolumes
-        val storageVolume: StorageVolume = storageVolumes[0]
-        val file = File(storageVolume.directory!!.path + "/Download/" + fileName)
-        try {
-            if (file.exists()) {
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {
+            val storageManager: StorageManager? =
+                TestHelper.appContext.getSystemService(Context.STORAGE_SERVICE) as StorageManager?
+            val storageVolumes = storageManager!!.storageVolumes
+            val storageVolume: StorageVolume = storageVolumes[0]
+            val file = File(storageVolume.directory!!.path + "/Download/" + fileName)
+            try {
+                if (file.exists()) {
+                    file.delete()
+                    Log.d("TestLog", "File delete try 1")
+                    Assert.assertFalse("The file was not deleted", file.exists())
+                }
+            } catch (e: AssertionError) {
                 file.delete()
-                Log.d("TestLog", "File delete try 1")
+                Log.d("TestLog", "File delete retried")
                 Assert.assertFalse("The file was not deleted", file.exists())
             }
-        } catch (e: AssertionError) {
-            file.delete()
-            Log.d("TestLog", "File delete retried")
-            Assert.assertFalse("The file was not deleted", file.exists())
+        } else {
+            runBlocking {
+                val downloadedFile = File(
+                    Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
+                    fileName,
+                )
+
+                if (downloadedFile.exists()) {
+                    Log.i(TAG, "deleteDownloadedFileOnStorage: Verifying if $downloadedFile exists.")
+                    downloadedFile.delete()
+                    Log.i(TAG, "deleteDownloadedFileOnStorage: $downloadedFile deleted.")
+                }
+            }
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.R)
+    /**
+     * Checks if there are download files inside the device storage and deletes all of them.
+     * Different implementation needed for newer API levels, as
+     * Environment.getExternalStorageDirectory() is deprecated starting with API 29.
+     */
     fun clearDownloadsFolder() {
-        val storageManager: StorageManager? = TestHelper.appContext.getSystemService(Context.STORAGE_SERVICE) as StorageManager?
-        val storageVolumes = storageManager!!.storageVolumes
-        val storageVolume: StorageVolume = storageVolumes[0]
-        val downloadsFolder = File(storageVolume.directory!!.path + "/Download/")
-
-        // Check if the downloads folder exists
-        if (downloadsFolder.exists() && downloadsFolder.isDirectory) {
-            Log.i(TAG, "clearDownloadsFolder: Verified that \"DOWNLOADS\" folder exists")
-            val files = downloadsFolder.listFiles()
-
-            // Check if the folder is not empty
-            if (files != null && files.isNotEmpty()) {
-                Log.i(TAG, "clearDownloadsFolder: Verified that \"DOWNLOADS\" folder is not empty")
-                // Delete all files in the folder
-                for (file in files) {
-                    file.delete()
-                    Log.i(TAG, "clearDownloadsFolder: Deleted $file from \"DOWNLOADS\" folder")
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {
+            Log.i(TAG, "clearDownloadsFolder: API > 29")
+            val storageManager: StorageManager? =
+                TestHelper.appContext.getSystemService(Context.STORAGE_SERVICE) as StorageManager?
+            val storageVolumes = storageManager!!.storageVolumes
+            val storageVolume: StorageVolume = storageVolumes[0]
+            val downloadsFolder = File(storageVolume.directory!!.path + "/Download/")
+
+            // Check if the downloads folder exists
+            if (downloadsFolder.exists() && downloadsFolder.isDirectory) {
+                Log.i(TAG, "clearDownloadsFolder: Verified that \"DOWNLOADS\" folder exists")
+                val files = downloadsFolder.listFiles()
+
+                // Check if the folder is not empty
+                if (files != null && files.isNotEmpty()) {
+                    Log.i(
+                        TAG,
+                        "clearDownloadsFolder: Verified that \"DOWNLOADS\" folder is not empty",
+                    )
+                    // Delete all files in the folder
+                    for (file in files) {
+                        file.delete()
+                        Log.i(TAG, "clearDownloadsFolder: Deleted $file from \"DOWNLOADS\" folder")
+                    }
                 }
             }
+        } else {
+            runBlocking {
+                Log.i(TAG, "clearDownloadsFolder: API <= 29")
+                Log.i(TAG, "clearDownloadsFolder: Verifying if any download files exist.")
+                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+                    .listFiles()?.forEach {
+                        it.delete()
+                        Log.i(TAG, "clearDownloadsFolder: Download file $it deleted.")
+                    }
+            }
         }
     }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestSetup.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestSetup.kt
new file mode 100644
index 000000000..b080154c4
--- /dev/null
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestSetup.kt
@@ -0,0 +1,52 @@
+package org.mozilla.fenix.helpers
+
+import android.util.Log
+import kotlinx.coroutines.runBlocking
+import mozilla.appservices.places.BookmarkRoot
+import mozilla.components.browser.storage.sync.PlacesBookmarksStorage
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.Before
+import org.mozilla.fenix.helpers.Constants.TAG
+import org.mozilla.fenix.helpers.TestHelper.appContext
+import org.mozilla.fenix.ui.robots.notificationShade
+
+open class TestSetup {
+    lateinit var mockWebServer: MockWebServer
+    private val bookmarksStorage = PlacesBookmarksStorage(appContext.applicationContext)
+
+    @Before
+    fun setUp() {
+        Log.i(TAG, "TestSetup: Starting the @Before setup")
+        // Clear pre-existing notifications
+        notificationShade {
+            cancelAllShownNotifications()
+        }
+        runBlocking {
+            // Reset locale to EN-US if needed.
+            AppAndSystemHelper.resetSystemLocaleToEnUS()
+            // Check and clear the downloads folder
+            AppAndSystemHelper.clearDownloadsFolder()
+            // Make sure the Wifi and Mobile Data connections are on
+            AppAndSystemHelper.setNetworkEnabled(true)
+            // Clear bookmarks left after a failed test
+            val bookmarks = bookmarksStorage.getTree(BookmarkRoot.Mobile.id)?.children
+            Log.i(TAG, "Before cleanup: Bookmarks storage contains: $bookmarks")
+            bookmarks?.forEach {
+                bookmarksStorage.deleteNode(it.guid)
+                // TODO: Follow-up with a method to handle the DB update; the logs will still show the bookmarks in the storage before the test starts.
+                Log.i(TAG, "After cleanup: Bookmarks storage contains: $bookmarks")
+            }
+        }
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+        }
+        try {
+            Log.i(TAG, "Try starting mockWebServer")
+            mockWebServer.start()
+        } catch (e: Exception) {
+            Log.i(TAG, "Exception caught. Re-starting mockWebServer")
+            mockWebServer.shutdown()
+            mockWebServer.start()
+        }
+    }
+}
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
index 4631b8a7a..b8b675778 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
@@ -4,27 +4,22 @@
 
 package org.mozilla.fenix.ui
 
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.packageName
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.autofillScreen
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
-class AddressAutofillTest {
-    private lateinit var mockWebServer: MockWebServer
-
+class AddressAutofillTest : TestSetup() {
     object FirstAddressAutofillDetails {
         var navigateToAutofillSettings = true
         var isAddressAutofillEnabled = true
@@ -58,19 +53,6 @@ class AddressAutofillTest {
     @get:Rule
     val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
 
-    @Before
-    fun setUp() {
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836845
     @SmokeTest
     @Test
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index 2d2a1fc97..8b7b220ce 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -8,20 +8,13 @@ import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
-import androidx.test.uiautomator.UiDevice
 import kotlinx.coroutines.runBlocking
-import mozilla.appservices.places.BookmarkRoot
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.ext.bookmarkStorage
 import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.registerAndCleanupIdlingResources
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MockBrowserDataHelper.createBookmarkItem
@@ -31,8 +24,10 @@ import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.appContext
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
+import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.restartApp
 import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.bookmarksMenu
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -42,9 +37,7 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
 /**
  *  Tests for verifying basic functionality of bookmarks
  */
-class BookmarksTest {
-    private lateinit var mockWebServer: MockWebServer
-    private lateinit var mDevice: UiDevice
+class BookmarksTest : TestSetup() {
     private val bookmarksFolderName = "New Folder"
     private val testBookmark = object {
         var title: String = "Bookmark title"
@@ -61,26 +54,6 @@ class BookmarksTest {
     @JvmField
     val retryTestRule = RetryTestRule(3)
 
-    @Before
-    fun setUp() {
-        mDevice = UiDevice.getInstance(getInstrumentation())
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-        // Clearing all bookmarks data after each test to avoid overlapping data
-        val bookmarksStorage = activityTestRule.activity?.bookmarkStorage
-        runBlocking {
-            val bookmarks = bookmarksStorage?.getTree(BookmarkRoot.Mobile.id)?.children
-            bookmarks?.forEach { bookmarksStorage.deleteNode(it.guid) }
-        }
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/522919
     @Test
     fun verifyEmptyBookmarksMenuTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt
index de05a516a..608c0e919 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt
@@ -5,20 +5,17 @@
 package org.mozilla.fenix.ui
 
 import androidx.core.net.toUri
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.setNetworkEnabled
 import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.navigationToolbar
@@ -26,13 +23,12 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
 /**
  * Tests that verify errors encountered while browsing websites: unsafe pages, connection errors, etc
  */
-class BrowsingErrorPagesTest {
+class BrowsingErrorPagesTest : TestSetup() {
     private val malwareWarning = getStringResource(R.string.mozac_browser_errorpages_safe_browsing_malware_uri_title)
     private val phishingWarning = getStringResource(R.string.mozac_browser_errorpages_safe_phishing_uri_title)
     private val unwantedSoftwareWarning =
         getStringResource(R.string.mozac_browser_errorpages_safe_browsing_unwanted_uri_title)
     private val harmfulSiteWarning = getStringResource(R.string.mozac_browser_errorpages_safe_harmful_uri_title)
-    private lateinit var mockWebServer: MockWebServer
 
     @get: Rule
     val mActivityTestRule = HomeActivityTestRule.withDefaultSettingsOverrides()
@@ -41,21 +37,6 @@ class BrowsingErrorPagesTest {
     @JvmField
     val retryTestRule = RetryTestRule(3)
 
-    @Before
-    fun setUp() {
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        // Restoring network connection
-        setNetworkEnabled(true)
-        mockWebServer.shutdown()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2326774
     @SmokeTest
     @Test
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
index c917f4d3f..74e7b136c 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
@@ -5,20 +5,16 @@
 package org.mozilla.fenix.ui
 
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.uiautomator.UiDevice
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
+import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.collectionRobot
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -30,9 +26,7 @@ import org.mozilla.fenix.ui.robots.tabDrawer
  *
  */
 
-class CollectionTest {
-    private lateinit var mDevice: UiDevice
-    private lateinit var mockWebServer: MockWebServer
+class CollectionTest : TestSetup() {
     private val firstCollectionName = "testcollection_1"
     private val secondCollectionName = "testcollection_2"
     private val collectionName = "First Collection"
@@ -51,20 +45,6 @@ class CollectionTest {
             ),
         ) { it.activity }
 
-    @Before
-    fun setUp() {
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/353823
     @SmokeTest
     @Test
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
index eeeec68a7..80f2d2a75 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
@@ -5,15 +5,8 @@
 package org.mozilla.fenix.ui
 
 import androidx.core.net.toUri
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.uiautomator.UiDevice
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.assertExternalAppOpens
 import org.mozilla.fenix.helpers.Constants.PackageName.YOUTUBE_APP
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
@@ -22,7 +15,9 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
+import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.clickContextMenuItem
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.downloadRobot
@@ -44,32 +39,15 @@ import org.mozilla.fenix.ui.robots.shareOverlay
  *
  */
 
-class ContextMenusTest {
-    private lateinit var mDevice: UiDevice
-    private lateinit var mockWebServer: MockWebServer
+class ContextMenusTest : TestSetup() {
 
     @get:Rule
-    val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
+    val activityIntentTestRule = HomeActivityIntentTestRule(isJumpBackInCFREnabled = false)
 
     @Rule
     @JvmField
     val retryTestRule = RetryTestRule(3)
 
-    @Before
-    fun setUp() {
-        activityIntentTestRule.activity.applicationContext.settings().shouldShowJumpBackInCFR = false
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/243837
     @Test
     fun verifyOpenLinkNewTabContextMenuOptionTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerBlockerTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerBlockerTest.kt
index 7ff48e390..cc9fff3d1 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerBlockerTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerBlockerTest.kt
@@ -12,13 +12,14 @@ import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.AppAndSystemHelper.runWithCondition
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.TestHelper.appContext
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
 /**
  *  Tests for verifying the new Cookie banner blocker option and functionality.
  */
-class CookieBannerBlockerTest {
+class CookieBannerBlockerTest : TestSetup() {
     @get:Rule
     val activityTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides(skipOnboarding = true)
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
index f246930bd..84083e014 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
@@ -5,29 +5,23 @@
 package org.mozilla.fenix.ui
 
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.uiautomator.UiDevice
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.packageName
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
-class CrashReportingTest {
-    private lateinit var mDevice: UiDevice
-    private lateinit var mockWebServer: MockWebServer
+class CrashReportingTest : TestSetup() {
     private val tabCrashMessage = getStringResource(R.string.tab_crash_title_2)
 
     @get:Rule
@@ -40,20 +34,6 @@ class CrashReportingTest {
         ),
     ) { it.activity }
 
-    @Before
-    fun setUp() {
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/308906
     @Test
     fun closeTabFromCrashedTabReporterTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
index f9eb0891b..9a9b5697b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
@@ -4,13 +4,9 @@
 
 package org.mozilla.fenix.ui
 
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.bringAppToForeground
 import org.mozilla.fenix.helpers.AppAndSystemHelper.putAppToBackground
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
@@ -19,14 +15,13 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.packageName
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 import java.time.LocalDate
 
-class CreditCardAutofillTest {
-    private lateinit var mockWebServer: MockWebServer
-
+class CreditCardAutofillTest : TestSetup() {
     object MockCreditCard1 {
         const val MOCK_CREDIT_CARD_NUMBER = "5555555555554444"
         const val MOCK_LAST_CARD_DIGITS = "4444"
@@ -48,19 +43,6 @@ class CreditCardAutofillTest {
     @get:Rule
     val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
 
-    @Before
-    fun setUp() {
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512792
     @SmokeTest
     @Test
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt
index b014dbb61..1e2aa93e8 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt
@@ -7,25 +7,20 @@
 package org.mozilla.fenix.ui
 
 import androidx.core.net.toUri
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
-import androidx.test.uiautomator.UiDevice
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.IntentReceiverActivity
 import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.AppAndSystemHelper.openAppFromExternalLink
 import org.mozilla.fenix.helpers.DataGenerationHelper.createCustomTabIntent
-import org.mozilla.fenix.helpers.FeatureSettingsHelperDelegate
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
+import org.mozilla.fenix.helpers.TestHelper.mDevice
+import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.customTabScreen
@@ -36,9 +31,7 @@ import org.mozilla.fenix.ui.robots.notificationShade
 import org.mozilla.fenix.ui.robots.openEditURLView
 import org.mozilla.fenix.ui.robots.searchScreen
 
-class CustomTabsTest {
-    private lateinit var mDevice: UiDevice
-    private lateinit var mockWebServer: MockWebServer
+class CustomTabsTest : TestSetup() {
     private val customMenuItem = "TestMenuItem"
     private val customTabActionButton = "CustomActionButton"
 
@@ -58,23 +51,6 @@ class CustomTabsTest {
         false,
     )
 
-    private val featureSettingsHelper = FeatureSettingsHelperDelegate()
-
-    @Before
-    fun setUp() {
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-        featureSettingsHelper.resetAllFeatureFlags()
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/249659
     @SmokeTest
     @Test

From 0965d2d352fee1842f6b5b30eced888f9dbb505b Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 8 Feb 2024 14:18:34 +0200
Subject: [PATCH 129/222] Bug 1879308 - Add missing pairs of logs to
 ComposeTabDrawerRobot

---
 .../fenix/ui/robots/ComposeTabDrawerRobot.kt  | 177 ++++++++++++------
 1 file changed, 121 insertions(+), 56 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt
index ffe888fbf..d42fd8e4d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt
@@ -48,8 +48,8 @@ import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
 import org.mozilla.fenix.helpers.HomeActivityComposeTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
-import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
+import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.clickAtLocationInView
 import org.mozilla.fenix.helpers.idlingresource.BottomSheetBehaviorStateIdlingResource
@@ -64,31 +64,37 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
 
     fun verifyNormalBrowsingButtonIsSelected(isSelected: Boolean = true) {
         if (isSelected) {
+            Log.i(TAG, "verifyNormalBrowsingButtonIsSelected: Trying to verify that the normal browsing button is selected")
             composeTestRule.normalBrowsingButton().assertIsSelected()
-            Log.i(TAG, "verifyNormalBrowsingButtonIsSelected: Verified normal browsing button is selected")
+            Log.i(TAG, "verifyNormalBrowsingButtonIsSelected: Verified that the normal browsing button is selected")
         } else {
+            Log.i(TAG, "verifyNormalBrowsingButtonIsSelected: Trying to verify that the normal browsing button is not selected")
             composeTestRule.normalBrowsingButton().assertIsNotSelected()
-            Log.i(TAG, "verifyNormalBrowsingButtonIsSelected: Verified normal browsing button is not selected")
+            Log.i(TAG, "verifyNormalBrowsingButtonIsSelected: Verified that the normal browsing button is not selected")
         }
     }
 
     fun verifyPrivateBrowsingButtonIsSelected(isSelected: Boolean = true) {
         if (isSelected) {
+            Log.i(TAG, "verifyPrivateBrowsingButtonIsSelected: Trying to verify that the private browsing button is selected")
             composeTestRule.privateBrowsingButton().assertIsSelected()
-            Log.i(TAG, "verifyPrivateBrowsingButtonIsSelected: Verified private browsing button is selected")
+            Log.i(TAG, "verifyPrivateBrowsingButtonIsSelected: Verified that the private browsing button is selected")
         } else {
+            Log.i(TAG, "verifyPrivateBrowsingButtonIsSelected: Trying to verify that the private browsing button is not selected")
             composeTestRule.privateBrowsingButton().assertIsNotSelected()
-            Log.i(TAG, "verifyPrivateBrowsingButtonIsSelected: Verified private browsing button is not selected")
+            Log.i(TAG, "verifyPrivateBrowsingButtonIsSelected: Verified that the private browsing button is not selected")
         }
     }
 
     fun verifySyncedTabsButtonIsSelected(isSelected: Boolean = true) {
         if (isSelected) {
+            Log.i(TAG, "verifySyncedTabsButtonIsSelected: Trying to verify that the synced tabs button is selected")
             composeTestRule.syncedTabsButton().assertIsSelected()
-            Log.i(TAG, "verifySyncedTabsButtonIsSelected: Verified synced tabs button is selected")
+            Log.i(TAG, "verifySyncedTabsButtonIsSelected: Verified that the synced tabs button is selected")
         } else {
+            Log.i(TAG, "verifySyncedTabsButtonIsSelected: Trying to verify that the synced tabs button is not selected")
             composeTestRule.syncedTabsButton().assertIsNotSelected()
-            Log.i(TAG, "verifySyncedTabsButtonIsSelected: Verified synced tabs button is not selected")
+            Log.i(TAG, "verifySyncedTabsButtonIsSelected: Verified that the synced tabs button is not selected")
         }
     }
 
@@ -103,18 +109,22 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
 
     fun verifyExistingOpenTabs(vararg titles: String) {
         titles.forEach { title ->
+            Log.i(TAG, "verifyExistingOpenTabs: Waiting for $waitingTime ms for tab with title: $title to exist")
             itemContainingText(title).waitForExists(waitingTime)
+            Log.i(TAG, "verifyExistingOpenTabs: Waited for $waitingTime ms for tab with title: $title to exist")
+            Log.i(TAG, "verifyExistingOpenTabs: Trying to verify that the open tab with title: $title exists")
             composeTestRule.tabItem(title).assertExists()
-            Log.i(TAG, "verifyExistingOpenTabs: Verified open tab with title: $title exists")
+            Log.i(TAG, "verifyExistingOpenTabs: Verified that the open tab with title: $title exists")
         }
     }
 
     fun verifyOpenTabsOrder(title: String, position: Int) {
+        Log.i(TAG, "verifyOpenTabsOrder: Trying to verify that the open tab at position: $position has title: $title")
         composeTestRule.normalTabsList()
             .onChildAt(position - 1)
             .assert(hasTestTag(TabsTrayTestTag.tabItemRoot))
             .assert(hasAnyChild(hasText(title)))
-        Log.i(TAG, "verifyOpenTabsOrder: Verified open tab at position: $position has title: $title")
+        Log.i(TAG, "verifyOpenTabsOrder: Verified that the open tab at position: $position has title: $title")
     }
 
     fun verifyNoExistingOpenTabs(vararg titles: String) {
@@ -127,109 +137,129 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
     }
 
     fun verifyNormalTabsList() {
+        Log.i(TAG, "verifyNormalTabsList: Trying to verify that the normal tabs list exists")
         composeTestRule.normalTabsList().assertExists()
-        Log.i(TAG, "verifyNormalTabsList: Verified normal tabs list exists")
+        Log.i(TAG, "verifyNormalTabsList: Verified that the normal tabs list exists")
     }
 
     fun verifyPrivateTabsList() {
+        Log.i(TAG, "verifyPrivateTabsList: Trying to verify that the private tabs list exists")
         composeTestRule.privateTabsList().assertExists()
-        Log.i(TAG, "verifyPrivateTabsList: Verified private tabs list exists")
+        Log.i(TAG, "verifyPrivateTabsList: Verified that the private tabs list exists")
     }
 
     fun verifySyncedTabsList() {
+        Log.i(TAG, "verifySyncedTabsList: Trying to verify that the synced tabs list exists")
         composeTestRule.syncedTabsList().assertExists()
-        Log.i(TAG, "verifySyncedTabsList: Verified synced tabs list exists")
+        Log.i(TAG, "verifySyncedTabsList: Verified that the synced tabs list exists")
     }
 
     fun verifyNoOpenTabsInNormalBrowsing() {
+        Log.i(TAG, "verifyNoOpenTabsInNormalBrowsing: Trying to verify that the empty normal tabs list exists")
         composeTestRule.emptyNormalTabsList().assertExists()
-        Log.i(TAG, "verifyNoOpenTabsInNormalBrowsing: Verified empty normal tabs list exists")
+        Log.i(TAG, "verifyNoOpenTabsInNormalBrowsing: Verified that the empty normal tabs list exists")
     }
 
     fun verifyNoOpenTabsInPrivateBrowsing() {
+        Log.i(TAG, "verifyNoOpenTabsInPrivateBrowsing: Trying to verify that the empty private tabs list exists")
         composeTestRule.emptyPrivateTabsList().assertExists()
-        Log.i(TAG, "verifyNoOpenTabsInPrivateBrowsing: Verified empty private tabs list exists")
+        Log.i(TAG, "verifyNoOpenTabsInPrivateBrowsing: Verified that the empty private tabs list exists")
     }
 
     fun verifyAccountSettingsButton() {
+        Log.i(TAG, "verifyAccountSettingsButton: Trying to verify that the \"Account settings\" menu button exists")
         composeTestRule.dropdownMenuItemAccountSettings().assertExists()
-        Log.i(TAG, "verifyAccountSettingsButton: Verified \"Account settings\" menu button exists")
+        Log.i(TAG, "verifyAccountSettingsButton: Verified that the \"Account settings\" menu button exists")
     }
 
     fun verifyCloseAllTabsButton() {
+        Log.i(TAG, "verifyCloseAllTabsButton: Trying to verify that the \"Close all tabs\" menu button exists")
         composeTestRule.dropdownMenuItemCloseAllTabs().assertExists()
-        Log.i(TAG, "verifyCloseAllTabsButton: Verified \"Close all tabs\" menu button exists")
+        Log.i(TAG, "verifyCloseAllTabsButton: Verified that the \"Close all tabs\" menu button exists")
     }
 
     fun verifySelectTabsButton() {
+        Log.i(TAG, "verifySelectTabsButton: Trying to verify that the \"Select tabs\" menu button exists")
         composeTestRule.dropdownMenuItemSelectTabs().assertExists()
-        Log.i(TAG, "verifySelectTabsButton: Verified \"Select tabs\" menu button exists")
+        Log.i(TAG, "verifySelectTabsButton: Verified that the \"Select tabs\" menu button exists")
     }
 
     fun verifyShareAllTabsButton() {
+        Log.i(TAG, "verifyShareAllTabsButton: Trying to verify that the \"Share all tabs\" menu button exists")
         composeTestRule.dropdownMenuItemShareAllTabs().assertExists()
-        Log.i(TAG, "verifyShareAllTabsButton: Verified \"Share all tabs\" menu button exists")
+        Log.i(TAG, "verifyShareAllTabsButton: Verified that the \"Share all tabs\" menu button exists")
     }
 
     fun verifyRecentlyClosedTabsButton() {
+        Log.i(TAG, "verifyRecentlyClosedTabsButton: Trying to verify that the \"Recently closed tabs\" menu button exists")
         composeTestRule.dropdownMenuItemRecentlyClosedTabs().assertExists()
-        Log.i(TAG, "verifyRecentlyClosedTabsButton: Verified \"Recently closed tabs\" menu button exists")
+        Log.i(TAG, "verifyRecentlyClosedTabsButton: Verified that the \"Recently closed tabs\" menu button exists")
     }
 
     fun verifyTabSettingsButton() {
+        Log.i(TAG, "verifyTabSettingsButton: Trying to verify that the \"Tab settings\" menu button exists")
         composeTestRule.dropdownMenuItemTabSettings().assertExists()
-        Log.i(TAG, "verifyTabSettingsButton: Verified \"Tab settings\" menu button exists")
+        Log.i(TAG, "verifyTabSettingsButton: Verified that the \"Tab settings\" menu button exists")
     }
 
     fun verifyThreeDotButton() {
+        Log.i(TAG, "verifyThreeDotButton: Trying to verify that the three dot button exists")
         composeTestRule.threeDotButton().assertExists()
-        Log.i(TAG, "verifyThreeDotButton: Verified three dot button exists")
+        Log.i(TAG, "verifyThreeDotButton: Verified that the three dot button exists")
     }
 
     fun verifyFab() {
+        Log.i(TAG, "verifyFab: Trying to verify that the new tab FAB button exists")
         composeTestRule.tabsTrayFab().assertExists()
-        Log.i(TAG, "verifyFab: Verified new tab FAB button exists")
+        Log.i(TAG, "verifyFab: Verified that the new tab FAB button exists")
     }
 
     fun verifyNormalTabCounter() {
+        Log.i(TAG, "verifyNormalTabCounter: Trying to verify that the normal tabs list counter exists")
         composeTestRule.normalTabsCounter().assertExists()
-        Log.i(TAG, "verifyNormalTabCounter: Verified normal tabs list counter exists")
+        Log.i(TAG, "verifyNormalTabCounter: Verified that the normal tabs list counter exists")
     }
 
     /**
      * Verifies a tab's thumbnail when there is only one tab open.
      */
     fun verifyTabThumbnail() {
+        Log.i(TAG, "verifyTabThumbnail: Trying to verify that the tab thumbnail exists")
         composeTestRule.tabThumbnail().assertExists()
-        Log.i(TAG, "verifyTabThumbnail: Verified tab thumbnail exists")
+        Log.i(TAG, "verifyTabThumbnail: Verified that the tab thumbnail exists")
     }
 
     /**
      * Verifies a tab's close button when there is only one tab open.
      */
     fun verifyTabCloseButton() {
+        Log.i(TAG, "verifyTabCloseButton: Trying to verify that the close tab button exists")
         composeTestRule.closeTabButton().assertExists()
-        Log.i(TAG, "verifyTabCloseButton: Verified close tab button exists")
+        Log.i(TAG, "verifyTabCloseButton: Verified that the close tab button exists")
     }
 
     fun verifyTabsTrayBehaviorState(expectedState: Int) {
+        Log.i(TAG, "verifyTabsTrayBehaviorState: Trying to verify that the tabs tray state matches: $expectedState")
         tabsTrayView().check(ViewAssertions.matches(BottomSheetBehaviorStateMatcher(expectedState)))
         Log.i(TAG, "verifyTabsTrayBehaviorState: Verified that the tabs tray state matches: $expectedState")
     }
 
     fun verifyMinusculeHalfExpandedRatio() {
+        Log.i(TAG, "verifyMinusculeHalfExpandedRatio: Trying to verify the tabs tray half expanded ratio")
         tabsTrayView().check(ViewAssertions.matches(BottomSheetBehaviorHalfExpandedMaxRatioMatcher(0.001f)))
-        Log.i(TAG, "verifyMinusculeHalfExpandedRatio: Verified that the tabs tray half expanded ratio")
+        Log.i(TAG, "verifyMinusculeHalfExpandedRatio: Verified the tabs tray half expanded ratio")
     }
 
     fun verifyTabTrayIsOpen() {
+        Log.i(TAG, "verifyTabTrayIsOpen: Trying to verify that the tabs tray exists")
         composeTestRule.tabsTray().assertExists()
-        Log.i(TAG, "verifyTabTrayIsOpen: Verified that the open tabs tray exists")
+        Log.i(TAG, "verifyTabTrayIsOpen: Verified that the tabs tray exists")
     }
 
     fun verifyTabTrayIsClosed() {
+        Log.i(TAG, "verifyTabTrayIsClosed: Trying to verify that the tabs tray does not exist")
         composeTestRule.tabsTray().assertDoesNotExist()
-        Log.i(TAG, "verifyTabTrayIsClosed: Verified that the tabs tray is closed")
+        Log.i(TAG, "verifyTabTrayIsClosed: Verified that the tabs tray does not exist")
     }
 
     /**
@@ -237,16 +267,22 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      */
     @OptIn(ExperimentalTestApi::class)
     fun closeTab() {
+        Log.i(TAG, "closeTab: Waiting until the close tab button exists")
         composeTestRule.waitUntilAtLeastOneExists(hasTestTag(TabsTrayTestTag.tabItemClose))
+        Log.i(TAG, "closeTab: Waited until the close tab button exists")
+        Log.i(TAG, "closeTab: Trying to verify that the close tab button exists")
         composeTestRule.closeTabButton().assertExists()
+        Log.i(TAG, "closeTab: Verified that the close tab button exists")
+        Log.i(TAG, "closeTab: Trying to click the close tab button")
         composeTestRule.closeTabButton().performClick()
-        Log.i(TAG, "closeTab: Clicked close tab button")
+        Log.i(TAG, "closeTab: Clicked the close tab button")
     }
 
     /**
      * Swipes a tab with [title] left.
      */
     fun swipeTabLeft(title: String) {
+        Log.i(TAG, "swipeTabLeft: Trying to perform swipe left action on tab: $title")
         composeTestRule.tabItem(title).performTouchInput { swipeLeft() }
         Log.i(TAG, "swipeTabLeft: Performed swipe left action on tab: $title")
     }
@@ -255,6 +291,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      * Swipes a tab with [title] right.
      */
     fun swipeTabRight(title: String) {
+        Log.i(TAG, "swipeTabRight: Trying to perform swipe right action on tab: $title")
         composeTestRule.tabItem(title).performTouchInput { swipeRight() }
         Log.i(TAG, "swipeTabRight: Performed swipe right action on tab: $title")
     }
@@ -267,10 +304,12 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
         collectionName: String,
         firstCollection: Boolean = true,
     ) {
+        Log.i(TAG, "createCollection: Trying to click the three dot button")
         composeTestRule.threeDotButton().performClick()
-        Log.i(TAG, "createCollection: Clicked 3 dot button")
+        Log.i(TAG, "createCollection: Clicked the three dot button")
+        Log.i(TAG, "createCollection: Trying to click the \"Select tabs\" menu button")
         composeTestRule.dropdownMenuItemSelectTabs().performClick()
-        Log.i(TAG, "createCollection: Clicked \"Select tabs\" menu button")
+        Log.i(TAG, "createCollection: Clicked the \"Select tabs\" menu button")
 
         for (tab in tabTitles) {
             selectTab(tab)
@@ -289,8 +328,10 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      */
     @OptIn(ExperimentalTestApi::class)
     fun selectTab(title: String) {
-        Log.i(TAG, "selectTab: Waiting for tab with title: $title to exist")
+        Log.i(TAG, "selectTab: Waiting for $waitingTime ms until the tab with title: $title exists")
         composeTestRule.waitUntilExactlyOneExists(hasText(title), waitingTime)
+        Log.i(TAG, "selectTab: Waited for $waitingTime ms until the tab with title: $title exists")
+        Log.i(TAG, "selectTab: Trying to click tab with title: $title")
         composeTestRule.tabItem(title).performClick()
         Log.i(TAG, "selectTab: Clicked tab with title: $title")
     }
@@ -299,6 +340,7 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      * Performs a long click on a tab with [title].
      */
     fun longClickTab(title: String) {
+        Log.i(TAG, "longClickTab: Trying to long click tab with title: $title")
         composeTestRule.tabItem(title)
             .performTouchInput { longClick(durationMillis = Constants.LONG_CLICK_DURATION) }
         Log.i(TAG, "longClickTab: Long clicked tab with title: $title")
@@ -308,9 +350,10 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      * Verifies the multi selection counter displays [numOfTabs].
      */
     fun verifyTabsMultiSelectionCounter(numOfTabs: Int) {
+        Log.i(TAG, "verifyTabsMultiSelectionCounter: Trying to verify that $numOfTabs tabs are selected")
         composeTestRule.multiSelectionCounter()
             .assert(hasText("$numOfTabs selected"))
-        Log.i(TAG, "verifyTabsMultiSelectionCounter: Verified $numOfTabs are selected")
+        Log.i(TAG, "verifyTabsMultiSelectionCounter: Verified that $numOfTabs tabs are selected")
     }
 
     /**
@@ -318,11 +361,13 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      */
     @OptIn(ExperimentalTestApi::class)
     fun verifyTabMediaControlButtonState(action: String) {
-        Log.i(TAG, "verifyTabMediaControlButtonStateTab: Waiting for media tab control button: $action to exist")
+        Log.i(TAG, "verifyTabMediaControlButtonStateTab: Waiting for $waitingTime ms until the media tab control button: $action exists")
         composeTestRule.waitUntilAtLeastOneExists(hasContentDescription(action), waitingTime)
+        Log.i(TAG, "verifyTabMediaControlButtonStateTab: Waited for $waitingTime ms until the media tab control button: $action exists")
+        Log.i(TAG, "verifyTabMediaControlButtonStateTab: Trying to verify that the tab media control button: $action exists")
         composeTestRule.tabMediaControlButton(action)
             .assertExists()
-        Log.i(TAG, "verifyTabMediaControlButtonStateTab: Verified media tab control button: $action exists")
+        Log.i(TAG, "verifyTabMediaControlButtonStateTab: Verified tab media control button: $action exists")
     }
 
     /**
@@ -330,65 +375,75 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
      */
     @OptIn(ExperimentalTestApi::class)
     fun clickTabMediaControlButton(action: String) {
-        Log.i(TAG, "clickTabMediaControlButton: Waiting for media tab control button: $action to exist")
+        Log.i(TAG, "clickTabMediaControlButton: Waiting for $waitingTime ms until the media tab control button: $action exists")
         composeTestRule.waitUntilAtLeastOneExists(hasContentDescription(action), waitingTime)
+        Log.i(TAG, "clickTabMediaControlButton: Waited for $waitingTime ms until the media tab control button: $action exists")
+        Log.i(TAG, "clickTabMediaControlButton: Trying to click the tab media control button: $action")
         composeTestRule.tabMediaControlButton(action)
             .performClick()
-        Log.i(TAG, "clickTabMediaControlButton: Clicked media tab control button: $action")
+        Log.i(TAG, "clickTabMediaControlButton: Clicked the tab media control button: $action")
     }
 
     /**
      * Closes a tab with a given [title].
      */
     fun closeTabWithTitle(title: String) {
+        Log.i(TAG, "closeTabWithTitle: Trying to click the close button for tab with title: $title")
         composeTestRule.onAllNodesWithTag(TabsTrayTestTag.tabItemClose)
             .filter(hasParent(hasText(title)))
             .onFirst()
             .performClick()
-        Log.i(TAG, "closeTabWithTitle: Closed tab with title: $title")
+        Log.i(TAG, "closeTabWithTitle: Clicked the close button for tab with title: $title")
     }
 
     class Transition(private val composeTestRule: HomeActivityComposeTestRule) {
 
         fun openNewTab(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
+            Log.i(TAG, "openNewTab: Waiting for device to be idle")
             mDevice.waitForIdle()
-
+            Log.i(TAG, "openNewTab: Waited for device to be idle")
+            Log.i(TAG, "openNewTab: Trying to click the new tab FAB button")
             composeTestRule.tabsTrayFab().performClick()
-            Log.i(TAG, "openNewTab: Clicked new tab FAB button")
+            Log.i(TAG, "openNewTab: Clicked the new tab FAB button")
             SearchRobot().interact()
             return SearchRobot.Transition()
         }
 
         fun toggleToNormalTabs(interact: ComposeTabDrawerRobot.() -> Unit): Transition {
+            Log.i(TAG, "toggleToNormalTabs: Trying to click the normal browsing button")
             composeTestRule.normalBrowsingButton().performClick()
-            Log.i(TAG, "toggleToNormalTabs: Clicked normal browsing button")
+            Log.i(TAG, "toggleToNormalTabs: Clicked the normal browsing button")
             ComposeTabDrawerRobot(composeTestRule).interact()
             return Transition(composeTestRule)
         }
 
         fun toggleToPrivateTabs(interact: ComposeTabDrawerRobot.() -> Unit): Transition {
+            Log.i(TAG, "toggleToPrivateTabs: Trying to click the private browsing button")
             composeTestRule.privateBrowsingButton().performClick()
-            Log.i(TAG, "toggleToPrivateTabs: Clicked private browsing button")
+            Log.i(TAG, "toggleToPrivateTabs: Clicked the private browsing button")
             ComposeTabDrawerRobot(composeTestRule).interact()
             return Transition(composeTestRule)
         }
 
         fun toggleToSyncedTabs(interact: ComposeTabDrawerRobot.() -> Unit): Transition {
+            Log.i(TAG, "toggleToSyncedTabs: Trying to click the synced tabs button")
             composeTestRule.syncedTabsButton().performClick()
-            Log.i(TAG, "toggleToSyncedTabs: Clicked synced tabs button")
+            Log.i(TAG, "toggleToSyncedTabs: Clicked the synced tabs button")
             ComposeTabDrawerRobot(composeTestRule).interact()
             return Transition(composeTestRule)
         }
 
         fun clickSignInToSyncButton(interact: SyncSignInRobot.() -> Unit): SyncSignInRobot.Transition {
+            Log.i(TAG, "clickSignInToSyncButton: Trying to click the sign in to sync button and wait for $waitingTimeShort ms for a new window")
             itemContainingText(getStringResource(R.string.sync_sign_in))
-                .clickAndWaitForNewWindow(TestAssetHelper.waitingTimeShort)
-            Log.i(TAG, "clickSignInToSyncButton: Clicked sign in to sync button")
+                .clickAndWaitForNewWindow(waitingTimeShort)
+            Log.i(TAG, "clickSignInToSyncButton: Clicked the sign in to sync button and waited for $waitingTimeShort ms for a new window")
             SyncSignInRobot().interact()
             return SyncSignInRobot.Transition()
         }
 
         fun openThreeDotMenu(interact: ComposeTabDrawerRobot.() -> Unit): Transition {
+            Log.i(TAG, "openThreeDotMenu: Trying to click the three dot button")
             composeTestRule.threeDotButton().performClick()
             Log.i(TAG, "openThreeDotMenu: Clicked three dot button")
             ComposeTabDrawerRobot(composeTestRule).interact()
@@ -396,37 +451,42 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
         }
 
         fun closeAllTabs(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
+            Log.i(TAG, "closeAllTabs: Trying to click the \"Close all tabs\" menu button")
             composeTestRule.dropdownMenuItemCloseAllTabs().performClick()
-            Log.i(TAG, "closeAllTabs: Clicked \"Close all tabs\" menu button")
+            Log.i(TAG, "closeAllTabs: Clicked the \"Close all tabs\" menu button")
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
         }
 
         fun openTab(title: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            composeTestRule.tabItem(title)
-                .performScrollTo()
-                .performClick()
-            Log.i(TAG, "openTab: Scrolled and clicked tab with title: $title")
+            Log.i(TAG, "openTab: Trying to scroll to tab with title: $title")
+            composeTestRule.tabItem(title).performScrollTo()
+            Log.i(TAG, "openTab: Scrolled to tab with title: $title")
+            Log.i(TAG, "openTab: Trying to click tab with title: $title")
+            composeTestRule.tabItem(title).performClick()
+            Log.i(TAG, "openTab: Clicked tab with title: $title")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun openPrivateTab(position: Int, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "openPrivateTab: Trying to click private tab at position: ${position + 1}")
             composeTestRule.privateTabsList()
                 .onChildren()[position]
                 .performClick()
-            Log.i(TAG, "openPrivateTab: Opened private tab at position: ${position + 1}")
+            Log.i(TAG, "openPrivateTab: Clicked private tab at position: ${position + 1}")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun openNormalTab(position: Int, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "openNormalTab: Trying to click tab at position: ${position + 1}")
             composeTestRule.normalTabsList()
                 .onChildren()[position]
                 .performClick()
-            Log.i(TAG, "openNormalTab: Opened tab at position: ${position + 1}")
+            Log.i(TAG, "openNormalTab: Clicked tab at position: ${position + 1}")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -435,8 +495,9 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
         fun clickTopBar(interact: ComposeTabDrawerRobot.() -> Unit): Transition {
             // The topBar contains other views.
             // Don't do the default click in the middle, rather click in some free space - top right.
+            Log.i(TAG, "clickTopBar: Trying to click the tabs tray top bar")
             Espresso.onView(ViewMatchers.withId(R.id.topBar)).clickAtLocationInView(GeneralLocation.TOP_RIGHT)
-            Log.i(TAG, "clickTopBar: Clicked tabs tray top bar")
+            Log.i(TAG, "clickTopBar: Clicked the tabs tray top bar")
             ComposeTabDrawerRobot(composeTestRule).interact()
             return Transition(composeTestRule)
         }
@@ -493,14 +554,16 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
         }
 
         fun closeTabDrawer(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "closeTabDrawer: Trying to close the tabs tray by clicking the handle")
             composeTestRule.bannerHandle().performSemanticsAction(SemanticsActions.OnClick)
-            Log.i(TAG, "closeTabDrawer: Closed tabs tray clicking the handle")
+            Log.i(TAG, "closeTabDrawer: Closed the tabs tray by clicking the handle")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun clickSaveCollection(interact: CollectionRobot.() -> Unit): CollectionRobot.Transition {
+            Log.i(TAG, "clickSaveCollection: Trying to click the collections button")
             composeTestRule.collectionsButton().performClick()
             Log.i(TAG, "clickSaveCollection: Clicked collections button")
 
@@ -509,8 +572,9 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
         }
 
         fun clickShareAllTabsButton(interact: ShareOverlayRobot.() -> Unit): ShareOverlayRobot.Transition {
+            Log.i(TAG, "clickShareAllTabsButton: Trying to click the \"Share all tabs\" menu button button")
             composeTestRule.dropdownMenuItemShareAllTabs().performClick()
-            Log.i(TAG, "clickShareAllTabsButton: Clicked \"Share all tabs\" menu button button")
+            Log.i(TAG, "clickShareAllTabsButton: Clicked the \"Share all tabs\" menu button button")
 
             ShareOverlayRobot().interact()
             return ShareOverlayRobot.Transition()
@@ -530,8 +594,9 @@ fun composeTabDrawer(composeTestRule: HomeActivityComposeTestRule, interact: Com
  * Clicks on the Collections button in the Tabs Tray banner and opens a transition in the [CollectionRobot].
  */
 private fun clickCollectionsButton(composeTestRule: HomeActivityComposeTestRule, interact: CollectionRobot.() -> Unit): CollectionRobot.Transition {
+    Log.i(TAG, "clickCollectionsButton: Trying to click the collections button")
     composeTestRule.collectionsButton().performClick()
-    Log.i(TAG, "clickCollectionsButton: Clicked collections button")
+    Log.i(TAG, "clickCollectionsButton: Clicked the collections button")
 
     CollectionRobot().interact()
     return CollectionRobot.Transition()

From 2aa12bb12ac4dceabdd5c8bf54ff267d96064828 Mon Sep 17 00:00:00 2001
From: William Durand <will+git@drnd.me>
Date: Wed, 7 Feb 2024 16:01:41 +0100
Subject: [PATCH 130/222] Bug 1870319 - Announce title in add-ons sub-menu and
 use "navigate back" instead of "navigate up"

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 119fb2d1d..179612613 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2101,7 +2101,7 @@
     <string name="radio_preference_info_content_description">Click for more details</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Navigate up</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Navigate up</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Close</string>

From c291a3ab1a0d9895dceae6f0d1562b0604df599b Mon Sep 17 00:00:00 2001
From: William Durand <will+git@drnd.me>
Date: Thu, 8 Feb 2024 21:41:43 +0100
Subject: [PATCH 131/222] Bug 1870337 - Update description of the add-on
 post-install popup

---
 .../fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
index 94c5c3f50..784705138 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
@@ -98,7 +98,7 @@ class SettingsSubMenuAddonsManagerRobot {
     fun verifyAddonInstallCompleted(addonName: String, activityTestRule: HomeActivityIntentTestRule) {
         for (i in 1..RETRY_COUNT) {
             try {
-                assertUIObjectExists(itemWithText("Okay, Got it"), waitingTime = waitingTimeLong)
+                assertUIObjectExists(itemWithText("OK"), waitingTime = waitingTimeLong)
 
                 break
             } catch (e: AssertionError) {
@@ -123,10 +123,10 @@ class SettingsSubMenuAddonsManagerRobot {
     fun verifyAddonInstallCompletedPrompt(addonName: String) {
         onView(
             allOf(
-                withText("Okay, Got it"),
+                withText("OK"),
                 withParent(instanceOf(RelativeLayout::class.java)),
                 hasSibling(withText("$addonName has been added to $appName")),
-                hasSibling(withText("Open it in the menu")),
+                hasSibling(withText("Access $addonName from the $appName menu.")),
                 hasSibling(withText("Allow in private browsing")),
             ),
         )
@@ -134,7 +134,7 @@ class SettingsSubMenuAddonsManagerRobot {
     }
 
     fun closeAddonInstallCompletePrompt() {
-        onView(withText("Okay, Got it")).click()
+        onView(withText("OK")).click()
     }
 
     fun verifyAddonIsInstalled(addonName: String) {

From 8f39d7ceb4328c546e8ea820540a20391ff52c58 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 8 Feb 2024 16:18:35 +0200
Subject: [PATCH 132/222] Bug 1879339 - Add missing pairs of logs to
 ComposeTopSitesRobot

---
 .../fenix/ui/robots/ComposeTopSitesRobot.kt   | 59 +++++++++++++------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt
index 1a25a39e6..53f1121bf 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt
@@ -34,25 +34,31 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
 
     @OptIn(ExperimentalTestApi::class)
     fun verifyExistingTopSitesList() {
-        Log.i(TAG, "verifyExistingTopSitesList: Waiting for top sites list to exist")
+        Log.i(TAG, "verifyExistingTopSitesList: Waiting for $waitingTime ms until the top sites list exists")
         composeTestRule.waitUntilAtLeastOneExists(hasTestTag(TopSitesTestTag.topSites), timeoutMillis = waitingTime)
+        Log.i(TAG, "verifyExistingTopSitesList: Waited for $waitingTime ms until the top sites list to exists")
     }
 
     @OptIn(ExperimentalTestApi::class)
     fun verifyExistingTopSiteItem(vararg titles: String) {
         titles.forEach { title ->
-            Log.i(TAG, "verifyExistingTopSiteItem: Waiting for top site: $title to exist")
+            Log.i(TAG, "verifyExistingTopSiteItem: Waiting for $waitingTime ms until the top site with title: $title exists")
             composeTestRule.waitUntilAtLeastOneExists(hasText(title), timeoutMillis = waitingTime)
+            Log.i(TAG, "verifyExistingTopSiteItem: Waited for $waitingTime ms until the top site with title: $title exists")
+            Log.i(TAG, "verifyExistingTopSiteItem: Trying to verify that the top site with title: $title exists")
             composeTestRule.topSiteItem(title).assertExists()
-            Log.i(TAG, "verifyExistingTopSiteItem: Top site with $title exists")
+            Log.i(TAG, "verifyExistingTopSiteItem: Verified that the top site with title: $title exists")
         }
     }
 
     fun verifyNotExistingTopSiteItem(vararg titles: String) {
         titles.forEach { title ->
+            Log.i(TAG, "verifyNotExistingTopSiteItem: Waiting for $waitingTime ms for top site with title: $title to exist")
             itemContainingText(title).waitForExists(waitingTime)
+            Log.i(TAG, "verifyNotExistingTopSiteItem: Waited for $waitingTime ms for top site with title: $title to exist")
+            Log.i(TAG, "verifyNotExistingTopSiteItem: Trying to verify that top site with title: $title does not exist")
             composeTestRule.topSiteItem(title).assertDoesNotExist()
-            Log.i(TAG, "verifyNotExistingTopSiteItem: Top site with $title does not exist")
+            Log.i(TAG, "verifyNotExistingTopSiteItem: Verified that top site with title: $title does not exist")
         }
     }
 
@@ -63,18 +69,21 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
     }
 
     fun verifyTopSiteContextMenuOpenInPrivateTabButton() {
+        Log.i(TAG, "verifyTopSiteContextMenuOpenInPrivateTabButton: Trying to verify that the \"Open in private tab\" menu button exists")
         composeTestRule.contextMenuItemOpenInPrivateTab().assertExists()
-        Log.i(TAG, "verifyTopSiteContextMenuOpenInPrivateTabButton: Verified \"Open in private tab\" menu button exists")
+        Log.i(TAG, "verifyTopSiteContextMenuOpenInPrivateTabButton: Verified that the \"Open in private tab\" menu button exists")
     }
 
     fun verifyTopSiteContextMenuRenameButton() {
+        Log.i(TAG, "verifyTopSiteContextMenuRenameButton: Trying to verify that the \"Rename\" menu button exists")
         composeTestRule.contextMenuItemRename().assertExists()
-        Log.i(TAG, "verifyTopSiteContextMenuRenameButton: Verified \"Rename\" menu button exists")
+        Log.i(TAG, "verifyTopSiteContextMenuRenameButton: Verified that the \"Rename\" menu button exists")
     }
 
     fun verifyTopSiteContextMenuRemoveButton() {
+        Log.i(TAG, "verifyTopSiteContextMenuRemoveButton: Trying to verify that the \"Remove\" menu button exists")
         composeTestRule.contextMenuItemRemove().assertExists()
-        Log.i(TAG, "verifyTopSiteContextMenuRemoveButton: Verified \"Remove\" menu button exists")
+        Log.i(TAG, "verifyTopSiteContextMenuRemoveButton: Verified that the \"Remove\" menu button exists")
     }
 
     class Transition(private val composeTestRule: HomeActivityComposeTestRule) {
@@ -83,8 +92,12 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
             title: String,
             interact: BrowserRobot.() -> Unit,
         ): BrowserRobot.Transition {
-            composeTestRule.topSiteItem(title).performScrollTo().performClick()
-            Log.i(TAG, "openTopSiteTabWithTitle: Scrolled and clicked top site with title: $title")
+            Log.i(TAG, "openTopSiteTabWithTitle: Trying to scroll to top site with title: $title")
+            composeTestRule.topSiteItem(title).performScrollTo()
+            Log.i(TAG, "openTopSiteTabWithTitle: Scrolled to top site with title: $title")
+            Log.i(TAG, "openTopSiteTabWithTitle: Trying to click top site with title: $title")
+            composeTestRule.topSiteItem(title).performClick()
+            Log.i(TAG, "openTopSiteTabWithTitle: Clicked top site with title: $title")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -93,8 +106,9 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
         fun openTopSiteInPrivate(
             interact: BrowserRobot.() -> Unit,
         ): BrowserRobot.Transition {
+            Log.i(TAG, "openTopSiteInPrivate: Trying to click the \"Open in private tab\" menu button")
             composeTestRule.contextMenuItemOpenInPrivateTab().performClick()
-            Log.i(TAG, "openTopSiteInPrivate: Clicked \"Open in private tab\" menu button")
+            Log.i(TAG, "openTopSiteInPrivate: Clicked the \"Open in private tab\" menu button")
             composeTestRule.waitForIdle()
 
             BrowserRobot().interact()
@@ -105,9 +119,11 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
             title: String,
             interact: ComposeTopSitesRobot.() -> Unit,
         ): Transition {
-            composeTestRule.topSiteItem(title).performScrollTo().performTouchInput {
-                longClick()
-            }
+            Log.i(TAG, "openContextMenuOnTopSitesWithTitle: Trying to scroll to top site with title: $title")
+            composeTestRule.topSiteItem(title).performScrollTo()
+            Log.i(TAG, "openContextMenuOnTopSitesWithTitle: Scrolled to top site with title: $title")
+            Log.i(TAG, "openContextMenuOnTopSitesWithTitle: Trying to long click top site with title: $title")
+            composeTestRule.topSiteItem(title).performTouchInput { longClick() }
             Log.i(TAG, "openContextMenuOnTopSitesWithTitle: Long clicked top site with title: $title")
 
             ComposeTopSitesRobot(composeTestRule).interact()
@@ -118,16 +134,21 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
             title: String,
             interact: ComposeTopSitesRobot.() -> Unit,
         ): Transition {
+            Log.i(TAG, "renameTopSite: Trying to click the \"Rename\" menu button")
             composeTestRule.contextMenuItemRename().performClick()
-            Log.i(TAG, "renameTopSite: Clicked \"Rename\" menu button")
+            Log.i(TAG, "renameTopSite: Clicked the \"Rename\" menu button")
             itemWithResId("$packageName:id/top_site_title")
                 .also {
+                    Log.i(TAG, "renameTopSite: Waiting for $waitingTimeShort ms for top site rename text box to exist")
                     it.waitForExists(waitingTimeShort)
+                    Log.i(TAG, "renameTopSite: Waited for $waitingTimeShort ms for top site rename text box to exist")
+                    Log.i(TAG, "renameTopSite: Trying to set top site rename text box text to: $title")
                     it.setText(title)
+                    Log.i(TAG, "renameTopSite: Top site rename text box text was set to: $title")
                 }
-            Log.i(TAG, "renameTopSite: Top site rename text box was set to: $title")
+            Log.i(TAG, "renameTopSite: Trying to click the \"Ok\" dialog button")
             itemWithResIdContainingText("android:id/button1", "OK").click()
-            Log.i(TAG, "renameTopSite: Clicked \"Ok\" dialog button")
+            Log.i(TAG, "renameTopSite: Clicked the \"Ok\" dialog button")
 
             ComposeTopSitesRobot(composeTestRule).interact()
             return Transition(composeTestRule)
@@ -137,10 +158,12 @@ class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestR
         fun removeTopSite(
             interact: ComposeTopSitesRobot.() -> Unit,
         ): Transition {
+            Log.i(TAG, "removeTopSite: Trying to click the \"Remove\" menu button")
             composeTestRule.contextMenuItemRemove().performClick()
-            Log.i(TAG, "removeTopSite: Clicked \"Remove\" menu button")
+            Log.i(TAG, "removeTopSite: Clicked the \"Remove\" menu button")
+            Log.i(TAG, "removeTopSite: Waiting for $waitingTime ms until the \"Remove\" menu button does not exist")
             composeTestRule.waitUntilDoesNotExist(hasTestTag(TopSitesTestTag.remove), waitingTime)
-            Log.i(TAG, "removeTopSite: Waited for \"Remove\" menu button to not exist")
+            Log.i(TAG, "removeTopSite: Waited for $waitingTime ms until the \"Remove\" menu button does not exist")
 
             ComposeTopSitesRobot(composeTestRule).interact()
             return Transition(composeTestRule)

From a99d224387e0aa087580ab0ab08c44410e94d0a2 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 9 Feb 2024 12:23:15 +0200
Subject: [PATCH 133/222] Bug 1879498 - Add missing pairs of logs to
 CustomTabRobot

---
 .../mozilla/fenix/ui/robots/CustomTabRobot.kt | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt
index 01959e7b8..3c4d37710 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt
@@ -48,21 +48,24 @@ class CustomTabRobot {
     fun verifyMainMenuButton() = assertUIObjectExists(mainMenuButton())
 
     fun verifyDesktopSiteButtonExists() {
+        Log.i(TAG, "verifyDesktopSiteButtonExists: Trying to verify that the request desktop site button is displayed")
         desktopSiteButton().check(matches(isDisplayed()))
-        Log.i(TAG, "verifyDesktopSiteButtonExists: Verified request desktop site button is displayed")
+        Log.i(TAG, "verifyDesktopSiteButtonExists: Verified that the request desktop site button is displayed")
     }
 
     fun verifyFindInPageButtonExists() {
+        Log.i(TAG, "verifyFindInPageButtonExists: Trying to verify that the find in page button is displayed")
         findInPageButton().check(matches(isDisplayed()))
-        Log.i(TAG, "verifyFindInPageButtonExists: Verified find in page button is displayed")
+        Log.i(TAG, "verifyFindInPageButtonExists: Verified that the find in page button is displayed")
     }
 
     fun verifyPoweredByTextIsDisplayed() =
         assertUIObjectExists(itemContainingText("POWERED BY $appName"))
 
     fun verifyOpenInBrowserButtonExists() {
+        Log.i(TAG, "verifyOpenInBrowserButtonExists: Trying to verify that the \"Open in Firefox\" button is displayed")
         openInBrowserButton().check(matches(isDisplayed()))
-        Log.i(TAG, "verifyOpenInBrowserButtonExists: Verified open in browser button is displayed")
+        Log.i(TAG, "verifyOpenInBrowserButtonExists: Verified that the \"Open in Firefox\" button is displayed")
     }
 
     fun verifyBackButtonExists() = assertUIObjectExists(itemWithDescription("Back"))
@@ -74,8 +77,9 @@ class CustomTabRobot {
     fun verifyCustomMenuItem(label: String) = assertUIObjectExists(itemContainingText(label))
 
     fun verifyCustomTabCloseButton() {
+        Log.i(TAG, "verifyCustomTabCloseButton: Trying to verify that the close custom tab button is displayed")
         closeButton().check(matches(isDisplayed()))
-        Log.i(TAG, "verifyCustomTabCloseButton: Verified close custom tab button is displayed")
+        Log.i(TAG, "verifyCustomTabCloseButton: Verified that the close custom tab button is displayed")
     }
 
     fun verifyCustomTabToolbarTitle(title: String) {
@@ -109,13 +113,16 @@ class CustomTabRobot {
             mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar")),
             waitingTime,
         )
+        Log.i(TAG, "longCLickAndCopyToolbarUrl: Trying to long click the custom tab toolbar")
         customTabToolbar().click(LONG_CLICK_DURATION)
-        Log.i(TAG, "longCLickAndCopyToolbarUrl: Long clicked custom tab toolbar")
+        Log.i(TAG, "longCLickAndCopyToolbarUrl: Long clicked the custom tab toolbar")
         clickContextMenuItem("Copy")
     }
 
     fun fillAndSubmitLoginCredentials(userName: String, password: String) {
+        Log.i(TAG, "fillAndSubmitLoginCredentials: Waiting for device to be idle for $waitingTime ms")
         mDevice.waitForIdle(waitingTime)
+        Log.i(TAG, "fillAndSubmitLoginCredentials: Waited for device to be idle for $waitingTime ms")
         setPageObjectText(itemWithResId("username"), userName)
         setPageObjectText(itemWithResId("password"), password)
         clickPageObject(itemWithResId("submit"))
@@ -126,11 +133,13 @@ class CustomTabRobot {
     }
 
     fun waitForPageToLoad() {
+        Log.i(TAG, "waitForPageToLoad: Waiting for $waitingTime ms until progress bar is gone")
         progressBar().waitUntilGone(waitingTime)
-        Log.i(TAG, "waitForPageToLoad: Waited $waitingTime ms until progress bar was gone")
+        Log.i(TAG, "waitForPageToLoad: Waited for $waitingTime ms until progress bar was gone")
     }
 
     fun clickCustomTabCloseButton() {
+        Log.i(TAG, "clickCustomTabCloseButton: Trying to click close custom tab button")
         closeButton().click()
         Log.i(TAG, "clickCustomTabCloseButton: Clicked close custom tab button")
     }
@@ -147,10 +156,12 @@ class CustomTabRobot {
     class Transition {
         fun openMainMenu(interact: CustomTabRobot.() -> Unit): Transition {
             mainMenuButton().also {
-                Log.i(TAG, "openMainMenu: Looking for main menu button")
+                Log.i(TAG, "openMainMenu: Waiting for $waitingTime ms for the main menu button to exist")
                 it.waitForExists(waitingTime)
+                Log.i(TAG, "openMainMenu: Waited for $waitingTime ms for the main menu button to exist")
+                Log.i(TAG, "openMainMenu: Trying to click the main menu button")
                 it.click()
-                Log.i(TAG, "openMainMenu: Clicked main menu button")
+                Log.i(TAG, "openMainMenu: Clicked the main menu button")
             }
 
             CustomTabRobot().interact()
@@ -158,16 +169,18 @@ class CustomTabRobot {
         }
 
         fun clickOpenInBrowserButton(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "clickOpenInBrowserButton: Trying to click the \"Open in Firefox\" button")
             openInBrowserButton().perform(click())
-            Log.i(TAG, "clickOpenInBrowserButton: Clicked \"Open in Firefox\" button")
+            Log.i(TAG, "clickOpenInBrowserButton: Clicked the \"Open in Firefox\" button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun clickShareButton(interact: ShareOverlayRobot.() -> Unit): ShareOverlayRobot.Transition {
+            Log.i(TAG, "clickShareButton: Trying to click the share button")
             itemWithDescription(getStringResource(R.string.mozac_feature_customtabs_share_link)).click()
-            Log.i(TAG, "clickShareButton: Clicked share button")
+            Log.i(TAG, "clickShareButton: Clicked the share button")
 
             ShareOverlayRobot().interact()
             return ShareOverlayRobot.Transition()

From 9e213654b2ecbde033d4c48fbee0aebcc71ffe2c Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 9 Feb 2024 13:34:04 +0200
Subject: [PATCH 134/222] Bug 1879509 - Add missing pairs of logs to
 DownloadRobot

---
 .../mozilla/fenix/ui/robots/DownloadRobot.kt  | 58 ++++++++++++-------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt
index 975000dd2..eab72fffb 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt
@@ -51,9 +51,8 @@ class DownloadRobot {
     fun verifyDownloadPrompt(fileName: String) {
         var currentTries = 0
         while (currentTries++ < 3) {
-            Log.i(TAG, "verifyDownloadPrompt: While loop currentTries = $currentTries")
+            Log.i(TAG, "verifyDownloadPrompt: Started try #$currentTries")
             try {
-                Log.i(TAG, "verifyDownloadPrompt: Try block")
                 assertUIObjectExists(
                     itemWithResId("$packageName:id/download_button"),
                     itemContainingText(fileName),
@@ -61,7 +60,7 @@ class DownloadRobot {
 
                 break
             } catch (e: AssertionError) {
-                Log.i(TAG, "verifyDownloadPrompt: Catch block")
+                Log.i(TAG, "verifyDownloadPrompt: AssertionError caught, executing fallback methods")
                 Log.e("DOWNLOAD_ROBOT", "Failed to find locator: ${e.localizedMessage}")
 
                 browserScreen {
@@ -96,11 +95,12 @@ class DownloadRobot {
         )
 
     fun clickTryAgainButton() {
+        Log.i(TAG, "clickTryAgainButton: Trying to click the \"TRY AGAIN\" in app prompt button")
         itemWithResIdAndText(
             "$packageName:id/download_dialog_action_button",
             "Try Again",
         ).click()
-        Log.i(TAG, "clickTryAgainButton: Clicked \"TRY AGAIN\" in app prompt button")
+        Log.i(TAG, "clickTryAgainButton: Clicked the \"TRY AGAIN\" in app prompt button")
     }
 
     fun verifyPhotosAppOpens() = assertExternalAppOpens(GOOGLE_APPS_PHOTOS)
@@ -111,34 +111,40 @@ class DownloadRobot {
     fun verifyDownloadedFileIcon() = assertUIObjectExists(itemWithResId("$packageName:id/favicon"))
 
     fun verifyEmptyDownloadsList() {
-        Log.i(TAG, "verifyEmptyDownloadsList: Looking for empty download list")
+        Log.i(TAG, "verifyEmptyDownloadsList: Waiting for $waitingTime ms for for empty download list to exist")
         mDevice.findObject(UiSelector().resourceId("$packageName:id/download_empty_view"))
             .waitForExists(waitingTime)
+        Log.i(TAG, "verifyEmptyDownloadsList: Waited for $waitingTime ms for for empty download list to exist")
+        Log.i(TAG, "verifyEmptyDownloadsList: Trying to verify that the \"No downloaded files\" list message is displayed")
         onView(withText("No downloaded files")).check(matches(isDisplayed()))
-        Log.i(TAG, "verifyEmptyDownloadsList: Verified \"No downloaded files\" list message")
+        Log.i(TAG, "verifyEmptyDownloadsList: Verified that the \"No downloaded files\" list message is displayed")
     }
 
     fun waitForDownloadsListToExist() =
         assertUIObjectExists(itemWithResId("$packageName:id/download_list"))
 
     fun openDownloadedFile(fileName: String) {
-        downloadedFile(fileName)
-            .check(matches(isDisplayed()))
-            .click()
+        Log.i(TAG, "openDownloadedFile: Trying to verify that the downloaded file: $fileName is displayed")
+        downloadedFile(fileName).check(matches(isDisplayed()))
+        Log.i(TAG, "openDownloadedFile: Verified that the downloaded file: $fileName is displayed")
+        Log.i(TAG, "openDownloadedFile: Trying to click downloaded file: $fileName")
+        downloadedFile(fileName).click()
         Log.i(TAG, "openDownloadedFile: Clicked downloaded file: $fileName")
     }
 
     fun deleteDownloadedItem(fileName: String) {
+        Log.i(TAG, "deleteDownloadedItem: Trying to click the trash bin icon to delete downloaded file: $fileName")
         onView(
             allOf(
                 withId(R.id.overflow_menu),
                 hasSibling(withText(fileName)),
             ),
         ).click()
-        Log.i(TAG, "deleteDownloadedItem: Deleted downloaded file: $fileName using trash bin icon")
+        Log.i(TAG, "deleteDownloadedItem: Clicked the trash bin icon to delete downloaded file: $fileName")
     }
 
     fun longClickDownloadedItem(title: String) {
+        Log.i(TAG, "longClickDownloadedItem: Trying to long click downloaded file: $title")
         onView(
             allOf(
                 withId(R.id.title),
@@ -149,21 +155,24 @@ class DownloadRobot {
     }
 
     fun selectDownloadedItem(title: String) {
+        Log.i(TAG, "selectDownloadedItem: Trying click downloaded file: $title to select it")
         onView(
             allOf(
                 withId(R.id.title),
                 withText(title),
             ),
         ).perform(click())
-        Log.i(TAG, "selectDownloadedItem: Selected downloaded file: $title")
+        Log.i(TAG, "selectDownloadedItem: Clicked downloaded file: $title to select it")
     }
 
     fun openMultiSelectMoreOptionsMenu() {
+        Log.i(TAG, "openMultiSelectMoreOptionsMenu: Trying to click multi-select more options button")
         itemWithDescription(getStringResource(R.string.content_description_menu)).click()
         Log.i(TAG, "openMultiSelectMoreOptionsMenu: Clicked multi-select more options button")
     }
 
     fun clickMultiSelectRemoveButton() {
+        Log.i(TAG, "clickMultiSelectRemoveButton: Trying to click multi-select remove button")
         itemWithResIdContainingText("$packageName:id/title", "Remove").click()
         Log.i(TAG, "clickMultiSelectRemoveButton: Clicked multi-select remove button")
     }
@@ -180,27 +189,31 @@ class DownloadRobot {
 
     class Transition {
         fun clickDownload(interact: DownloadRobot.() -> Unit): Transition {
+            Log.i(TAG, "clickDownload: Trying to click the \"Download\" download prompt button")
             downloadButton().click()
-            Log.i(TAG, "clickDownload: Clicked \"DOWNLOAD\" button from prompt")
+            Log.i(TAG, "clickDownload: Clicked the \"Download\" download prompt button")
 
             DownloadRobot().interact()
             return Transition()
         }
 
         fun closeDownloadPrompt(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "closeDownloadPrompt: Trying to click the close download prompt button")
             itemWithResId("$packageName:id/download_dialog_close_button").click()
-            Log.i(TAG, "closeDownloadPrompt: Dismissed download prompt by clicking close prompt button")
+            Log.i(TAG, "closeDownloadPrompt: Clicked the close download prompt button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun clickOpen(type: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            Log.i(TAG, "clickOpen: Looking for \"OPEN\" download prompt button")
+            Log.i(TAG, "clickOpen: Waiting for $waitingTime ms for the for \"OPEN\" download prompt button to exist")
             openDownloadButton().waitForExists(waitingTime)
+            Log.i(TAG, "clickOpen: Waited for $waitingTime ms for the for \"OPEN\" download prompt button to exist")
+            Log.i(TAG, "clickOpen: Trying to click the \"OPEN\" download prompt button")
             openDownloadButton().click()
-            Log.i(TAG, "clickOpen: Clicked \"OPEN\" download prompt button")
-
+            Log.i(TAG, "clickOpen: Clicked the \"OPEN\" download prompt button")
+            Log.i(TAG, "clickOpen: Trying to verify that the open intent is matched with associated data type")
             // verify open intent is matched with associated data type
             Intents.intended(
                 allOf(
@@ -208,37 +221,38 @@ class DownloadRobot {
                     IntentMatchers.hasType(type),
                 ),
             )
-            Log.i(TAG, "clickOpen: Verified that open intent is matched with associated data type")
+            Log.i(TAG, "clickOpen: Verified that the open intent is matched with associated data type")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun clickAllowPermission(interact: DownloadRobot.() -> Unit): Transition {
-            Log.i(TAG, "clickAllowPermission: Looking for \"ALLOW\" permission button")
             mDevice.waitNotNull(
                 Until.findObject(By.res(getPermissionAllowID() + ":id/permission_allow_button")),
                 waitingTime,
             )
-
+            Log.i(TAG, "clickAllowPermission: Trying to click the \"ALLOW\" permission button")
             mDevice.findObject(By.res(getPermissionAllowID() + ":id/permission_allow_button")).click()
-            Log.i(TAG, "clickAllowPermission: Clicked \"ALLOW\" permission button")
+            Log.i(TAG, "clickAllowPermission: Clicked the \"ALLOW\" permission button")
 
             DownloadRobot().interact()
             return Transition()
         }
 
         fun exitDownloadsManagerToBrowser(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "exitDownloadsManagerToBrowser: Trying to click the navigate up toolbar button")
             onView(withContentDescription("Navigate up")).click()
-            Log.i(TAG, "exitDownloadsManagerToBrowser: Exited download manager to browser by clicking the navigate up toolbar button")
+            Log.i(TAG, "exitDownloadsManagerToBrowser: Clicked the navigate up toolbar button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun goBack(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
+            Log.i(TAG, "goBack: Trying to click the navigate up toolbar button")
             goBackButton().click()
-            Log.i(TAG, "exitDownloadsManagerToBrowser: Exited download manager to home screen by clicking the navigate up toolbar button")
+            Log.i(TAG, "goBack: Clicked the navigate up toolbar button")
 
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()

From 70a8203442b34fa1cfaec2899b84591e046f9938 Mon Sep 17 00:00:00 2001
From: Titouan Thibaud <tthibaud@mozilla.com>
Date: Fri, 9 Feb 2024 18:00:17 +0100
Subject: [PATCH 135/222] Bug 1879583 - Change the default for pull-to-refresh
 to enabled

Co-authored-by: Jonathan Almeida <git@jonalmeida.com>
---
 app/src/main/java/org/mozilla/fenix/utils/Settings.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 7b8f0343e..1808eb3a3 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -1477,7 +1477,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
 
     var isPullToRefreshEnabledInBrowser by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_website_pull_to_refresh),
-        default = Config.channel.isNightlyOrDebug,
+        default = true,
     )
 
     var isDynamicToolbarEnabled by booleanPreference(

From 07a960be189d859a5405035a28b41a178745b242 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Sat, 10 Feb 2024 00:03:28 +0000
Subject: [PATCH 136/222] Import translations from android-l10n

---
 app/src/main/res/values-azb/strings.xml    | 104 +++++++++++++++++++++
 app/src/main/res/values-bg/strings.xml     |   2 +-
 app/src/main/res/values-et/strings.xml     |  68 ++++++++++++++
 app/src/main/res/values-hy-rAM/strings.xml |   3 +
 app/src/main/res/values-kab/strings.xml    |  16 +++-
 app/src/main/res/values-rm/strings.xml     |  74 +++++++--------
 app/src/main/res/values-sk/strings.xml     |   3 +
 app/src/main/res/values-ug/strings.xml     |   3 +
 8 files changed, 229 insertions(+), 44 deletions(-)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index dd604a09a..37a4ebc5f 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -499,6 +499,103 @@
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">%1$s اوچون کوکی بنر مسدود ائلین ایشدن سالینسین؟</string>
 
+    <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
+    <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s بو سایتدا کوُکی ایستک‌لرینی اوْتوماتیک رد ائده بیلمز. گله‌جکده بوُ سایتی آرخالاماق اوُچون ایستک گؤندره بیلرسینیز.</string>
+
+    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
+    <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">باغلاییْن و %1$s کوُکی‌لری سیله‌جک و بو سایتیْ یئنی‌دن دوْلدوُراجاق. بوُ ، سیزی حسابدان چیخارا ویا آلیْش-وئریْش سبدلرینی بوْشالتا بیلر.</string>
+
+    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
+    <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">آچیْن و %1$s بو سایتداکیْ بوتون کوُکی بنرلرینی اوْتوماتیک رد ائتمه‌گه چالیْشاجاق.</string>
+    <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
+    <string name="cookie_banner_cfr_title">%1$s سیزین اوچون کوُکی‌لری رد ائتدی.</string>
+
+    <!--Message for the cookie banner re-engagement CFR -->
+    <string name="cookie_banner_cfr_message">داها آز حواس داغیلماسیْ، بوُ سایتدا سیزی تعقیب ائدن کوُکی‌لر آز.</string>
+
+    <!-- Description of the preference to enable "HTTPS-Only" mode. -->
+    <string name="preferences_https_only_summary">داها چوْخ گوونلیک اوچون HTTPS رمزله‌مه پروْتوکولوُندان ایستیفاده ائده‌رک سایتلارا اوْتوماتیک قوْشوُلماغا چالیْشیر.</string>
+    <!-- Summary of https only preference if https only is set to off -->
+    <string name="preferences_https_only_off">باغلیْ</string>
+
+    <!-- Summary of https only preference if https only is set to on in all tabs -->
+    <string name="preferences_https_only_on_all">بوتون تاغلاردا آچیْق</string>
+    <!-- Summary of https only preference if https only is set to on in private tabs only -->
+    <string name="preferences_https_only_on_private">بوتون گیزلی تاغلاردا آچیْق</string>
+    <!-- Text displayed that links to website containing documentation about "HTTPS-Only" mode -->
+    <string name="preferences_http_only_learn_more">آرتیق بیلین</string>
+    <!-- Option for the https only setting -->
+    <string name="preferences_https_only_in_all_tabs">بوتون تاغلاردا گوجلندیر</string>
+    <!-- Option for the https only setting -->
+    <string name="preferences_https_only_in_private_tabs">بوتون گیزلی تاغلاردا گوجلندیر</string>
+    <!-- Title shown in the error page for when trying to access a http website while https only mode is enabled. -->
+    <string name="errorpage_httpsonly_title">گوونلی سایت موجود دئییل</string>
+    <!-- Message shown in the error page for when trying to access a http website while https only mode is enabled. The message has two paragraphs. This is the first. -->
+    <string name="errorpage_httpsonly_message_title">ایحتیمالی چوْخ، سایت HTTPS-ی آرخالامیْر.</string>
+
+    <!-- Message shown in the error page for when trying to access a http website while https only mode is enabled. The message has two paragraphs. This is the second. -->
+    <string name="errorpage_httpsonly_message_summary">بوُنونلا بئله، حمله ائده‌نین‌ده ایشتیراک ائتمه‌سی موُمکوندور. ایدامه وئرسز، هئچ بیر بیلگی وئرمه‌یین. ایدامه وئرسز، یالنیز HTTPS حالتی گئچیجی اوْلاراق باغلاناجاقدیْر.</string>
+
+    <!-- Preference for accessibility -->
+    <string name="preferences_accessibility">اَل چاتانلیق</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">اؤزل موْزیلا حسابیْ سِروری</string>
+    <!-- Preference to override the Sync token server -->
+    <string name="preferences_override_sync_tokenserver">اؤزل دؤنگل سرور</string>
+
+    <!-- Preference category for account information -->
+    <string name="preferences_category_account">حساب</string>
+    <!-- Preference for changing where the toolbar is positioned -->
+    <string name="preferences_toolbar">ادوات چوبوغو</string>
+    <!-- Preference for changing default theme to dark or light mode -->
+    <string name="preferences_theme">تم</string>
+    <!-- Preference for customizing the home screen -->
+    <string name="preferences_home_2">آنایارپاق</string>
+    <!-- Preference for settings related to visual options -->
+    <string name="preferences_customize">اؤزللشدیرمک</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">موْزیلا حسابی</string>
+    <!-- Preference for language -->
+    <string name="preferences_language">دیل</string>
+    <!-- Preference for data choices -->
+    <string name="preferences_data_choices">دیتا سئچیمی</string>
+    <!-- Preference for open links in third party apps always open in apps option -->
+    <string name="preferences_open_links_in_apps_always">هر زامان</string>
+    <!-- Preference for open links in third party apps never open in apps option -->
+    <string name="preferences_open_links_in_apps_never">هئچ زامان</string>
+
+    <!-- Preference for add_ons -->
+    <string name="preferences_addons">تاخیلان‌لار</string>
+
+    <!-- Preference for notifications -->
+    <string name="preferences_notifications">بیلدیریش‌لر</string>
+    <!-- Summary for notification preference indicating notifications are allowed -->
+    <string name="notifications_allowed_summary">ایجازه وئریلدی</string>
+    <!-- Summary for notification preference indicating notifications are not allowed -->
+    <string name="notifications_not_allowed_summary">ایجازه وئریلمه‌دی</string>
+
+    <!-- Button caption to confirm the add-on collection configuration -->
+    <string name="customize_addon_collection_ok">تامام</string>
+    <!-- Button caption to abort the add-on collection configuration -->
+    <string name="customize_addon_collection_cancel">لغو</string>
+
+    <!-- Text displayed that links to website containing documentation about the "Limited Edition" wallpapers. -->
+    <string name="wallpaper_learn_more">آرتیق بیلین</string>
+
+    <!-- Preference for triggering sync -->
+    <string name="preferences_sync_now">ایندی دؤنگل‌لندیر</string>
+    <!-- Preference for syncing history -->
+    <string name="preferences_sync_history">گئچمیش</string>
+    <!-- Preference for syncing bookmarks -->
+    <string name="preferences_sync_bookmarks">بوُکمارک‌لار</string>
+
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">رمز‌لر</string>
+    <!-- Preference for syncing tabs -->
+    <string name="preferences_sync_tabs_2">آچیْق تاغ‌لار</string>
+    <!-- Preference for signing out -->
+    <string name="preferences_sign_out">چیخیش</string>
+
     <!-- Toolbar Preferences -->
     <!-- Preference for using top toolbar -->
     <string name="preference_top_toolbar">اوست</string>
@@ -520,6 +617,13 @@
     <string name="preference_gestures_dynamic_toolbar">آلت‌لر چوبوغونو گیزلتمک اوچون اسکرول ائله‌</string>
 
 
+    <!-- Library -->
+    <!-- Option in Library to open Downloads page -->
+    <string name="library_downloads">یئندیرنلر</string>
+    <!-- Option in library to open Bookmarks page -->
+    <string name="library_bookmarks">بوُکمارک‌لار</string>
+
+
     <!-- Translations feature-->
 
     </resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 04883adee..90068f68d 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -526,7 +526,7 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Впишете се, за да синхронизирате раздели, отметки, пароли и други.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name_2">сметка в Mozilla</string>
+    <string name="preferences_account_default_name_2">Профил в Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Свържете повторно, за да бъде възобновено синхронизирането</string>
     <!-- Preference for language -->
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 998bcdd8f..b7312a3b4 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -16,6 +16,14 @@
     <string name="content_description_disable_private_browsing_button">Keela privaatne veebilehitsemine</string>
     <!-- Placeholder text shown in the search bar before a user enters text for the default engine -->
     <string name="search_hint">Otsi või sisesta aadress</string>
+    <!-- Placeholder text shown in the search bar before a user enters text for a general engine -->
+    <string name="search_hint_general_engine">Otsi veebist</string>
+    <!-- Placeholder text shown in search bar when using history search -->
+    <string name="history_search_hint">Otsi ajaloost</string>
+    <!-- Placeholder text shown in search bar when using bookmarks search -->
+    <string name="bookmark_search_hint">Otsi järjehoidjatest</string>
+    <!-- Placeholder text shown in search bar when using tabs search -->
+    <string name="tab_search_hint">Otsi kaartidest</string>
     <!-- Placeholder text shown in the search bar when using application search engines -->
     <string name="application_search_hint">Sisesta otsitav fraas</string>
     <!-- No Open Tabs Message Description -->
@@ -39,6 +47,9 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Valitud</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_title">Hiljuti salvestatud</string>
     <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
     <string name="recently_saved_show_all_content_description_2">Kuva kõiki järjehoidjaid</string>
 
@@ -55,6 +66,24 @@
  %1$s kustutab privaatsete kaartide otsimise ja lehitsemise ajaloo, kui väljud rakendusest või sulged privaatsed kaardid. Kuigi see ei muuda sind külastatavate veebilehtede või internetiteenuse pakkuja ees anonüümseks, kaitseb see siiski sinu privaatsust teiste selle seadme kasutajate eest.</string>
     <string name="private_browsing_common_myths">Levinumad müüdid privaatse veebilehitsemise kohta</string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Ära jäta sellesse seadmesse jälgi</string>
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle_2">%1$s kustutab küpsised, ajaloo ja saidiandmed, kui sulged kõik privaatsed kaardid. %2$s</string>
+    <!-- Clickable portion of the explanation for private browsing that links the user to our
+        about privacy page.
+        This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
+    <string name="felt_privacy_info_card_subtitle_link_text">Kes võib minu tegevusi näha?</string>
+
+    <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
+    <!-- Text for the Private mode shortcut CFR message for adding a private mode shortcut to open private tabs from the Home screen -->
+    <string name="private_mode_cfr_message_2">Ava järgmine privaatne kaart ühe puudutusega.</string>
+    <!-- Text for the positive button to accept adding a Private Browsing shortcut to the Home screen -->
+    <string name="private_mode_cfr_pos_button_text">Lisa avaekraanile</string>
     <!-- Text for the negative button to decline adding a Private Browsing shortcut to the Home screen -->
     <string name="cfr_neg_button_text">Tänan, ei soovi</string>
 
@@ -68,6 +97,19 @@
     <string name="open_in_app_cfr_negative_button_text">Peida</string>
 
 
+    <!-- Total cookie protection "contextual feature recommendation" (CFR) -->
+    <!-- Text for the message displayed in the contextual feature recommendation popup promoting the total cookie protection feature. -->
+    <string name="tcp_cfr_message">Meie võimsaim privaatsusfunktsioon, mis siiski eraldab saidiülesed jälitajad.</string>
+
+
+    <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
+    <string name="tcp_cfr_learn_more">Rohkem teavet täielikust küpsiste vastasest kaitsest</string>
+
+    <!-- Private browsing erase action "contextual feature recommendation" (CFR) -->
+    <!-- Text for the message displayed in the contextual feature recommendation popup promoting the erase private browsing feature. -->
+    <string name="erase_action_cfr_message">Uue privaatseansi alustamiseks puuduta siit. Kustuta ajalugu, küpsised – kõik.</string>
+
+
     <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
     <string name="camera_permissions_needed_message">Vajalik on ligipääs kaamerale. Mine Androidi sätetesse, puuduta õigusi ja seejärel puuduta lubamise valikut.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -103,6 +145,9 @@
     <!-- Shortcut action to open new private tab -->
     <string name="home_screen_shortcut_open_new_private_tab_2">Uus privaatne kaart</string>
 
+    <!-- Shortcut action to open Passwords screens -->
+    <string name="home_screen_shortcut_open_password_screen">Paroolide otsetee</string>
+
     <!-- Recent Tabs -->
     <!-- Header text for jumping back into the recent tab in the home screen -->
     <string name="recent_tabs_header">Hiljutised kaardid</string>
@@ -115,6 +160,8 @@
     <string name="recent_tabs_see_all_synced_tabs_button_text">Kuva kõiki sünkroniseeritud kaarte</string>
     <!-- Accessibility description for device icon used for recent synced tab -->
     <string name="recent_tabs_synced_device_icon_content_description">Sünkroniseeritud seade</string>
+    <!-- Text for the dropdown menu to remove a recent synced tab from the homescreen -->
+    <string name="recent_synced_tab_menu_item_remove">Eemalda</string>
     <!-- Text for the menu button to remove a grouped highlight from the user's browsing history
          in the Recently visited section -->
     <string name="recent_tab_menu_item_remove">Eemalda</string>
@@ -140,6 +187,8 @@
     <string name="browser_menu_stop">Peata</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Lisad</string>
+    <!-- Browser menu button that opens account settings -->
+    <string name="browser_menu_account_settings">Konto andmed</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Lisad puuduvad</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -153,6 +202,8 @@
     <string name="browser_menu_library">Kogumik</string>
     <!-- Browser menu toggle that requests a desktop site -->
     <string name="browser_menu_desktop_site">Töölaua versioon</string>
+    <!-- Browser menu button that reopens a private tab as a regular tab -->
+    <string name="browser_menu_open_in_regular_tab">Ava tavalisel kaardil</string>
     <!-- Browser menu toggle that adds a shortcut to the site on the device home screen. -->
     <string name="browser_menu_add_to_homescreen">Lisa avaekraanile</string>
     <!-- Browser menu toggle that installs a Progressive Web App shortcut to the site on the device home screen. -->
@@ -163,6 +214,8 @@
     <!-- Browser menu button that opens the find in page menu -->
     <string name="browser_menu_find_in_page">Otsi lehelt</string>
 
+    <!-- Browser menu button that opens the translations dialog, which has options to translate the current browser page. -->
+    <string name="browser_menu_translations">Tõlgi leht</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">Salvesta kollektsiooni</string>
     <!-- Browser menu button that open a share menu to share the current site -->
@@ -197,6 +250,12 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Avaleht</string>
 
+    <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
+         history and go back to the home screen. -->
+    <string name="browser_toolbar_erase">Kustuta lehitsemise ajalugu</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Tõlgi leht</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valitud keel</string>
@@ -233,6 +292,15 @@
     <!-- Header text for the search selector menu -->
     <string name="search_header_menu_item_2">Otsi seekord järgneva otsingumootoriga:</string>
 
+    <!-- Content description (not visible, for screen readers etc.): Search engine icon. The first parameter is the search engine name (for example: DuckDuckGo). -->
+    <string name="search_engine_icon_content_description" tools:ignore="UnusedResources">%s otsingumootor</string>
+
+    <!-- Home onboarding -->
+    <!-- Onboarding home screen popup dialog, shown on top of the Jump back in section. -->
+    <string name="onboarding_home_screen_jump_back_contextual_hint_2">Tutvu oma isikupärastatud kodulehega. Siin kuvatakse hiljutised kaardid, järjehoidjad ja otsingutulemused.</string>
+    <!-- Home onboarding dialog welcome screen title text. -->
+    <string name="onboarding_home_welcome_title_2">Tere tulemast isikupärasemasse internetti</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. The first parameter is the name of the application.-->
     <string name="search_widget_content_description_2">Ava uus kaart %1$sis</string>
diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml
index 50cd8346f..2e0696586 100644
--- a/app/src/main/res/values-hy-rAM/strings.xml
+++ b/app/src/main/res/values-hy-rAM/strings.xml
@@ -2165,6 +2165,9 @@
     <string name="other_default_search_engine_suggestion_header">%s որոնում</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Փոխարկեք ձեր սկզբնադիր զննարկիչը</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Կայեք հղումներ կայքերից, էլ. նամակներից և հաղորդագրություններից, որոնք ինքնաբար կերպով կբացվեն Firefox-ում:</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index bdb13932b..9f1bd4710 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -2150,7 +2150,7 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Anadi %s</string>
 
-    <!-- Default browser experiment -->
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Sbadu iseɣwan seg yismal web, seg yimaylen d yiznan i twaledyawt s wudem awurman deg Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2329,14 +2329,21 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Action label for links to the Firefox Pocket website. Talkback will append this to say "Double tap to open link to learn more". -->
     <string name="a11y_action_label_pocket_learn_more">ldi aseɣwen i wakken ad tissineḍ ugar</string>
 
+    <!-- Content description for headings announced by accessibility service. The first parameter is the text of the heading. Talkback will announce the first parameter and then speak the word "Heading" indicating to the user that this text is a heading for a section. -->
+    <string name="a11y_heading">%s, azwel</string>
     <!-- Title for dialog displayed when trying to access links present in a text. -->
     <string name="a11y_links_title">Iseɣwan</string>
 
+    <!-- Additional content description for text bodies that contain urls. -->
+    <string name="a11y_links_available">Iseɣwan i yellan</string>
+
     <!-- Translations feature-->
 
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Suqqel asebter-a?</string>
+    <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translations_bottom_sheet_title_first_time">Ԑreḍ tisuqilin tusligin n %1$s</string>
     <!-- Text that links to additional information about the Firefox translations feature. -->
     <string name="translations_bottom_sheet_info_message_learn_more">Issin ugar</string>
     <!-- Label for the dropdown to select which language to translate from on the translations dialog. Usually the translate from language selected will be the same as the page language. -->
@@ -2354,13 +2361,20 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Inactive button text on the translations dialog that indicates a translation is currently in progress. This button will be accompanied by a loading icon. -->
     <string name="translations_bottom_sheet_translating_in_progress">Suqqel</string>
 
+    <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
+    <string name="translations_bottom_sheet_translating_in_progress_content_description">Asuqel iteddu</string>
     <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
     <string name="translations_bottom_sheet_default_dropdown_selection">Fren tutlayt</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Yella wugur deg usuqqel. Ttxil-k ɛreḍ tikkelt niḍen.</string>
+    <!-- The title of the warning card informs the user that a language is not supported. The first parameter is the name of the language that is not supported. -->
+    <string name="translation_error_language_not_supported_warning_text">Nesḥassef, mazal ur nessefrak ara tutlayt %1$s.</string>
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Issin ugar</string>
 
+    <!-- Translations options dialog -->
+    <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
+    <string name="translation_option_bottom_sheet_title">Tixtiṛiyin n usuqel</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to always offer or suggest translations when available. -->
     <string name="translation_option_bottom_sheet_always_translate">Sumer yal tikkelt tasuqqilt</string>
     <!-- Toggle switch label that allows a user to set if they would like a given language to automatically translate or not. The first parameter is the language name, for example, "Spanish". -->
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 9d9fbb672..efa79cba3 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -239,6 +239,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Persunalisar la pagina da partenza</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Visur da partenza</string>
@@ -246,6 +247,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Stizzar la cronologia</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Translatar la pagina</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Lingua tschernida</string>
@@ -257,8 +261,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scannar</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Maschina da tschertgar</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Parameters da la maschina da tschertgar</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -312,24 +314,29 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Communicaziuns ta gidan da far dapli cun %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Communicaziuns ta gidan da far dapli cun %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sincronisescha tes tabs tranter apparats, administrescha las telechargiadas, retschaiva tips per profitar il meglier da la protecziun da datas da %s ed auter pli.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sincronisescha tes tabs tranter apparats, administrescha las telechargiadas, retschaiva tips per profitar il meglier da la protecziun da datas da %s ed auter pli.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Cuntinuar</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Cuntinuar</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Betg ussa</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Betg ussa</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Las directivas da Firefox per la protecziun da datas</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Nus ta protegin cun plaschair</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Noss navigatur dad in\'organisaziun senza finamira da profit, gida ad evitar che interpresas ta persequiteschian a la zuppada en il web.\n
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Noss navigatur dad in’organisaziun senza finamira da profit, gida ad evitar che interpresas ta persequiteschian a la zuppada en il web.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Noss navigatur dad in\'organisaziun senza finamira da profit, gida ad evitar che interpresas ta persequiteschian a la zuppada en il web.\n
 \nLegia dapli dal tema en nossas infurmaziuns davart la protecziun da datas.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">infurmaziuns davart la protecziun da datas</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">infurmaziuns davart la protecziun da datas</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Definir sco navigatur da standard</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -432,21 +439,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modus mo HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducziun da bandieras da cookies</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Bloccada da bandieras da cookies</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Bloccada da bandieras da cookies en il modus privat</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducir las bandieras da cookies</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Deactivà</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Activà</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s emprova da refusar automaticamain dumondas da deponer cookies cura ch\'ina bandiera da cookies sa mussa.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Deactivà per questa website</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -464,34 +461,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Questa website na vegn actualmain betg sustegnida</string>
 
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Activar la reducziun da bandieras da cookies per %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Activar la bloccada da bandieras da cookies per %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Deactivar la reducziun da bandieras da cookies per %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Deactivar la bloccada da bandieras da cookies per %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s na po betg refusar automaticamain dumondas da deponer cookies da questa website. Ti pos trametter ina dumonda da sustegnair questa website en avegnir.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s vegn a stizzar ils cookies da questa website ed actualisar la pagina. Cun stizzar tut ils cookies vegns ti eventualmain deconnectà da websites ed i po dar che chanasters da cumpras vegnan svidads.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Suenter la deactivaziun vegn %1$s ad allontanar ils cookies e rechargiar questa website. Quai po ta deconnectar da la website e svidar eventuals chanasters da cumpras.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s emprova da refusar automaticamain tut las dumondas da deponer cookies da paginas sustegnidas.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Activescha la bloccada e %1$s vegn ad empruvar da refusar automaticamain tut las bandieras da cookies sin questa website.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Permetter a %1$s da refusar bandieras da cookies?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s po refusar automaticamain bleras dumondas da bandieras da cookies.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Betg ussa</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Ti vegns a vesair damain dumondas da cookies</string>
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Permetter</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s ha refusà cookies per tai</string>
@@ -707,6 +686,8 @@
     <string name="preferences_sync_bookmarks">Segnapaginas</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Infurmaziuns d\'annunzia</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Pleds-clav</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Tabs averts</string>
     <!-- Preference for signing out -->
@@ -733,6 +714,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Cartas da credit</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Metodas da pajament</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adressas</string>
 
@@ -1266,8 +1249,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Serrar</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Impussibel da stampar</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Impussibel da stampar questa pagina</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Stampar</string>
@@ -1680,8 +1661,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Infurmaziuns d\'annunzia e pleds-clav</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Pleds-clav</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Memorisar las infurmaziuns d\'annunzia ed ils pleds-clav</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Memorisar ils pleds-clav</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Dumandar per memorisar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1699,10 +1684,17 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Agiuntar infurmaziuns d\'annunzia</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Agiuntar in pled-clav</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronisar las infurmaziuns d\'annunzia</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronisar ils pleds-clav</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sincronisar las datas d\'annunzia tranter tes apparats</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronisar ils pleds-clav sin tut ils apparats</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Infurmaziuns d\'annunzia memorisadas</string>
 
@@ -2107,7 +2099,7 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Tschertga %s</string>
 
-    <!-- Default browser experiment -->
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Definescha che colliaziuns da websites, e-mails e messadis vegnan averts automaticamain en Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2181,8 +2173,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[Ils elements <b>accentuads</b> derivan da las recensiun sin %s dals ultims 80 dis che nus tegnain per fidablas.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Ulteriuras infurmaziuns davart %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">co %s da Mozilla determinescha la qualitad da las recensiuns</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">co %s determinescha la qualitad da las recensiuns</string>
     <!-- Text for title of settings section. -->
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 03d13eb44..9be4f869c 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -2183,6 +2183,9 @@
     <string name="other_default_search_engine_suggestion_header">Vyhľadávanie %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Zmeňte svoj predvolený prehliadač</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Nastavte si automatické otváranie webových stránok, e‑mailov a správ vo Firefoxe.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index 27f068117..d0b0e1fdf 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -2150,6 +2150,9 @@
     <string name="other_default_search_engine_suggestion_header">%s ئىزدەش</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">كۆڭۈلدىكى توركۆرگۈڭىزنى ئالماشتۇرۇڭ</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">تور بېكەت، ئېلخەت ۋە ئۇچۇر ئۇلانمىلىرىنى Firefox تا ئاپتوماتىك ئېچىشقا تەڭشەيدۇ.</string>
 
     <!-- Content description for close button in collection placeholder. -->

From 24f38a6af54fcb24e963ed264b4bd913bfc89bbd Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Sun, 11 Feb 2024 00:03:58 +0000
Subject: [PATCH 137/222] Import translations from android-l10n

---
 app/src/main/res/values-co/strings.xml     | 146 +++++++++++++++------
 app/src/main/res/values-cy/strings.xml     |  22 ++--
 app/src/main/res/values-da/strings.xml     |   3 +
 app/src/main/res/values-et/strings.xml     |  28 ++++
 app/src/main/res/values-fi/strings.xml     |   9 ++
 app/src/main/res/values-fur/strings.xml    |   3 +
 app/src/main/res/values-kab/strings.xml    |   5 +
 app/src/main/res/values-nb-rNO/strings.xml | 110 +++++++++-------
 app/src/main/res/values-pt-rBR/strings.xml |   2 +-
 app/src/main/res/values-uk/strings.xml     |   3 +
 app/src/main/res/values-vi/strings.xml     |   3 +
 11 files changed, 232 insertions(+), 102 deletions(-)

diff --git a/app/src/main/res/values-co/strings.xml b/app/src/main/res/values-co/strings.xml
index a83ceb267..b233b981b 100644
--- a/app/src/main/res/values-co/strings.xml
+++ b/app/src/main/res/values-co/strings.xml
@@ -247,6 +247,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Persunalizà a pagina d’accolta</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Screnu d’accolta</string>
@@ -254,6 +255,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Squassà a cronolugia di navigazione</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Traduce a pagina</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Lingua selezziunata</string>
@@ -265,8 +269,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Numerizà</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Mutore di ricerca</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Preferenze di u mutore di ricerca</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -321,14 +323,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">E nutificazioni vi aiutanu à fane di più cù %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">E nutificazioni vi aiutanu à fane di più cù %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sincrunizate l’unghjette trà i vostri apparechji, urganizate i scaricamenti, ottinite cunsiglii per sfruttà u più bellu di a prutezzione di a vita privata da %s, è ancu di più.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sincrunizate l’unghjette trà i vostri apparechji, urganizate i scaricamenti, ottinite cunsiglii per sfruttà u più bellu di a prutezzione di a vita privata da %s, è ancu di più.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Cuntinuà</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Cuntinuà</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Micca subitu</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Micca subitu</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -447,22 +449,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modu solu HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Riduzzione di e striscie di cannistrelli</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blucchime di e striscie di cannistrelli</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blucchime di e striscie di cannistrelli in navigazione privata</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Riduce e striscie di canistrelli</string>
-
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Disattivata</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Attivata</string>
 
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s prova autumaticamente di righjittà e dumande di canistrelli quandu ci hè striscie di canistrelli.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Disattivata per stu situ</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -480,36 +471,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Attualmente u situ ùn hè micca accettatu</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Attivà a riduzzione di e striscie di cannistrelli per %1$s ?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Attivà u blucchime di e striscie di cannistrelli per %1$s ?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Disattivà a riduzzione di e striscie di cannistrelli per %1$s ?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Disattivà u blucchime di e striscie di cannistrelli per %1$s ?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s ùn pò micca righjittà autumaticamente e dumande di canistrelli nant’à stu situ. Pudete mandà una richiesta per ch’ellu sia accettallu in u futuru.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s squasserà i canistrelli di stu situ è attualizerà a pagina. A squassatura di tutti i canistrelli puderia discunnettevi o viutà e sporte di comprera.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Disattivate l’ozzione è %1$s squasserà i canistrelli è ricaricherà stu situ. St’azzioni ponu discunettevi o viutà e vostre sporte di comprera.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s prova autumaticamente di righjittà tutte e dumande di canistrelli nant’à i siti accettati.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Attivate l’ozzione è %1$s pruverà di righjittà autumaticamente tutte e striscie di canistrelli nant’à stu situ.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Permette à %1$s di righjettà e striscie di canistrelli ?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s pò righjittà autumaticamente parechje dumande di striscie di canistrelli.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Micca subitu</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Viderete menu richieste di cannistrelli</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Permette</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s hà righjittatu i canistrelli per voi</string>
@@ -730,6 +702,8 @@
     <string name="preferences_sync_bookmarks">Indette</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Identificazioni di cunnessione</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Parolle d’intesa</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Apre l’unghjette</string>
     <!-- Preference for signing out -->
@@ -757,6 +731,8 @@
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Carte bancarie</string>
 
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Metode di pagamentu</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Indirizzi</string>
 
@@ -1300,8 +1276,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Chjode</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Impussibule di stampà</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Impussibule di stampà sta pagina</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Stampà</string>
@@ -1702,8 +1676,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Identificazioni è parolle d’intesa</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Parolle d’intesa</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Arregistrà l’identificazioni è e parolle d’intesa</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Arregistrà e parolle d’intesa</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Dumandà per arregistrà</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1721,27 +1699,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Aghjunghje un’identificazione di cunnessione</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Aghjunghje una parolla d’intesa</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincrunizà l’identificazioni</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincrunizà e parolle d’intesa</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sincrunizà l’identificazioni di cunnessione trà tutti l’apparechji</string>
+    <string name="preferences_passwords_sync_logins_across_devices">Sincrunizà l’identificazioni di cunnessione trà l’apparechji</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincrunizà e parolle d’intesa trà l’apparechji</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Identificazioni di cunnessione arregistrate</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Parolle d’intesa arregistrate</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">L’identificazioni di cunnessione chì voi arregistrate o sincrunizate cù %s seranu affissate quì.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">E parolle d’intesa chì vo arregistrate o sincrunizate cù %s seranu affissate quì. Tutte e parolle d’intesa chì vo arregistrate sò cifrate.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Sapene di più nant’à Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Sapene di più nant’à a sincrunizazione</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Eccezzioni</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">L’identificazioni è parolle d’intesa chì ùn sò micca arregistrate seranu affissate quì.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s ùn arregistrerà micca e parolle d’intesa per i siti allistinati quì.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">L’identificazioni è parolle d’intesa ùn seranu micca arregistrate per sti siti.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s ùn arregistrerà micca e parolle d’intesa per sti siti.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Squassà tutte l’eccezzioni</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Ricercà identificazioni di cunnessione</string>
 
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Ricercà parolle d’intesa</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Situ</string>
     <!-- The header for the username for a login -->
@@ -1771,10 +1768,16 @@
     <string name="saved_login_hide_password">Piattà a parolla d’intesa</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Spalancate per affissà l’identificazioni di cunnessione arregistrate</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Spalancate per affissà e vostre parolle d’intesa arregistrate</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Prutigite e vostre identificazioni di cunnessione è parolle d’intesa</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Prutigite e vostre parolle d’intesa arregistrate</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Definite un dissegnu di chjusura, un codice PIN o una parolla d’intesa per prutege e vostre identificazioni di cunnessione è parolle d’intesa arregistrate s’ellu ci era qualchissia chì accidissi à u vostru apparechju.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Definite un dissegnu di chjuditura, un codice PIN o una parolla d’intesa per prutege e vostre parolle d’intesa arregistrate s’ellu ci era qualchissia chì accidissi à u vostru apparechju.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Dopu</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1794,6 +1797,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Listinu di classificazione di l’identificazioni</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Listinu di classificazione di e parolle d’intesa</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Riempiimentu autumaticu</string>
@@ -1801,18 +1807,28 @@
     <string name="preferences_addresses">Indirizzi</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Carte bancarie</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Metode di pagamentu</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Arregistrà è riempie autumaticamente e carte</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Arregistrà è rinsignà e metode di pagamentu</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">I dati sò cifrati</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s cifra tutte e metode di pagamentu chì vo arregistrate</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincrunizate e carte trà i vostri apparechji</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sincrunizà e carte</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Aghjunghje una carta bancaria</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Aghjunghje una carta</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Amministrà e carte arregistrate</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Amministrà e carte</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Aghjunghje un indirizzu</string>
     <!-- Preference option for managing saved addresses -->
@@ -1820,9 +1836,14 @@
 
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Arregistrà è riempie autumaticamente l’indirizzi</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Arregistrà è rinsignà l’indirizzi</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Include l’infurmazioni cum’è i numeri, i messaghji elettronichi è l’indirizzi di spedizione</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Include i numeri di telefonu è l’indirizzi elettronichi</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Aghjunghje una carta</string>
     <!-- Title of the "Edit card" screen -->
@@ -1844,6 +1865,8 @@
     <string name="credit_cards_delete_card_button">Squassà a carta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Vulete veramente squassà sta carta bancaria ?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Squassà a carta ?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Squassà</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1858,15 +1881,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Ci vole à stampittà un numeru accettevule di carta bancaria</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Stampittate un numeru di carta bancaria accettevule</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Ci vole à riempie stu campu</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Aghjunghje un nome</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Spalancate per affissà e vostre carte arregistrate</string>
 
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Prutege e vostre carte bancarie</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Prutigite e vostre metode di pagamentu arregistrate</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Definite un dissegnu di chjusura, un codice PIN o una parolla d’intesa per prutege e vostre carte arregistrate s’ellu ci era qualchissia chì accidissi à u vostru apparechju.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Definite un dissegnu di chjusura, un codice PIN o una parolla d’intesa per prutege e vostre metode di pagamentu arregistrate s’ellu ci era qualchissia chì accidissi à u vostru apparechju.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Cunfigurà subitu</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1876,6 +1907,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Spalancate per impiegà l’infurmazione di e carte bancarie arregistrate</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Spalancate per impiegà e metode di pagamentu arregistrate</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Aghjunghje un indirizzu</string>
     <!-- Title of the "Edit address" screen -->
@@ -1913,6 +1946,8 @@
     <string name="addressess_delete_address_button">Squassà l’indirizzu</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Vulete veramente squassà st’indirizzu ?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Squassà st’indirizzu ?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Squassà</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2012,30 +2047,52 @@
     <string name="login_menu_edit_button">Mudificà</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Vulete veramente squassà st’identificazione di cunnessione ?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Vulete veramente squassà sta parolla d’intesa ?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Squassà</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Abbandunà</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Ozzioni di l’identificazione</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Ozzioni di parolla d’intesa</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">U campu di testu mudifichevule per l’indirizzu web di l’identificazione.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">U campu di testu mudifichevule per l’indirizzu di u situ web.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">U campu di testu mudifichevule per u nome d’utilizatore di l’identificazione.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">U campu di testu mudifichevule per u nome d’utilizatore.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">U campu di testu mudifichevule per a parolla d’intesa di l’identificazione.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">U campu di testu mudifichevule per a parolla d’intesa.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Arregistrà i cambiamenti di l’identificazione.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Arregistrà i cambiamenti.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Mudificà</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Mudificà a parolla d’intesa</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Aghjunghje una nova identificazione di cunnessione</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Aghjunghje una parolla d’intesa</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Parolla d’intesa richiesta</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Stampittate una parolla d’intesa</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">U nome d’utilizatore hè richiestu</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Stampittate un nome d’utilizatore</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">U nome d’ospite hè richiestu</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Stampittate un indirizzu web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Ricerca vucale</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2134,6 +2191,9 @@
     <string name="other_default_search_engine_suggestion_header">Ricerca cù %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Cambià di navigatore predefinitu</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Definisce chì i liami di i siti web, i currieri elettronichi è i messaghji s’aprinu autumaticamente in Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2212,8 +2272,6 @@
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Sapene di più nant’à %s.</string>
 
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">cumu %s da Mozilla determineghja a qualità di l’avisi</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">cumu %s determineghja a qualità di l’avisi</string>
     <!-- Text for title of settings section. -->
@@ -2402,6 +2460,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Traduzzione in corsu</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Sciglite una lingua</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Un prublema hè accadutu durante a traduzzione. Ci vole à pruvà torna.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2422,6 +2482,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Ùn traduce mai in %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Ùn traduce mai stu situ</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Supraneghja tutte l’altre preferenze</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Supraneghja e pruposte di traduzzione</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Preferenze di traduzzione</string>
 
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index bc5f735d6..c86dbcc71 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -490,7 +490,7 @@
     <!-- Summary of https only preference if https only is set to on in private tabs only -->
     <string name="preferences_https_only_on_private">Ymlaen mewn tabiau preifat</string>
     <!-- Text displayed that links to website containing documentation about "HTTPS-Only" mode -->
-    <string name="preferences_http_only_learn_more">Dysgu rhagor</string>
+    <string name="preferences_http_only_learn_more">Darllen rhagor</string>
     <!-- Option for the https only setting -->
     <string name="preferences_https_only_in_all_tabs">Galluogi ym mhob tab</string>
     <!-- Option for the https only setting -->
@@ -641,7 +641,7 @@
     <!-- Snackbar message for when wallpaper couldn't be selected because of the disk error -->
     <string name="wallpaper_select_error_snackbar_message">Methu newid papur wal</string>
     <!-- Text displayed that links to website containing documentation about the "Limited Edition" wallpapers. -->
-    <string name="wallpaper_learn_more">Dysgu rhagor</string>
+    <string name="wallpaper_learn_more">Darllen rhagor</string>
 
     <!-- Text for classic wallpapers title. The first parameter is the Firefox name. -->
     <string name="wallpaper_classic_title">%s clasurol</string>
@@ -743,7 +743,7 @@
     <!-- Text displayed when there are no exceptions -->
     <string name="exceptions_empty_message_description">Mae eithriadau’n caniatáu i chi analluogi diogelwch rhag trasio ar wefannau penodol.</string>
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
-    <string name="exceptions_empty_message_learn_more_link">Dysgu rhagor</string>
+    <string name="exceptions_empty_message_learn_more_link">Darllen rhagor</string>
 
     <!-- Preference switch for usage and technical data collection -->
     <string name="preference_usage_data">Data defnydd a thechnegol</string>
@@ -913,7 +913,7 @@
     <!-- Description for studies, it indicates why Firefox use studies. The first parameter is the name of the application. -->
     <string name="studies_description_2">Gall %1$s osod a rhedeg astudiaethau o bryd i’w gilydd.</string>
     <!-- Learn more link for studies, links to an article for more information about studies. -->
-    <string name="studies_learn_more">Dysgu rhagor</string>
+    <string name="studies_learn_more">Darllen rhagor</string>
 
     <!-- Dialog message shown after removing a study -->
     <string name="studies_restart_app">Bydd yr ap yn cau er mwyn gosod y newidiadau</string>
@@ -1511,7 +1511,7 @@
     <!-- Description of enhanced tracking protection. The parameter is the name of the application (For example: Firefox Fenix) -->
     <string name="preference_enhanced_tracking_protection_explanation_2">Mae %s yn eich diogelu rhag llawer o’r tracwyr mwyaf cyffredin sy’n dilyn yr hyn rydych chi’n ei wneud ar-lein.</string>
     <!-- Text displayed that links to website about enhanced tracking protection -->
-    <string name="preference_enhanced_tracking_protection_explanation_learn_more">Dysgu rhagor</string>
+    <string name="preference_enhanced_tracking_protection_explanation_learn_more">Darllen rhagor</string>
     <!-- Preference for enhanced tracking protection for the standard protection settings -->
     <string name="preference_enhanced_tracking_protection_standard_default_1">Safonol (rhagosodedig)</string>
     <!-- Preference description for enhanced tracking protection for the standard protection settings -->
@@ -1610,7 +1610,7 @@
          as we use it on the UI to indicate which trackers have been partially unblocked.  -->
     <string name="preference_etp_smartblock_description">Mae rhai tracwyr sydd wedi’u marcio isod wedi cael eu dad-rwystr’n rhannol ar y dudalen hon oherwydd i chi ryngweithio â nhw *.</string>
     <!-- Text displayed that links to website about enhanced tracking protection SmartBlock -->
-    <string name="preference_etp_smartblock_learn_more">Dysgu rhagor</string>
+    <string name="preference_etp_smartblock_learn_more">Darllen rhagor</string>
 
     <!-- Content description (not visible, for screen readers etc.):
     Enhanced tracking protection exception preference icon for ETP settings. -->
@@ -2065,7 +2065,7 @@
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Mae angen cyfrinair</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Rhoi cyfrinair</string>
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Rhowch gyfrinair</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Mae angen enw defnyddiwr</string>
     <!--  The error message in add login view when username field is blank. -->
@@ -2199,7 +2199,7 @@
     <!-- Caption for describing a certain feature. The placeholder is for a clickable text (eg: Learn more) which will load an url in a new tab when clicked.  -->
     <string name="pocket_stories_feature_caption">Rhan o deulu Firefox. %s</string>
     <!-- Clickable text for opening an external link for more information about Pocket. -->
-    <string name="pocket_stories_feature_learn_more">Dysgu rhagor</string>
+    <string name="pocket_stories_feature_learn_more">Darllen rhagor</string>
 
     <!-- Text indicating that the Pocket story that also displays this text is a sponsored story by other 3rd party entity. -->
     <string name="pocket_stories_sponsor_indication">Noddwyd</string>
@@ -2423,7 +2423,7 @@
     <!-- Button text on the translations dialog to begin a translation of the website. -->
     <string name="translations_bottom_sheet_positive_button">Cyfieithu</string>
     <!-- Button text on the translations dialog when a translation error appears. -->
-    <string name="translations_bottom_sheet_positive_button_error">Ceisio eto</string>
+    <string name="translations_bottom_sheet_positive_button_error">Ceisiwch Eto</string>
     <!-- Inactive button text on the translations dialog that indicates a translation is currently in progress. This button will be accompanied by a loading icon. -->
     <string name="translations_bottom_sheet_translating_in_progress">Yn cyfieithu</string>
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
@@ -2439,7 +2439,7 @@
     <string name="translation_error_language_not_supported_warning_text">Ymddiheuriadau, nid ydym yn cefnogi %1$s eto.</string>
 
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
-    <string name="translation_error_language_not_supported_learn_more">Dysgu rhagor</string>
+    <string name="translation_error_language_not_supported_learn_more">Darllen rhagor</string>
 
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
@@ -2499,7 +2499,7 @@
 
     <!-- Never translate site preference screen -->
     <!-- Title of the never translate site preference screen that will appear on the toolbar.-->
-    <string name="never_translate_site_toolbar_title_preference">Peidio byth â chyfieithu\'r gwefannau hyn</string>
+    <string name="never_translate_site_toolbar_title_preference">Peidio â chyfieithu\'r gwefannau hyn</string>
     <!-- Screen header presenting the never translate site preference feature. It will appear under the toolbar. -->
     <string name="never_translate_site_header_preference">I ychwanegu gwefan newydd: Ewch yno a dewis “Peidio byth â chyfieithu\'r wefan hon” o\'r ddewislen cyfieithu.</string>
     <!-- Content description (not visible, for screen readers etc.): For a never-translated site list item that is selected.
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 6c206ff7b..1ecf296b4 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -2161,6 +2161,9 @@
     <string name="other_default_search_engine_suggestion_header">%s-søgning</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Skift din standardbrowser</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Indstil links fra websteder, mails og beskeder til automatisk at blive åbnet i Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index b7312a3b4..c0aef4b9c 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -301,6 +301,34 @@
     <!-- Home onboarding dialog welcome screen title text. -->
     <string name="onboarding_home_welcome_title_2">Tere tulemast isikupärasemasse internetti</string>
 
+    <!-- Home onboarding dialog welcome screen description text. -->
+    <string name="onboarding_home_welcome_description">Rohkem värve. Parem privaatsus. Sama pühendunud inimestele kasumi asemel.</string>
+
+    <!-- Home onboarding dialog sign into sync screen title text. -->
+    <string name="onboarding_home_sync_title_3">Ekraani vahetamine on lihtsam kui kunagi varem</string>
+    <!-- Home onboarding dialog sign into sync screen description text. -->
+    <string name="onboarding_home_sync_description">Jätka sealt, kus pooleli jäid, kasutades kaarte teistest seadmetest avalehel.</string>
+    <!-- Text for the button to continue the onboarding on the home onboarding dialog. -->
+    <string name="onboarding_home_get_started_button">Tee algust</string>
+    <!-- Text for the button to navigate to the sync sign in screen on the home onboarding dialog. -->
+    <string name="onboarding_home_sign_in_button">Logi sisse</string>
+    <!-- Text for the button to skip the onboarding on the home onboarding dialog. -->
+    <string name="onboarding_home_skip_button">Jäta vahele</string>
+    <!-- Onboarding home screen sync popup dialog message, shown on top of Recent Synced Tabs in the Jump back in section. -->
+    <string name="sync_cfr_message">Kaarte sünkroonitakse! Jätka teises seadmes sealt, kus pooleli jäid.</string>
+    <!-- Content description (not visible, for screen readers etc.): Close button for the home onboarding dialog -->
+    <string name="onboarding_home_content_description_close_button">Sulge</string>
+
+    <!-- Notification pre-permission dialog -->
+    <!-- Enable notification pre permission dialog title
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Teavitused aitavad %siga rohkem ära teha</string>
+    <!-- Enable notification pre permission dialog description with rationale
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sünkrooni kaarte seadmete vahel, halda allalaadimisi ning hangi näpunäiteid %si privaatsuskaitse maksimaalse kasutamise kohta ja palju muud.</string>
+    <!-- Text for the button to request notification permission on the device -->
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Jätka</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. The first parameter is the name of the application.-->
     <string name="search_widget_content_description_2">Ava uus kaart %1$sis</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 01e16e803..2ca2abadd 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1899,6 +1899,8 @@
     <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Suojaa tallennetut maksutavat</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Aseta laitteen avaukseen tarkoitettu kuvio, PIN-koodi tai salasana suojataksesi tallennetut luottokorttitiedot siltä varalta, että joku saa laitteesi haltuunsa.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Määritä laitteen lukituskuvio, PIN-koodi tai salasana suojataksesi tallennettuja maksutapojasi, jos laitteesi on jollain toisella.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Aseta nyt</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2061,8 +2063,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Salasanojen asetukset</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Muokattava tekstikenttä kirjautumisen verkkosivua varten.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Verkkosivuston muokattava tekstikenttä.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Muokattava tekstikenttä kirjautumisen käyttäjätunnusta varten.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Käyttäjätunnuksen muokattava tekstikenttä.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Muokattava tekstikenttä kirjautumisen salasanaa varten.</string>
     <!--  The editable text field for a login's password. -->
@@ -2187,6 +2193,9 @@
     <string name="other_default_search_engine_suggestion_header">%s-haku</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Vaihda oletusselain</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Aseta verkkosivustojen, sähköpostien ja viestien linkit avautumaan automaattisesti Firefoxissa.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-fur/strings.xml b/app/src/main/res/values-fur/strings.xml
index c01770abe..1360e9100 100644
--- a/app/src/main/res/values-fur/strings.xml
+++ b/app/src/main/res/values-fur/strings.xml
@@ -2163,6 +2163,9 @@
     <string name="other_default_search_engine_suggestion_header">Ricercje %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Cambie il navigadôr predefinît</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Configure i colegaments di sîts web, e-mails e messaçs in mût che a vegnin vierts in automatic cun Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 9f1bd4710..099ae1be7 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -2053,6 +2053,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Sekcem isem n useqdac</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Asenneftaɣ yettwasra</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Sekcem tansa web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Anadi s taɣect</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2150,6 +2152,9 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Anadi %s</string>
 
+    <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Beddel iminig-ik·im amezwer</string>
     <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Sbadu iseɣwan seg yismal web, seg yimaylen d yiznan i twaledyawt s wudem awurman deg Firefox.</string>
 
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index c6bf155c6..86347ea1a 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -212,6 +212,8 @@
     <string name="resync_button_content_description">Synkroniser på nytt</string>
     <!-- Browser menu button that opens the find in page menu -->
     <string name="browser_menu_find_in_page">Finn på siden</string>
+    <!-- Browser menu button that opens the translations dialog, which has options to translate the current browser page. -->
+    <string name="browser_menu_translations">Oversett siden</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">Lagre i samling</string>
     <!-- Browser menu button that open a share menu to share the current site -->
@@ -241,6 +243,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Tilpass startsiden</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Startskjerm</string>
@@ -248,6 +251,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Slett nettleserhistorikk</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Oversett siden</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valgt språk</string>
@@ -260,8 +266,6 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skann</string>
 
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Søkemotor</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Innstillinger for søkemotor</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -315,24 +319,29 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Varsler hjelper deg å gjøre mer med %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Varsler hjelper deg å gjøre mer med %s</string>
 
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synkroniser fanene dine mellom enheter, behandle nedlastinger, få tips om hvordan du får mest mulig ut av %s sitt personvern, og mer.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synkroniser fanene dine mellom enheter, behandle nedlastinger, få tips om hvordan du får mest mulig ut av %s sitt personvern, og mer.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Fortsett</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Fortsett</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ikke nå</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ikke nå</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Firefox personvernerklæring</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Vi beskytter deg gjerne</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Vår ideelle nettleser forhindrer selskaper i å spore aktiviteten din i hemmelighet på nettet.\n\nLes mer i personvernerklæringen vår.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Vår ideelle nettleser forhindrer selskaper i å spore aktiviteten din i hemmelighet på nettet.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Vår ideelle nettleser forhindrer selskaper i å spore aktiviteten din i hemmelighet på nettet.\n\nLes mer i personvernerklæringen vår.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">personvernerklæring</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">personvernerklæring</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Bruk som standard nettleser</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -435,21 +444,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Kun-HTTPS-modus</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Redusering av infokapselbannere</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blokkering av infokapselbanner</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blokkering av infokapselbanner i privat nettlesing</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reduser infokapselbannere</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Av</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">På</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s prøver automatisk å avvise infokapselforespørsler på infokapselbannere.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Av for dette nettstedet</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -467,35 +466,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Nettstedet støttes for øyeblikket ikke</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Vil du slå på reduksjon av infokapselbannere for %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Vil du slå på blokkering av infokapselbanner for %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Vil du slå av reduksjon av infokapselbannere for %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Vil du slå av blokkering av infokapselbanner for %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s kan ikke automatisk avvise forespørsler om infokapsler på dette nettstedet. Du kan sende en forespørsel om å støtte dette nettstedet i fremtiden.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s vill slette infokapsler og oppdatere siden. Sletting av alle infokapsler kan føre til at du blir logget ut eller at handlekurver blir tømt.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Slå av, og %1$s sletter infokapsler og laster inn dette nettstedet på nytt. Dette kan logge deg ut eller tømme handlekurver.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s prøver å automatisk avvise alle infokapselforespørsler på støttede nettsteder.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Slå på, og %1$s vil prøve å automatisk nekte infokapselbannere på dette nettstedet.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Tillat at %1$s avviser infokapselbannere?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s  kan automatisk avvise mange infokapselbanner-forespørsler.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ikke nå</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Du vil se færre forespørsler om infokapsler</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Tillat</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s nektet nettopp infokapsler for deg</string>
@@ -712,6 +692,8 @@
     <string name="preferences_sync_bookmarks">Bokmerker</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Innlogginger</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Passord</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Åpne faner</string>
     <!-- Preference for signing out -->
@@ -738,6 +720,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Betalingskort</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Betalingsmetoder</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresser</string>
 
@@ -1280,8 +1264,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Ignorer</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Kan ikke å skrive ut</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Kan ikke å skrive ut denne siden</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Skriv ut</string>
@@ -1325,6 +1307,11 @@
     <!-- Notifications -->
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">Lukk private faner</string>
+
+    <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
+    <string name="notification_erase_title_android_14">Lukk private faner?</string>
+    <string name="notification_erase_text_android_14">Trykk eller sveip dette varselet for å lukke private faner.</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">Markedsføring</string>
 
@@ -1682,8 +1669,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Innlogginger og passord</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Passord</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Lagre innlogginger og passord</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Lagre passord</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Spør om å lagre</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1701,27 +1692,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Legg til innlogging</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Legg til passord</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Synkroniser innlogginger</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synkroniser passord</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Synkroniser innlogginger på tvers av enheter</string>
 
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synkroniser passord på tvers av enheter</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Lagrede innlogginger</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Lagrede passord</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">De innlogginger du lagrer eller synkroniserer til %s vil vises her.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Passordene du lagrer eller synkroniserer med %s vil bli oppført her. Alle passord du lagrer er kryptert.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Les mer om Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Les mer om synkronisering</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Unntak</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Innlogginger og passord som ikke er lagret vil vises her.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s vil ikke lagre passord for nettsteder som er oppført her.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Innlogginger og passord vil ikke bli lagret for disse nettstedene.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s vil ikke lagre passord for disse nettstedene.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Slett alle unntak</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Søk innlogginger</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Søk etter passord</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Nettsted</string>
     <!-- The header for the username for a login -->
@@ -1751,8 +1761,12 @@
     <string name="saved_login_hide_password">Skjul passord</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Lås opp for å se dine lagrede innlogginger</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Lås opp for å se dine lagrede passord</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Sikre dine innlogginger og passord</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Sikre dine lagrede passord</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Konfigurer en PIN-kode, et passord eller et låsemønster for å forhindre at andre mennesker får tilgang de lagrede innloggingene og passordene dine, hvis de har adgang til din enhet.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2112,7 +2126,7 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">%s-søk</string>
 
-    <!-- Default browser experiment -->
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Angi at lenker fra nettsteder, e-postmeldinger og meldinger skal åpnes automatisk i Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2186,8 +2200,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Høydepunkter</b> er fra %s-vurderinger i løpet av de siste 80 dagene som vi mener er pålitelige.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Les mer om %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">hvordan %s fra Mozilla bestemmer vurderingskvalitet</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">hvordan %s bestemmer vurderingskvalitet</string>
     <!-- Text for title of settings section. -->
@@ -2271,17 +2283,17 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Les mer</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="121" tools:ignore="UnusedResources">Ved å velge «Ja, prøv det» godtar du %1$s fra Mozilla sine %2$s og %3$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption">Ved å velge «Ja, prøv det» godtar du %1$s fra Mozilla sine %2$s og %3$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
-    <string name="review_quality_check_contextual_onboarding_caption_2">Ved å velge «Ja, prøv det» godtar du følgende fra %1$s:</string>
+    <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Ved å velge «Ja, prøv det» godtar du følgende fra %1$s:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="121" tools:ignore="UnusedResources">personvernbestemmelser</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">personvernbestemmelser</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy_2">Personvernbestemmelser</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Personvernbestemmelser</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
-    <string name="review_quality_check_contextual_onboarding_terms_use" moz:RemovedIn="121" tools:ignore="UnusedResources">vilkår for bruk</string>
+    <string name="review_quality_check_contextual_onboarding_terms_use">vilkår for bruk</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
-    <string name="review_quality_check_contextual_onboarding_terms_use_2">Vilkår for bruk</string>
+    <string name="review_quality_check_contextual_onboarding_terms_use_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Vilkår for bruk</string>
     <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_primary_button_text">Ja, prøv det</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index e32bdb52c..ad71b6832 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -401,7 +401,7 @@
     <!-- Preference category for settings related to changing the default search engine -->
     <string name="preferences_category_select_default_search_engine">Selecione um</string>
     <!-- Preference for settings related to managing search shortcuts for the quick search menu -->
-    <string name="preferences_manage_search_shortcuts_2">Gerencie mecanismos de pesquisa alternativos</string>
+    <string name="preferences_manage_search_shortcuts_2">Gerenciar mecanismos de pesquisa alternativos</string>
     <!-- Summary for preference for settings related to managing search shortcuts for the quick search menu -->
     <string name="preferences_manage_search_shortcuts_summary">Editar mecanismos visíveis no menu de pesquisa</string>
     <!-- Preference category for settings related to managing search shortcuts for the quick search menu -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 90504d5da..b9f1506f0 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2183,6 +2183,9 @@
     <string name="other_default_search_engine_suggestion_header">%s пошук</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Змініть типовий браузер</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Автоматично відкривати посилання з вебсайтів, електронних листів та повідомлень у Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 736a82c33..356737044 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -2161,6 +2161,9 @@
     <string name="other_default_search_engine_suggestion_header">Tìm kiếm trên %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Đặt làm trình duyệt mặc định của bạn</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Đặt các liên kết từ trang web, email và tin nhắn để tự động mở trong Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->

From f4503a4bfe996dbb6858f658d469b71eb21877bf Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Mon, 12 Feb 2024 00:03:31 +0000
Subject: [PATCH 138/222] Import translations from android-l10n

---
 app/src/main/res/values-azb/strings.xml    |  47 +++++++
 app/src/main/res/values-co/strings.xml     |   2 +-
 app/src/main/res/values-cs/strings.xml     |   3 +
 app/src/main/res/values-dsb/strings.xml    |   3 +
 app/src/main/res/values-en-rGB/strings.xml |   3 +
 app/src/main/res/values-eo/strings.xml     | 154 ++++++++++++++------
 app/src/main/res/values-is/strings.xml     |   3 +
 app/src/main/res/values-ja/strings.xml     | 154 ++++++++++++++------
 app/src/main/res/values-pl/strings.xml     | 156 +++++++++++++++------
 app/src/main/res/values-rm/strings.xml     |  81 +++++++++++
 app/src/main/res/values-tg/strings.xml     |  49 +++++++
 app/src/main/res/values-tr/strings.xml     |   3 +
 12 files changed, 530 insertions(+), 128 deletions(-)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index 37a4ebc5f..1c5e4b0c8 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -543,6 +543,8 @@
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">اؤزل دؤنگل سرور</string>
 
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">موْزیلا حسابیْ/دؤنگل سروری دگیشدیریلدی. دگیشمه‌لری یئرینه سالماق اوچون اپلیکیشن‌دن چیخیلیر...</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">حساب</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -551,19 +553,64 @@
     <string name="preferences_theme">تم</string>
     <!-- Preference for customizing the home screen -->
     <string name="preferences_home_2">آنایارپاق</string>
+    <!-- Preference for gestures based actions -->
+    <string name="preferences_gestures">ایشاره‌لر</string>
     <!-- Preference for settings related to visual options -->
     <string name="preferences_customize">اؤزللشدیرمک</string>
+    <!-- Preference description for banner about signing in -->
+    <string name="preferences_sign_in_description_2">تاغلاریْ، بوکمارک‌لاریْ، رمزلری و داها چوْخوُنو دؤنگل ائتمک اوچون گیریش ائله‌یین.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
     <string name="preferences_account_default_name_2">موْزیلا حسابی</string>
+    <!-- Preference text for account title when there was an error syncing FxA -->
+    <string name="preferences_account_sync_error">دؤنگلی ایدامه وئرمک اوچون یئنی‌دن باغلانین.</string>
     <!-- Preference for language -->
     <string name="preferences_language">دیل</string>
     <!-- Preference for data choices -->
     <string name="preferences_data_choices">دیتا سئچیمی</string>
+    <!-- Preference for data collection -->
+    <string name="preferences_data_collection">دیتا یئغیلماسیْ</string>
+    <!-- Preference for developers -->
+    <string name="preferences_remote_debugging">USB طریقی‌نن اوُزاقدان سازلاما</string>
+    <!-- Preference title for switch preference to show search suggestions -->
+    <string name="preferences_show_search_suggestions">آختاریْش تکلیف‌لرینی گؤستر</string>
+    <!-- Preference title for switch preference to show voice search button -->
+    <string name="preferences_show_voice_search">سس‌لی آختاریشیْ گؤستر</string>
+    <!-- Preference title for switch preference to show search suggestions also in private mode -->
+    <string name="preferences_show_search_suggestions_in_private">گیزلی اوْتوروُم‌لاردا گؤستر</string>
+    <!-- Preference title for switch preference to show a clipboard suggestion when searching -->
+    <string name="preferences_show_clipboard_suggestions">کلیپ‌بوْرد تکلیف‌لرینی گؤستر</string>
+    <!-- Preference title for switch preference to suggest browsing history when searching -->
+    <string name="preferences_search_browsing_history">موُرور گئچمیشینده آختار</string>
+    <!-- Preference title for switch preference to suggest bookmarks when searching -->
+    <string name="preferences_search_bookmarks">بوکمارک‌دا آختار</string>
+    <!-- Preference title for switch preference to suggest synced tabs when searching -->
+    <string name="preferences_search_synced_tabs">دؤنگل ائدیلمیش تاغ‌لاردا آختار</string>
+    <!-- Preference for account settings -->
+    <string name="preferences_account_settings">حساب تنظیم‌لری</string>
+    <!-- Preference for enabling url autocomplete-->
+    <string name="preferences_enable_autocomplete_urls">اؤزاؤزونه URL تکمیل‌لشمه‌سی</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">اسپانسرلردن تکلیف‌لر</string>
+    <!-- Summary for preference to show sponsored Firefox Suggest search suggestions.
+         The first parameter is the name of the application. -->
+    <string name="preferences_show_sponsored_suggestions_summary">بعضاً اسپانسرلیق تکلیف‌لری ایله %1$s -یی آرخالایین.</string>
+    <!-- Preference title for switch preference to show Firefox Suggest search suggestions for web content.
+         The first parameter is the name of the application. -->
+    <string name="preferences_show_nonsponsored_suggestions">%1$s تکلیف‌لری</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">وب‌دن آختاریْنیزلا باغلیْ تکلیف‌لری آلیْن.</string>
+    <!-- Preference for open links in third party apps -->
+    <string name="preferences_open_links_in_apps">اَپ‌لرده باغلانتی‌ْلاری آچیْن.</string>
     <!-- Preference for open links in third party apps always open in apps option -->
     <string name="preferences_open_links_in_apps_always">هر زامان</string>
+    <!-- Preference for open links in third party apps ask before opening option -->
+    <string name="preferences_open_links_in_apps_ask">آچمازدان اؤنجه سوْروُشون.</string>
     <!-- Preference for open links in third party apps never open in apps option -->
     <string name="preferences_open_links_in_apps_never">هئچ زامان</string>
 
+    <!-- Preference for open download with an external download manager app -->
+    <string name="preferences_external_download_manager">خاریجی یئندیرمه موْدیری.</string>
+
     <!-- Preference for add_ons -->
     <string name="preferences_addons">تاخیلان‌لار</string>
 
diff --git a/app/src/main/res/values-co/strings.xml b/app/src/main/res/values-co/strings.xml
index b233b981b..e41a5e4c1 100644
--- a/app/src/main/res/values-co/strings.xml
+++ b/app/src/main/res/values-co/strings.xml
@@ -1837,7 +1837,7 @@
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Arregistrà è riempie autumaticamente l’indirizzi</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Arregistrà è rinsignà l’indirizzi</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Arregistrà è rinsignà autumaticamente l’indirizzi</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Include l’infurmazioni cum’è i numeri, i messaghji elettronichi è l’indirizzi di spedizione</string>
 
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d257bf7c0..2a9bafda9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -2189,6 +2189,9 @@
     <string name="other_default_search_engine_suggestion_header">Vyhledat pomocí %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Změňte svůj výchozí prohlížeč</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Nastavte si automatické otevírání odkazů, e-mailů a zpráv ve Firefoxu.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-dsb/strings.xml b/app/src/main/res/values-dsb/strings.xml
index bbc3d240b..629b72032 100644
--- a/app/src/main/res/values-dsb/strings.xml
+++ b/app/src/main/res/values-dsb/strings.xml
@@ -2172,6 +2172,9 @@
     <string name="other_default_search_engine_suggestion_header">Z %s pytaś</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Standardny wobglědowak změniś</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Nastajśo wótkaze z websedłow, mejlkow a powěsćow, aby se awtomatiski we Firefox wócynili.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index ea001e9be..31dfb31b8 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -2162,6 +2162,9 @@
     <string name="other_default_search_engine_suggestion_header">%s search</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Switch your default browser</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Set links from web sites, emails, and messages to open automatically in Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 64032af01..adae84f57 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -239,6 +239,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personecigi ekan paĝon</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Hejmekrano</string>
@@ -246,6 +247,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Viŝi retuman historion</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Traduki paĝon</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Elektita lingvo</string>
@@ -257,8 +261,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skani</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Serĉilo</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Agordoj de serĉilo</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -312,23 +314,28 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Sciigoj helpas vin plenumi pli per %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Sciigoj helpas vin plenumi pli per %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Spegulu viajn langetojn inter aparatoj, administru elŝutojn, ricevu konsiletojn por eltiri la maksimumon el la privateca protekto de %s, kaj pli.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Spegulu viajn langetojn inter aparatoj, administru elŝutojn, ricevu konsiletojn por eltiri la maksimumon el la privateca protekto de %s, kaj pli.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Daŭrigi</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Daŭrigi</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ne nun</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ne nun</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Rimarko de Firefox pri privateco</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Ni amas teni vin sekura</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Nia retumilo, subtenata de nenprofitcela organizo, helpas eviti ke entreprenoj kaŝe sekvu vin tra la reto.\n\nPli da informo en nia rimarko pri privateco.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Nia retumilo, subtenata de nenprofitcela organizo, helpas eviti ke entreprenoj kaŝe sekvu vin tra la reto.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Nia retumilo, subtenata de nenprofitcela organizo, helpas eviti ke entreprenoj kaŝe sekvu vin tra la reto.\n\nPli da informo en nia rimarko pri privateco.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">rimarko pri privateco</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">rimarko pri privateco</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Difini kiel norman retumilon</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -432,21 +439,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">HTTPS-nura reĝimo</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Redukto de kuketaj anoncoj</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blokilo de kuketaj anoncoj</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blokilo de kuketaj anoncoj en privata retumo</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Redukti kuketajn anoncojn</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Malŝaltita</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Ŝaltita</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s aŭtomate klopodos rifuzi kuketajn petojn en kuketaj anoncoj.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Malŝaltita por tiu ĉi retejo</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -463,38 +460,19 @@
     <string name="reduce_cookie_banner_unsupported_site_request_submitted_2">Peto pri subteno sendita</string>
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Retejo nuntempe ne subtenata</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Ĉu ŝalti la redukton de kuketaj anoncoj en %1$s?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Ĉu ŝalti la blokilon de kuketaj anoncoj por %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Ĉu malŝalti la redukton de kuketaj anoncoj en %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Ĉu malŝalti la blokilon de kuketaj anoncoj por %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s ne povas aŭtomate rifuzi kuketojn en tiu ĉi retejo. Vi povas sendi peton por aldoni subtenon por tiu ĉi retejo en la estonteco.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s forigos la kuketojn de tiuj ĉi retejo kaj reŝargos la paĝon. Forigo de ĉiuj kuketoj povas fini seancojn aŭ malplenigi aĉetumĉarojn.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Malŝaltu kaj %1$s forigos kuketojn kaj reŝagos tiun ĉi retejon. Tiu ĉi ago povus fini la seancon aŭ malplenigi aĉetumĉaron.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s klopodas aŭtomate rifuzi ĉiujn kuketajn petojn en subtenataj retejoj.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Ŝaltu, kaj %1$s klopodos aŭtomate rifuzi kuketajn anoncojn en tiu ĉi retejo.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Ĉu permesi al %1$s rifuzi kuketajn anoncojn?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s povas aŭtomate rifuzi multajn petojn de kuketaj anoncoj.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ne nun</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Vi vidos malpli da kuketaj anoncoj</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Permesi</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s ĵus rifuzis kuketojn por vi</string>
@@ -712,6 +690,8 @@
     <string name="preferences_sync_bookmarks">legosignojn</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">legitimilojn</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Pasvortoj</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Malfermitaj langetoj</string>
     <!-- Preference for signing out -->
@@ -738,6 +718,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Kreditkartoj</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Pagmetodoj</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresoj</string>
 
@@ -1282,8 +1264,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Ignori</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Ne eblas presi</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Ne eblas presi tiun ĉi paĝon</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Presi</string>
@@ -1691,8 +1671,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Legitimiloj kaj pasvortoj</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Pasvortoj</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Konservi legitimilojn kaj pasvortojn</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Konservi pasvortojn</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Demandi antaŭ ol konservi</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1709,27 +1693,46 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Aldoni legitimilon</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Aldoni pasvorton</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Speguli legitimilojn</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Speguli pasvortojn</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Speguli legitimilojn inter aparatoj</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Speguli pasvortojn inter aparatoj</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Konservitaj legitimiloj</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Konservitaj pasvortoj</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">La legitimiloj, kiujn vi konservas aŭ spegulas al %s, aperos ĉi tie.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">La pasvortoj konservitaj aŭ spegulitaj al %s estos listigitaj ĉi tie. Ĉiuj konservitaj pasvortoj estos ĉifritaj.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Pli da informo pri Spegulado.</string>
 
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Pli da informo pri spegulado</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Esceptoj</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Nekonservitaj nomoj de uzantoj kaj pasvortoj estos montritaj ĉi tie.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s ne konservos pasvortojn por retejoj listigitaj ĉi tie.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Nomoj de uzanto kaj pasvortoj por tiuj ĉi retejoj ne estos konservitaj.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s ne konservos pasvortojn por tiuj ĉi retejoj.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Forigi ĉiujn esceptojn</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Serĉi legitimilojn</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Serĉi pasvortojn</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Retejo</string>
     <!-- The header for the username for a login -->
@@ -1759,10 +1762,16 @@
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Malŝlosu por vidi viajn konservitajn legitimilojn</string>
 
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Malŝlosi por vidi viajn konservitajn pasvortojn</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Protektu viajn legitimilojn kaj pasvortojn</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Protektu viajn konservitajn pasvortojn</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Difinu blokan desegnon, PIN aŭ pasvorton por protekti viajn konservitajn legitimilojn kaj pasvortojn se iu alia havas vian aparaton.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Difinu blokan desegnon, PIN aŭ pasvorton por protekti viajn konservitajn pasvortojn se iu alia havas vian aparaton.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Poste</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1781,6 +1790,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordigi menuon de legitimiloj</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menuo por ordigi pasvortojn</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Aŭtomata plenigo</string>
@@ -1788,27 +1800,42 @@
     <string name="preferences_addresses">Adresoj</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Kreditkartoj</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Pagmetodoj</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Konservi kaj aŭtomate plenigi kreditkartojn</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Konservi kaj aŭtomate plenigi pagmetodojn</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">La datumoj estas ĉifritaj</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s ĉifras ĉiujn pagmetodojn, kiujn vi konservis</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Speguli kreditkartojn inter aparatoj</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Speguli kreditkartojn</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Aldoni kreditkarton</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Aldoni kreditkarton</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Administri konservitajn kreditkartojn</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Administri kartojn</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Aldoni adreson</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Administri adresojn</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Konservi kaj aŭtomate plenigi adresojn</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Konservi kaj aŭtomate plenigi adresojn</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Inkluzivi informojn kiel numerojn, retpoŝtajn kaj liverajn adresojn</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Telefonnumeroj kaj retpoŝtaj adresoj inkluzivitaj</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Aldoni kreditkarton</string>
     <!-- Title of the "Edit card" screen -->
@@ -1830,6 +1857,8 @@
     <string name="credit_cards_delete_card_button">Forigi kreditkarton</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Ĉu vi certe volas forigi tiun ĉi kreditkarton?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Ĉu forigi karton?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Forigi</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1844,14 +1873,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Bonvolu tajpi validan kreditkaran numeron</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Tajpu validan numeron de karto</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Bonvolu plenigi tiun ĉi kampon</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Aldoni nomon</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Malŝlosu por vidi viajn konservitajn kreditkartojn</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Sekurigu viajn kreditkartojn</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Protektu viajn konservitajn pagmetodojn</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Difinu blokan desegnon, PIN aŭ pasvorton por protekti viajn konservitajn kreditkartojn se iu alia havas vian aparaton.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Difinu blokan desegnon, PIN aŭ pasvorton por protekti viajn konservitajn pagmetodojn se iu alia havas vian aparaton.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Agordi nun</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1861,6 +1898,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Malŝlosu por uzi la konservitan informon pri kreditkartojn</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Malŝlosu por uzi konservitajn pagmetodojn</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Aldoni adreson</string>
     <!-- Title of the "Edit address" screen -->
@@ -1898,6 +1937,8 @@
     <string name="addressess_delete_address_button">Forigi adreson</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Ĉu vi certe volas forigi tiun ĉi adreson?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Ĉu forigi tiun ĉi adreson?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Forigi</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1997,30 +2038,52 @@
     <string name="login_menu_edit_button">Modifi</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Ĉu vi certe volas forigi tiun ĉi legitimilon?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Ĉu vi certe volas forigi tiun ĉi pasvorton?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Forigi</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Nuligi</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Preferoj de komenco de seanco</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Pasvortaj elektebloj</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">La modifebla teksta kampo de la retadreso por komenci seancon.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">La modifebla teksta kampo de la reteja retadreso.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">La modifebla teksta kampo de la nomo de uzanto por komenci seancon.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">La modifebla teksta kampo de la uzanto.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">La modifebla teksta kampo de la pasvorto por komenci seancon.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">La modifebla teksta kampo de la pasvorto.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Konservi ŝanĝojn je komenco de seanco.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Konservi ŝanĝojn.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Modifi</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Modifi pasvorton</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Aldoni novan legitimilon</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Aldoni pasvorton</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Pasvorto postulata</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Tajpu pasvorton</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Nomo de uzanto postulata</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Tajpu nomon de uzanto</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Nomo de servilo postulata</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Tajpu retadreson</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Voĉa serĉo</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2119,6 +2182,9 @@
     <string name="other_default_search_engine_suggestion_header">Serĉo de %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Ŝanĝi vian norman retumilon</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Aŭtomate malfermi ligilon en retejoj, retpoŝtoj kaj mesaĝoj per Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2193,8 +2259,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Elstaraĵoj</b> venas el recenzoj de %s, kiujn ni opinias fidindaj kaj okazis dum la lastaj 80 tagoj.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Pli da informo pri %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">Kiel %s (de Mozilla) determinas la kvaliton de recenzoj</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">kiel %s determinas la kvaliton de recenzoj</string>
     <!-- Text for title of settings section. -->
@@ -2378,6 +2442,8 @@
     <string name="translations_bottom_sheet_translating_in_progress">Traduko</string>
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Traduko okazas</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Elektu lingvon</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Okazis problemo dum traduko. Bonvolu provi denove.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2398,6 +2464,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Neniam traduki %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Neniam traduki tiun ĉi retejon</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Superregi ĉiujn aliajn agordojn</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Superregi tradukproponojn</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Tradukaj agordoj</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index bdb531e46..46dd967e5 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -2164,6 +2164,9 @@
     <string name="other_default_search_engine_suggestion_header">%s leit</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Skiptu um sjálfgefinn vafra</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Stilltu tengla frá vefsvæðum, tölvupósti og skilaboðum til að opna sjálfkrafa í Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 9b75f0b36..e7af7cfc3 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -248,6 +248,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">ホームページをカスタマイズ</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">ホーム画面</string>
@@ -255,6 +256,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">閲覧履歴を消去</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">ページを翻訳</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">選択した言語</string>
@@ -266,8 +270,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">スキャン</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">検索エンジン</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">検索エンジンの設定</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -323,23 +325,28 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">通知は %s を活用するのに役立ちます</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">通知は %s を活用するのに役立ちます</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">端末間でタブを共有したり、ダウンロードを管理したり、%s のプライバシー保護機能を最大限に活用するためのヒントを入手できます。</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">端末間でタブを共有したり、ダウンロードを管理したり、%s のプライバシー保護機能を最大限に活用するためのヒントを入手できます。</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">続ける</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">続ける</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">後で</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">後で</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Firefox のプライバシー通知</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">私たちはあなたの安全を守りたいと願っています</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">非営利で作られた私たちのブラウザーは、企業によるウェブ上の密かな追跡を阻止するのに役立ちます。\n\n詳細はプライバシー通知をご覧ください。</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">非営利で作られた私たちのブラウザーは、企業によるウェブ上の密かな追跡を阻止するのに役立ちます。</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">非営利で作られた私たちのブラウザーは、企業によるウェブ上の密かな追跡を阻止するのに役立ちます。\n\n詳細はプライバシー通知をご覧ください。</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">プライバシー通知</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">プライバシー通知</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">既定のブラウザーに設定</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -445,22 +452,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">HTTPS-Only モード</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie バナーの削減</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Cookie バナーブロッカー</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">プライベートブラウジングでの Cookie バナーブロッカー</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie バナーを減らす</string>
 
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">オフ</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">オン</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s が自動的に Cookie バナー上の Cookie 要求を拒否しようとします。</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">このサイトでオフ</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -479,36 +475,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">現在サポートされていないサイトです</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s で Cookie バナー削減を有効にしますか?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">%1$s で Cookie バナーブロッカーをオンにしますか？</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s で Cookie バナー削減を無効にしますか?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">%1$s で Cookie バナーブロッカーをオフにしますか？</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s は現在、このサイトの Cookie 使用要求を自動的に拒否できません。このサイトへの対処を要求してください。</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s はこのサイトの Cookie を消去してページを読み込み直します。すべての Cookie を消去すると、ログアウトしたり、ショッピングカートが空になったりする場合があります。</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">オフにすると、%1$s に保存された Cookie を消去してこのサイトを再読み込みします。サイトからログアウトしたり、買い物かごが空になったりする場合があります。</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s はサポートされたサイト上の Cookie 要求を自動的に拒否しようとします。</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">オンにすると、このサイトのすべての Cookie バナーに対して %1$s が自動的に拒否を試みます。</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s に Cookie バナーを拒否させますか？</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s は多くの Cookie バナーの同意確認を自動的に拒否できます。</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">後で</string>
-
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie 要求が少なくなります</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">許可</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s が Cookie を拒否しました</string>
@@ -726,6 +702,8 @@
     <string name="preferences_sync_bookmarks">ブックマーク</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">ログイン情報</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">パスワード</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">開いているタブ</string>
     <!-- Preference for signing out -->
@@ -752,6 +730,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">クレジットカード情報</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">支払い方法</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">住所</string>
 
@@ -1298,8 +1278,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">閉じる</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">印刷できません</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">このページを印刷できません</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">印刷</string>
@@ -1708,8 +1686,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">ログイン情報とパスワード</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">パスワード</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">ログイン情報を保存する</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">パスワードを保存</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">保存するか確認する</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1727,26 +1709,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">ログイン情報を追加</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">パスワードを追加</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">ログイン情報を同期</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">パスワードを同期</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">端末間でログイン情報を同期します</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">端末間でパスワードを同期</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">保存されたログイン情報</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">保存されたパスワード</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">端末に保存または %s と同期したログイン情報がここに表示されます。</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">%s に保存または同期したパスワードがこのリストに表示されます。保存されたすべてのパスワードは暗号化されます。</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Sync についての詳細情報。</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Sync についての詳細情報</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">例外</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">ログイン情報が保存されないサイトがここに表示されます。</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s は、このリストに表示されているサイトのパスワードを保存しません。</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">これらのサイトではログイン情報が保存されません。</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s はこれらのサイトのパスワードを保存しません。</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">すべての例外を削除</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">ログイン情報を検索</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">パスワードを検索</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">サイト</string>
     <!-- The header for the username for a login -->
@@ -1775,10 +1776,16 @@
     <string name="saved_login_hide_password">パスワードを隠す</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">ロック解除して保存されたログイン情報を表示します</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">保存されたパスワードを表示するにはロック解除してください</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">ログイン情報とパスワードの保護</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">保存されたパスワードを保護してください</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">端末のロックパターンや PIN、パスワードを設定して、保存されたログイン情報とパスワードを他人の不正なアクセスから保護しましょう。</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">端末のロックパターンや PIN、パスワードを設定して、保存されたパスワードを他人の不正なアクセスから保護しましょう。</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">後で</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1798,6 +1805,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">ログイン情報メニューの並べ替え</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">パスワードを並べ替えます</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">自動入力</string>
@@ -1806,18 +1816,28 @@
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">クレジットカード</string>
 
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">支払い方法</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">カード情報を保存して自動入力する</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">支払い方法を保存して入力する</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">データは暗号化されています</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s は保存したすべての支払い方法を暗号化します</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">端末間でカード情報を同期する</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">クレジットカード情報を同期</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">クレジットカードを追加</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">カード情報を追加</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">保存したカードを管理</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">カード情報を管理</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">アドレスを追加</string>
     <!-- Preference option for managing saved addresses -->
@@ -1825,9 +1845,14 @@
 
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">アドレスを保存して自動入力する</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">住所を保存して入力する</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">カード番号、メールアドレス、配送先などの情報を含める</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">電話番号とメールアドレスを含みます</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">カードの追加</string>
 
@@ -1849,6 +1874,8 @@
     <string name="credit_cards_delete_card_button">カードを削除</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">本当にこのクレジットカード情報を削除してもよろしいですか？</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">カード情報を削除しますか？</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">削除</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1864,15 +1891,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">有効なクレジットカード番号を入力してください</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">正しいカード番号を入力してください</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">このフィールドは入力必須です</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">名前を追加してください</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">保存されたカード情報を表示するにはロック解除してください</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">クレジットカード情報の保護</string>
 
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">保存された支払い方法を保護してください</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">端末のロックパターンや PIN、パスワードを設定して、保存されたクレジットカード情報とパスワードを他人の不正なアクセスから保護しましょう。</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">端末のロックパターンや PIN、パスワードを設定して、保存された支払い方法を他人の不正なアクセスから保護しましょう。</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">今すぐ設定</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1883,6 +1918,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">ロックを解除して保存したクレジットカード情報を使用します</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">保存された支払い方法を使用するにはロック解除してください</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">アドレスを追加</string>
     <!-- Title of the "Edit address" screen -->
@@ -1920,6 +1957,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">本当にこの住所を削除してもよろしいですか？</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">このアドレスを削除しますか？</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">削除</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2018,6 +2057,8 @@
     <string name="login_menu_edit_button">編集</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">このログイン情報を削除してもよろしいですか？</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">本当にこのパスワードを削除してもよろしいですか？</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">削除</string>
 
@@ -2025,24 +2066,44 @@
     <string name="dialog_delete_negative">キャンセル</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">ログインオプション</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">パスワードのオプション</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">ログイン情報のウェブアドレスの編集可能なテキストフィールド。</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">ウェブサイトのアドレスの編集可能なテキストフィールド。</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">ログイン情報のユーザー名の編集可能なテキストフィールド。</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">ユーザー名の編集可能なテキストフィールド。</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">ログイン情報のパスワードの編集可能なテキストフィールド。</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">パスワードの編集可能なテキストフィールド。</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">変更を保存してログインします。</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">変更を保存します。</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">編集</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">パスワードを編集</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">新しいログイン情報の追加</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">パスワードを追加</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">パスワードが必要です</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">パスワードを入力してください</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">ユーザー名は必須です</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">ユーザー名を入力してください</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">ホスト名は必須です</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">ウェブアドレスを入力してください</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">音声検索</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2139,6 +2200,9 @@
     <string name="other_default_search_engine_suggestion_header">%s 検索</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">既定のブラウザーを変更しませんか</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">ウェブサイトやメール、メッセージのリンクを自動的に Firefox で開きます。</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2213,8 +2277,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>注目レビュー</b> は最近 80 日以内の %s からのレビューで私たちが信頼するに足ると評価したものです。]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">%s についての詳細。</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">%s by Mozilla がレビュー品質を決定する方法について</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">%s がレビュー品質を決定する方法について</string>
     <!-- Text for title of settings section. -->
@@ -2400,6 +2462,8 @@
     <string name="translations_bottom_sheet_translating_in_progress">翻訳中</string>
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">翻訳中です</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">言語を選択</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">翻訳時に問題が発生しました。もう一度試してください。</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2420,6 +2484,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">%1$s のページは翻訳しない</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">このサイトは翻訳しない</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">他のすべての設定を上書きします</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">翻訳機能の設定を上書きします</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">翻訳設定</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index f9642e66f..ae67905ff 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -244,6 +244,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Dostosuj stronę startową</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Strona startowa</string>
@@ -251,6 +252,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Usuń historię przeglądania</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Przetłumacz stronę</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Wybrany język</string>
@@ -262,8 +266,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skanuj</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Wyszukiwarka</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Ustawienia wyszukiwarki</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -318,23 +320,28 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Dzięki powiadomieniom lepiej wykorzystasz przeglądarkę %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Dzięki powiadomieniom lepiej wykorzystasz przeglądarkę %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Synchronizuj karty między urządzeniami, zarządzaj pobieranymi plikami, otrzymuj wskazówki, jak najlepiej wykorzystać ochronę prywatności w przeglądarce %s i nie tylko.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Synchronizuj karty między urządzeniami, zarządzaj pobieranymi plikami, otrzymuj wskazówki, jak najlepiej wykorzystać ochronę prywatności w przeglądarce %s i nie tylko.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Kontynuuj</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Kontynuuj</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Nie teraz</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Nie teraz</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Zasady ochrony prywatności Firefoksa</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Uwielbiamy zapewniać Ci bezpieczeństwo</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Nasza przeglądarka wspierana przez organizację non-profit pomaga powstrzymywać firmy przed potajemnym śledzeniem Cię w Internecie.\n\nWięcej informacji znajdziesz w naszych zasadach ochrony prywatności.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Nasza przeglądarka wspierana przez organizację non-profit pomaga powstrzymywać firmy przed potajemnym śledzeniem Cię w Internecie.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Nasza przeglądarka wspierana przez organizację non-profit pomaga powstrzymywać firmy przed potajemnym śledzeniem Cię w Internecie.\n\nWięcej informacji znajdziesz w naszych zasadach ochrony prywatności.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">zasadach ochrony prywatności</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">zasadach ochrony prywatności</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Ustaw jako domyślną przeglądarkę</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -438,21 +445,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Tryb używania wyłącznie protokołu HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Ograniczanie informacji o ciasteczkach</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Blokowanie informacji o ciasteczkach</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Blokowanie informacji o ciasteczkach w trybie prywatnym</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Ograniczanie informacji o ciasteczkach</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Wyłączone</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Włączone</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s automatycznie próbuje odrzucać prośby o akceptację ciasteczek.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Wyłączone na tej witrynie</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -470,36 +467,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Witryna obecnie nie jest obsługiwana</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Włączyć ograniczanie informacji o ciasteczkach na witrynie %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Włączyć blokowanie informacji o ciasteczkach na witrynie %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Wyłączyć ograniczanie informacji o ciasteczkach na witrynie %1$s?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Wyłączyć blokowanie informacji o ciasteczkach na witrynie %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s nie może automatycznie odrzucać próśb o akceptację ciasteczek na tej witrynie. Można wysłać prośbę o dodanie obsługi tej witryny w przyszłości.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s usunie ciasteczka tej witryny i odświeży stronę. Usunięcie wszystkich ciasteczek może spowodować wylogowanie ze strony lub opróżnienie koszyka w sklepie.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Wyłącz, a %1$s usunie ciasteczka i ponownie wczyta tę stronę. Może to spowodować wylogowanie ze strony lub opróżnienie koszyka w sklepie.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s próbuje automatycznie odrzucać wszystkie prośby o akceptację ciasteczek na obsługiwanych witrynach.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Włącz, a %1$s spróbuje automatycznie odrzucać wszystkie prośby o akceptację ciasteczek na tej witrynie.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Pozwolić przeglądarce %1$s odrzucać prośby o akceptację ciasteczek?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s może automatycznie odrzucać wiele próśb o akceptację ciasteczek.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Nie teraz</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Będziesz widzieć mniej próśb o akceptację ciasteczek</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Pozwól</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s właśnie odrzucił ciasteczka za Ciebie</string>
@@ -718,6 +696,8 @@
     <string name="preferences_sync_bookmarks">Zakładki</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Dane logowania</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Hasła</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Otwarte karty</string>
     <!-- Preference for signing out -->
@@ -746,6 +726,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Karty płatnicze</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Metody płatności</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresy</string>
 
@@ -1284,8 +1266,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Zamknij</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Nie można wydrukować</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Nie można wydrukować tej strony</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Drukuj</string>
@@ -1693,8 +1673,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Dane logowania i hasła</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Hasła</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Zachowywanie danych logowania i haseł</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Zachowywanie haseł</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Pytanie o zachowanie</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1711,26 +1695,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Dodaj dane logowania</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Dodaj hasło</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Synchronizowanie danych logowania</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synchronizowanie haseł</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Synchronizuj karty między urządzeniami</string>
+    <string name="preferences_passwords_sync_logins_across_devices">Synchronizuj dane logowania między urządzeniami</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synchronizuj hasła między urządzeniami</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Zachowane dane logowania</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Zachowane hasła</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Zachowane lub synchronizowane z przeglądarką %s dane logowania będą wyświetlane w tym miejscu.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Tutaj będą wyświetlane hasła zachowane lub synchronizowane w przeglądarce %s. Wszystkie zachowywane hasła są zaszyfrowane.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Więcej informacji o synchronizacji.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Więcej informacji o synchronizacji</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Wyjątki</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Tutaj będą wyświetlane dane logowania i hasła, które nie będą zachowywane.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s nie będzie zachowywać haseł do wymienionych tutaj witryn.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Dane logowania i hasła dla tych witryn nie będą zachowywane.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s nie będzie zachowywać haseł do tych witryn.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Usuń wszystkie wyjątki</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Szukaj danych logowania</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Szukaj haseł</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Witryna</string>
     <!-- The header for the username for a login -->
@@ -1759,10 +1762,16 @@
     <string name="saved_login_hide_password">Ukryj hasło</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Odblokuj, aby wyświetlić zachowane dane logowania</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Odblokuj, aby wyświetlić zachowane hasła</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Zabezpiecz dane logowania i hasła</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Zabezpiecz zachowane hasła</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Skonfiguruj wzór blokady, kod PIN lub hasło, aby ochronić zachowane dane logowania i hasła w przypadku, gdy ktoś inny uzyska dostęp do urządzenia.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Skonfiguruj wzór blokady, kod PIN lub hasło, aby ochronić zachowane hasła w przypadku, gdy ktoś inny uzyska dostęp do urządzenia.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Później</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1781,6 +1790,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menu sortowania danych logowania</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu sortowania haseł</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Automatyczne wypełnianie</string>
@@ -1789,10 +1801,16 @@
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Karty płatnicze</string>
 
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Metody płatności</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Zachowywanie i automatyczne wypełnianie kart</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Zachowywanie i wypełnianie metod płatności</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Dane są zaszyfrowane</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s szyfruje wszystkie zachowywane metody płatności</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synchronizuj karty między urządzeniami</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1800,8 +1818,12 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Dodaj kartę płatniczą</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Dodaj kartę</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Zarządzaj zachowanymi kartami</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Zarządzaj kartami</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Dodaj adres</string>
     <!-- Preference option for managing saved addresses -->
@@ -1809,9 +1831,14 @@
 
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Zachowywanie i automatyczne wypełnianie adresów</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Zachowywanie i wypełnianie adresów</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Zawiera informacje takie jak numery, adresy e-mail i adresy wysyłki</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">W tym numery telefonów i adresy e-mail</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Dodaj kartę</string>
     <!-- Title of the "Edit card" screen -->
@@ -1832,6 +1859,8 @@
     <string name="credit_cards_delete_card_button">Usuń kartę</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Czy na pewno usunąć tę kartę płatniczą?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Czy usunąć kartę?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Usuń</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1846,14 +1875,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Wprowadź prawidłowy numer karty płatniczej</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Podaj prawidłowy numer karty</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Wypełnij to pole</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Dodaj imię i nazwisko</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Odblokuj, aby wyświetlić zachowane karty</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Zabezpiecz karty płatnicze</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Zabezpiecz zachowane metody płatności</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Skonfiguruj wzór blokady, kod PIN lub hasło, aby ochronić zachowane karty płatnicze w przypadku, gdy ktoś inny uzyska dostęp do urządzenia.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Skonfiguruj wzór blokady, kod PIN lub hasło, aby ochronić zachowane metody płatności w przypadku, gdy ktoś inny uzyska dostęp do urządzenia.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Skonfiguruj teraz</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1864,6 +1901,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Odblokuj, aby użyć przechowywanych informacji o kartach płatniczych</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Odblokuj, aby użyć zachowanych metod płatności</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Dodaj adres</string>
     <!-- Title of the "Edit address" screen -->
@@ -1900,6 +1939,8 @@
     <string name="addressess_delete_address_button">Usuń adres</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Czy na pewno usunąć ten adres?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Czy usunąć ten adres?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Usuń</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1998,30 +2039,52 @@
     <string name="login_menu_edit_button">Edytuj</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Czy na pewno usunąć te dane logowania?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Czy na pewno usunąć to hasło?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Usuń</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Anuluj</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Opcje danych logowania</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opcje haseł</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Edytowalne pole tekstowe dla adresu witryny danych logowania.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Edytowalne pole tekstowe dla adresu witryny.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Edytowalne pole tekstowe dla nazwy użytkownika danych logowania.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Edytowalne pole tekstowe dla nazwy użytkownika.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Edytowalne pole tekstowe dla hasła danych logowania.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Edytowalne pole tekstowe dla hasła.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Zapisz zmiany danych logowania.</string>
+    <string name="save_changes_to_login">Zachowaj zmiany danych logowania.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Zachowaj zmiany.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Edycja</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Edycja hasła</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Dodanie nowych danych logowania</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Dodanie hasła</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Hasło jest wymagane</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Wpisz hasło</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Nazwa użytkownika jest wymagana</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Wpisz nazwę użytkownika</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Adres jest wymagany</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Wpisz adres witryny</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Wyszukiwanie głosowe</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2117,6 +2180,9 @@
     <string name="other_default_search_engine_suggestion_header">Szukaj w %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Przełącz domyślną przeglądarkę</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Ustaw automatyczne otwieranie odnośników z witryn, wiadomości e-mail i SMS-ów w Firefoksie.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2206,6 +2272,8 @@
     <string name="translations_bottom_sheet_translating_in_progress">Tłumaczenie</string>
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Trwa tłumaczenie</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Wybierz język</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Wystąpił problem przy tłumaczeniu. Spróbuj ponownie.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2226,6 +2294,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Nigdy nie tłumacz tego języka (%1$s)</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Nigdy nie tłumacz tej witryny</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Zastępuje wszystkie pozostałe ustawienia</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Zastępuje propozycje tłumaczenia</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Ustawienia tłumaczenia</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index efa79cba3..c5c40892d 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1698,20 +1698,32 @@
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Infurmaziuns d\'annunzia memorisadas</string>
 
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Pleds-clav memorisads</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Las infurmaziuns d\'annunzia che ti memoriseschas u sincroniseschas cun %s vegnan mussadas qua.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Ils pleds-clav che ti memoriseschas en u sincroniseschas cun %s vegnan mussads qua. Tut ils pleds-clav che ti memoriseschas èn criptads.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Vegnir a savair dapli davart Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Vegnir a savair dapli davart la sincronisaziun</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Excepziuns</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Las infurmaziuns d\'annunzia ed ils pleds-clav betg memorisads vegnan mussadas qua.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s na vegn betg a memorisar pleds-clav per websites inditgadas qua.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Las infurmaziuns d\'annunzia ed ils pleds-clav na vegnan betg memorisads per questas paginas.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s na vegn betg a memorisar pleds-clav per questas websites.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Stizzar tut las excepziuns</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Tschertgar datas d\'annunzia</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Tschertgar en ils pleds-clav</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Website</string>
     <!-- The header for the username for a login -->
@@ -1741,11 +1753,17 @@
     <string name="saved_login_hide_password">Zuppentar il pled-clav</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Debloccar per vesair las infurmaziuns d\'annunzia memorisadas</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Debloccar per vesair tes pleds-clav memorisads</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Protegia las infurmaziuns d\'annunzia ed ils pleds-clav</string>
 
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Protegia tes pleds-clav memorisads</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Definescha in muster per debloccar l\'apparat, in PIN u in pled-clav per proteger tias infurmaziuns d\'annunzia e tes pleds-clav da persunas che han access a tes apparat.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Endrizza in muster per bloccar l’apparat, in PIN u pled-clav per evitar ch’ina autra persuna possia acceder a tes pleds-clav memorisads sch’ella ha tes apparat.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Pli tard</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1764,6 +1782,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Zavrar il menu da las datas d\'annunzia</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu per zavrar ils pleds-clav</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Endataziun automatica</string>
@@ -1771,10 +1792,16 @@
     <string name="preferences_addresses">Adressas</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Cartas da credit</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Metodas da pajament</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Emplenir automaticamain las datas da la carta da credit</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Memorisar ed endatar automaticamain las metodas da pajament</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Las datas èn criptadas</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s criptescha tut las metodas da pajament che ti memoriseschas</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronisar las cartas tranter ils apparats</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1782,17 +1809,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Agiuntar ina carta da credit</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Agiuntar ina carta</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Administrar las cartas memorisadas</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Administrar las cartas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Agiuntar ina adressa</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Administrar las adressas</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Memorisar ed emplenir automaticamain las adressas</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Memorisar ed endatar automaticamain las adressas</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Includer infurmaziuns sco numers, adressas dad e-mail ed adressas postalas</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Cuntegna numers da telefon ed adressas dad e-mail</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Agiuntar ina carta</string>
     <!-- Title of the "Edit card" screen -->
@@ -1813,6 +1849,8 @@
     <string name="credit_cards_delete_card_button">Stizzar la carta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Vuls ti propi stizzar questa carta da credit?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Stizzar la carta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Stizzar</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1827,14 +1865,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Endatescha per plaschair in numer da carta da credit valid</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Endatescha in numer da carta valid</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Emplenescha per plaschair quest champ</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Agiuntescha in num</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Debloccar per vesair tias cartas memorisadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Protegia tias cartas da credit</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Protegia tias metodas da pajament memorisadas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Endrizza in muster per bloccar l\'apparat, in PIN u pled-clav per evitar ch\'ina autra persuna possia acceder a tias cartas da credit memorisadas sch\'ella ha tes apparat.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Endrizza in muster per bloccar l\'apparat, in PIN u pled-clav per evitar ch’ina autra persuna possia acceder a tias metodas da pajament memorisadas sch’ella ha tes apparat.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Ussa endrizzar</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1845,6 +1891,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Debloccar per utilisar las datas da cartas da credit memorisadas</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Debloccar per utilisar las metodas da pajament memorisadas</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Agiuntar ina adressa</string>
     <!-- Title of the "Edit address" screen -->
@@ -1882,6 +1930,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Vuls ti propi stizzar questa adressa?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Stizzar questa adressa?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Stizzar</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1980,6 +2030,8 @@
     <string name="login_menu_edit_button">Modifitgar</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Vuls ti propi stizzar questa infurmaziun d\'annunzia?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Vuls ti propi stizzar quest pled-clav?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Stizzar</string>
 
@@ -1987,24 +2039,44 @@
     <string name="dialog_delete_negative">Interrumper</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Opziuns per datas d\'annunzia</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opziuns da pleds-clav</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Il champ modifitgabel per l\'adressa web da las datas d\'annunzia.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Il champ da text modifitgabel per l’adressa da la website.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Il champ modifitgabel per il num d\'utilisader da las datas d\'annunzia.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Il champ da text modifitgabel per il num d’utilisader.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Il champ modifitgabel per il pled-clav da las datas d\'annunzia.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Il champ da text modifitgabel per il pled-clav.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Memorisar las midadas da las datas d\'annunzia.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Memorisar las midadas.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Modifitgar</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Modifitgar il pled-clav</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Agiuntar novas datas d\'annunzia</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Agiuntar in pled-clav</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Pled-clav obligatoric</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Endatar in pled-clav</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Num d\'utilisader obligatoric</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Endatar in num d’utilisader</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Num dal server obligatoric</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Endatar ina adressa web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Tschertga vocala</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2099,6 +2171,9 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Tschertga %s</string>
 
+    <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Mida tes navigatur standard</string>
     <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Definescha che colliaziuns da websites, e-mails e messadis vegnan averts automaticamain en Firefox.</string>
 
@@ -2354,6 +2429,8 @@
     <string name="translations_bottom_sheet_translating_in_progress">Translatar</string>
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Translaziun en elavuraziun</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Tscherner ina lingua</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Igl ha dà in problem cun translatar. Emprova per plaschair anc ina giada.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2374,6 +2451,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Mai translatar %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Mai translatar questa website</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Remplazza tut ils auters parameters</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Remplazza las offertas da translaziun</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Parameters da translaziun</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-tg/strings.xml b/app/src/main/res/values-tg/strings.xml
index 4eaf14fdb..4ae0da3cf 100644
--- a/app/src/main/res/values-tg/strings.xml
+++ b/app/src/main/res/values-tg/strings.xml
@@ -1715,6 +1715,8 @@
     <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Ниҳонвожаҳои нигоҳдошташуда</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Воридшавиҳое, ки шумо дар %s нигоҳ медоред ё ҳамоҳанг мекунед, дар ин ҷо нишон дода мешаванд.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Ниҳонвожаҳоеро, ки шумо нигоҳ медоред ё бо «%s» ҳамоҳанг месозед, дар ин рӯйхат нишон дода мешаванд. Ҳамаи ниҳонвожаҳое, ки шумо нигоҳ медоред, рамзгузорӣ карда мешаванд.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Маълумоти бештар дар бораи ҳамоҳангсозӣ</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
@@ -1723,8 +1725,12 @@
     <string name="preferences_passwords_exceptions">Истисноҳо</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Воридшавиҳо ва ниҳонвожаҳое, ки нигоҳ дошта нашудаанд, дар ин ҷо нишон дошта мешаванд.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">«%s» барои сомонаҳое, ки дар ин рӯйхат нишон дода шудаанд, ниҳонвожаҳоро нигоҳ намедорад.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Воридшавиҳо ва ниҳонвожаҳо барои сомонаҳои зерин нигоҳ дошта намешаванд.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">«%s» барои сомонаҳои зерин ниҳонвожаҳоро нигоҳ намедорад.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Нест кардани ҳамаи истисноҳо</string>
     <!-- Hint for search box in logins list -->
@@ -1759,8 +1765,12 @@
     <string name="saved_login_hide_password">Пинҳон кардани ниҳонвожа</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Барои дидани воридшавиҳои нигоҳдошташуда, қулфро кушоед</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Барои дидани ниҳонвожаҳои нигоҳдошташуда, қулфро кушоед</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Воридшавиҳо ва ниҳонвожаҳои худро муҳофизат намоед</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Ниҳонвожаҳои нигоҳдоштаро муҳофизат намоед</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Барои муҳофизат кардани воридшавиҳо ва ниҳонвожаҳои худ аз дастрасии озод, агар касе дигар аз дастгоҳи шумо истифода барад, шаклвораи қулфи экран, рамзи PIN ё ниҳонвожаеро барои дастгоҳи худ танзим намоед.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1804,14 +1814,20 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Илова кардани корти кредитӣ</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Илова кардани корт</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Идора кардани кортҳои нигоҳдошташуда</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Идоракунии кортҳо</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Илова кардани нишонӣ</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Идоракунии нишониҳо</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Нигоҳ доштан ва ба таври худкор пур кардани нишониҳо</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Нигоҳ доштан ва пур кардани нишониҳо</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Илова кардани маълумот монанди рақамҳо, нишониҳои почтаи электронӣ ва бурдарасонӣ</string>
 
@@ -1836,6 +1852,8 @@
     <string name="credit_cards_delete_card_button">Нест кардани корт</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Шумо мутмаин ҳастед, ки мехоҳед ин корти кредитиро нест намоед?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Кортро нест мекунед?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Нест кардан</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1851,8 +1869,12 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Лутфан, рақами корти кредитии дурустро ворид намоед</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Рақами корти дурустро ворид намоед</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Лутфан, ин майдонро пур кунед</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Номеро ворид намоед</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Барои дидани кортҳои нигоҳдошташуда, қулфро кушоед</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
@@ -1905,6 +1927,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Шумо мутмаин ҳастед, ки мехоҳед ин нишониро нест намоед?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Ин нишониро нест мекунед?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Нест кардан</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2002,12 +2026,16 @@
     <string name="login_menu_edit_button">Таҳрир кардан</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Шумо мутмаин ҳастед, ки мехоҳед ин воридшавиро нест намоед?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Шумо мутмаин ҳастед, ки мехоҳед ин ниҳонвожаро нест намоед?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Нест кардан</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Бекор кардан</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Имконоти воридшавӣ</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Инконоти ниҳонвожа</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Майдони матни таҳриршаванда барои нишонии сомонаи воридшавӣ.</string>
     <!--  The editable text field for a login's username. -->
@@ -2016,17 +2044,29 @@
     <string name="saved_login_password_description">Майдони матни таҳриршаванда барои ниҳонвожаи воридшавӣ.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Нигоҳ доштани тағйирот барои воридшавӣ</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Тағийротро нигоҳ медорад.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Таҳрир кардан</string>
 
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Таҳрир кардани ниҳонвожа</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Илова кардани воридшавии нав</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Илова кардани ниҳонвожа</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Ниҳонвожа лозим аст</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Ниҳонвожаеро ворид намоед</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Номи корбар лозим аст</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Номи корбареро ворид намоед</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Номи сервер лозим аст</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Нишонии сомонаеро ворид намоед</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Ҷустуҷӯи овозӣ</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2123,6 +2163,9 @@
     <string name="other_default_search_engine_suggestion_header">Ҷустуҷӯ дар «%s»</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Гузоштан ба браузери пешфарзи худ</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Пайвандҳоеро, танзим кунед, то ки онҳо аз сомонаҳо, почтаи электронӣ ва паёмҳо дар браузери «Firefox» ба таври худкор кушода шаванд.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2380,6 +2423,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Дар ҳоли тарҷума қарор дорад</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Забонеро интихоб кунед</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Ҳангоми тарҷума мушкилие ба миён омад. Лутфан, аз нав кӯшиш кунед.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2401,6 +2446,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">%1$s ҳеҷ вақт тарҷума карда нашавад</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Ин сомона ҳеҷ гоҳ тарҷума карда нашавад</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Ҳамаи танзимоти дигарро иваз мекунад</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Пешниҳодҳоро барои тарҷума иваз мекунад</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Танзимоти сомона</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 927f22503..c273ae92e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -2177,6 +2177,9 @@
     <string name="other_default_search_engine_suggestion_header">%s araması</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Varsayılan tarayıcınızı değiştirin</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Web siteleri, e-postalar ve mesajlardaki bağlantılar otomatik olarak Firefox’ta açılsın.</string>
 
     <!-- Content description for close button in collection placeholder. -->

From af474e69f78cc7f095c95bd87f2697e00a8c4d7d Mon Sep 17 00:00:00 2001
From: iorgamgabriel <iorgamgabriel@yahoo.com>
Date: Tue, 6 Feb 2024 15:06:58 +0200
Subject: [PATCH 139/222] Bug 1876140 - Translations UI Dropdown Checkmark

---
 .../java/org/mozilla/fenix/compose/Menu.kt    | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/compose/Menu.kt b/app/src/main/java/org/mozilla/fenix/compose/Menu.kt
index 68acd450b..2d1d5cbe1 100644
--- a/app/src/main/java/org/mozilla/fenix/compose/Menu.kt
+++ b/app/src/main/java/org/mozilla/fenix/compose/Menu.kt
@@ -6,11 +6,15 @@ package org.mozilla.fenix.compose
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.DropdownMenu
 import androidx.compose.material.DropdownMenuItem
+import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -24,8 +28,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
+import org.mozilla.fenix.R
 import org.mozilla.fenix.compose.annotation.LightDarkPreview
 import org.mozilla.fenix.compose.button.PrimaryButton
 import org.mozilla.fenix.theme.FirefoxTheme
@@ -62,14 +69,51 @@ private fun Menu(
                 .background(color = FirefoxTheme.colors.layer2)
                 .then(modifier),
         ) {
+            val hasCheckedItems = menuItems.any { it.isChecked }
+
             for (item in menuItems) {
+                val checkmarkModifier = if (hasCheckedItems) {
+                    Modifier.selectable(
+                        selected = item.isChecked,
+                        role = Role.Button,
+                        onClick = {
+                            onDismissRequest()
+                            item.onClick()
+                        },
+                    )
+                } else {
+                    Modifier
+                }
+
                 DropdownMenuItem(
-                    modifier = Modifier.testTag(item.testTag),
+                    modifier = Modifier
+                        .testTag(item.testTag)
+                        .align(alignment = Alignment.CenterHorizontally)
+                        .then(checkmarkModifier),
                     onClick = {
                         onDismissRequest()
                         item.onClick()
                     },
                 ) {
+                    if (hasCheckedItems) {
+                        if (item.isChecked) {
+                            Icon(
+                                painter = painterResource(id = R.drawable.mozac_ic_checkmark_24),
+                                modifier = Modifier
+                                    .size(24.dp),
+                                contentDescription = null,
+                                tint = FirefoxTheme.colors.iconPrimary,
+                            )
+                        } else {
+                            Spacer(
+                                modifier = Modifier
+                                    .size(24.dp),
+                            )
+                        }
+
+                        Spacer(modifier = Modifier.width(12.dp))
+                    }
+
                     Text(
                         text = item.title,
                         color = item.color ?: FirefoxTheme.colors.textPrimary,
@@ -117,12 +161,14 @@ fun ContextualMenu(
  *
  * @property title Text the item should display.
  * @property color Color used to display the text.
+ * @property isChecked Whether a checkmark should appear next to the text.
  * @property testTag Tag used to identify the item in automated tests.
  * @property onClick Callback to be called when the item is clicked.
  */
 data class MenuItem(
     val title: String,
     val color: Color? = null,
+    val isChecked: Boolean = false,
     val testTag: String = "",
     val onClick: () -> Unit,
 )

From 039c64c33baf358c337e3ecb5673d2a37a0856bb Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 9 Feb 2024 11:02:40 +0200
Subject: [PATCH 140/222] Bug 1816066 - Fix verifyMultipleLoginsSelectionsTest
 UI test

---
 .../java/org/mozilla/fenix/helpers/TestAssetHelper.kt      | 1 +
 .../java/org/mozilla/fenix/helpers/TestHelper.kt           | 7 +++++++
 .../androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt    | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestAssetHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestAssetHelper.kt
index d638e762f..fb90e772f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestAssetHelper.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestAssetHelper.kt
@@ -17,6 +17,7 @@ object TestAssetHelper {
     val waitingTime: Long = TimeUnit.SECONDS.toMillis(15)
     val waitingTimeLong = TimeUnit.SECONDS.toMillis(25)
     val waitingTimeShort: Long = TimeUnit.SECONDS.toMillis(3)
+    val waitingTimeVeryShort: Long = TimeUnit.SECONDS.toMillis(1)
 
     data class TestAsset(val url: Uri, val content: String, val title: String)
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
index a1f415a5c..2a06b0990 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
@@ -39,6 +39,7 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
+import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeVeryShort
 import org.mozilla.fenix.helpers.ext.waitNotNull
 import org.mozilla.fenix.ui.robots.clickPageObject
 
@@ -142,4 +143,10 @@ object TestHelper {
         assertFalse("Light theme not selected", expected)
 
     fun verifyDarkThemeApplied(expected: Boolean) = assertTrue("Dark theme not selected", expected)
+
+    fun waitForAppWindowToBeUpdated() {
+        Log.i(TAG, "waitForAppWindowToBeUpdated: Waiting for $waitingTimeVeryShort ms for $packageName window to be updated")
+        mDevice.waitForWindowUpdate(packageName, waitingTimeVeryShort)
+        Log.i(TAG, "waitForAppWindowToBeUpdated: Waited for $waitingTimeVeryShort ms for $packageName window to be updated")
+    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt
index a725fd33d..3dcdd96cd 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt
@@ -28,6 +28,7 @@ import org.mozilla.fenix.helpers.TestHelper.packageName
 import org.mozilla.fenix.helpers.TestHelper.restartApp
 import org.mozilla.fenix.helpers.TestHelper.scrollToElementByText
 import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
+import org.mozilla.fenix.helpers.TestHelper.waitForAppWindowToBeUpdated
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.clearTextFieldItem
 import org.mozilla.fenix.ui.robots.clickPageObject
@@ -260,12 +261,16 @@ class LoginsTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(loginPage.toUri()) {
             setPageObjectText(itemWithResId("username"), firstUser)
+            waitForAppWindowToBeUpdated()
             setPageObjectText(itemWithResId("password"), firstPass)
+            waitForAppWindowToBeUpdated()
             clickPageObject(itemWithResId("submit"))
             verifySaveLoginPromptIsDisplayed()
             clickPageObject(itemWithText("Save"))
             setPageObjectText(itemWithResId("username"), secondUser)
+            waitForAppWindowToBeUpdated()
             setPageObjectText(itemWithResId("password"), secondPass)
+            waitForAppWindowToBeUpdated()
             clickPageObject(itemWithResId("submit"))
             verifySaveLoginPromptIsDisplayed()
             clickPageObject(itemWithText("Save"))

From f9031dd0a2bbbbccc92308e1800c2ef046c672f6 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 9 Feb 2024 15:14:40 +0200
Subject: [PATCH 141/222] Bug 1879539 - Remove redundant assertion functions
 from LibrarySubMenusMultipleSelectionToolbarRobot

---
 ...rySubMenusMultipleSelectionToolbarRobot.kt | 93 +++++++------------
 1 file changed, 31 insertions(+), 62 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
index a86f8802e..3c675bf05 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
@@ -34,27 +34,46 @@ import org.mozilla.fenix.tabstray.TabsTrayTestTag
  */
 class LibrarySubMenusMultipleSelectionToolbarRobot {
 
-    fun verifyMultiSelectionCheckmark() = assertMultiSelectionCheckmark()
-
-    fun verifyMultiSelectionCheckmark(url: Uri) = assertMultiSelectionCheckmark(url)
+    fun verifyMultiSelectionCheckmark() = onView(withId(R.id.checkmark)).check(matches(isDisplayed()))
+
+    fun verifyMultiSelectionCheckmark(url: Uri) =
+        onView(
+            allOf(
+                withId(R.id.checkmark),
+                withParent(withParent(withChild(allOf(withId(R.id.url), withText(url.toString()))))),
+
+                // This is used as part of the `multiSelectionToolbarItemsTest` test. Somehow, in the view hierarchy,
+                // the match above is finding two checkmark views - one visible, one hidden, which is throwing off
+                // the matcher. This 'isDisplayed' check is a hacky workaround for this, we're explicitly ignoring
+                // the hidden one. Why are there two to begin with, though?
+                isDisplayed(),
+            ),
+        ).check(matches(isDisplayed()))
 
-    fun verifyMultiSelectionCounter() = assertMultiSelectionCounter()
+    fun verifyMultiSelectionCounter() = onView(withText("1 selected")).check(matches(isDisplayed()))
 
-    fun verifyShareHistoryButton() = assertShareHistoryButton()
+    fun verifyShareHistoryButton() = shareHistoryButton().check(matches(isDisplayed()))
 
-    fun verifyShareBookmarksButton() = assertShareBookmarksButton()
+    fun verifyShareBookmarksButton() = shareBookmarksButton().check(matches(isDisplayed()))
 
-    fun verifyShareOverlay() = assertShareOverlay()
+    fun verifyShareOverlay() = onView(withId(R.id.shareWrapper)).check(matches(isDisplayed()))
 
-    fun verifyShareAppsLayout() = assertShareAppsLayout()
+    fun verifyShareAppsLayout() {
+        val sendToDeviceTitle = mDevice.findObject(
+            UiSelector()
+                .instance(0)
+                .className(TextView::class.java),
+        )
+        sendToDeviceTitle.waitForExists(TestAssetHelper.waitingTime)
+    }
 
-    fun verifyShareTabFavicon() = assertShareTabFavicon()
+    fun verifyShareTabFavicon() = onView(withId(R.id.share_tab_favicon)).check(matches(isDisplayed()))
 
-    fun verifyShareTabTitle() = assertShareTabTitle()
+    fun verifyShareTabTitle() = onView(withId(R.id.share_tab_title)).check(matches(isDisplayed()))
 
-    fun verifyShareTabUrl() = assertShareTabUrl()
+    fun verifyShareTabUrl() = onView(withId(R.id.share_tab_url))
 
-    fun verifyCloseToolbarButton() = assertCloseToolbarButton()
+    fun verifyCloseToolbarButton() = closeToolbarButton().check(matches(isDisplayed()))
 
     fun clickShareHistoryButton() {
         shareHistoryButton().click()
@@ -157,53 +176,3 @@ private fun openInNewTabButton() = onView(withText("Open in new tab"))
 private fun openInPrivateTabButton() = onView(withText("Open in private tab"))
 
 private fun deleteButton() = onView(withText("Delete"))
-
-private fun assertMultiSelectionCheckmark() =
-    onView(withId(R.id.checkmark))
-        .check(matches(isDisplayed()))
-
-private fun assertMultiSelectionCheckmark(url: Uri) =
-    onView(
-        allOf(
-            withId(R.id.checkmark),
-            withParent(withParent(withChild(allOf(withId(R.id.url), withText(url.toString()))))),
-
-            // This is used as part of the `multiSelectionToolbarItemsTest` test. Somehow, in the view hierarchy,
-            // the match above is finding two checkmark views - one visible, one hidden, which is throwing off
-            // the matcher. This 'isDisplayed' check is a hacky workaround for this, we're explicitly ignoring
-            // the hidden one. Why are there two to begin with, though?
-            isDisplayed(),
-        ),
-    )
-        .check(matches(isDisplayed()))
-
-private fun assertMultiSelectionCounter() =
-    onView(withText("1 selected")).check(matches(isDisplayed()))
-
-private fun assertShareHistoryButton() =
-    shareHistoryButton().check(matches(isDisplayed()))
-
-private fun assertShareBookmarksButton() =
-    shareBookmarksButton().check(matches(isDisplayed()))
-
-private fun assertShareOverlay() =
-    onView(withId(R.id.shareWrapper)).check(matches(isDisplayed()))
-
-private fun assertShareAppsLayout() = {
-    val sendToDeviceTitle = mDevice.findObject(
-        UiSelector()
-            .instance(0)
-            .className(TextView::class.java),
-    )
-    sendToDeviceTitle.waitForExists(TestAssetHelper.waitingTime)
-}
-
-private fun assertShareTabTitle() =
-    onView(withId(R.id.share_tab_title)).check(matches(isDisplayed()))
-
-private fun assertShareTabFavicon() =
-    onView(withId(R.id.share_tab_favicon)).check(matches(isDisplayed()))
-
-private fun assertShareTabUrl() = onView(withId(R.id.share_tab_url))
-
-private fun assertCloseToolbarButton() = closeToolbarButton().check(matches(isDisplayed()))

From 7dc56f88c07cbec25cb921b963eb4617248fe23d Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 9 Feb 2024 15:41:26 +0200
Subject: [PATCH 142/222] Bug 1879539 - Add test logs to
 LibrarySubMenusMultipleSelectionToolbarRobot

---
 ...rySubMenusMultipleSelectionToolbarRobot.kt | 94 ++++++++++++++++---
 1 file changed, 83 insertions(+), 11 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
index 3c675bf05..1e65807a0 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.ui.robots
 
 import android.net.Uri
+import android.util.Log
 import android.widget.TextView
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.test.espresso.Espresso.onView
@@ -20,6 +21,8 @@ import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import org.hamcrest.Matchers.allOf
 import org.mozilla.fenix.R
+import org.mozilla.fenix.helpers.Constants
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.HomeActivityComposeTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
@@ -34,13 +37,27 @@ import org.mozilla.fenix.tabstray.TabsTrayTestTag
  */
 class LibrarySubMenusMultipleSelectionToolbarRobot {
 
-    fun verifyMultiSelectionCheckmark() = onView(withId(R.id.checkmark)).check(matches(isDisplayed()))
+    fun verifyMultiSelectionCheckmark() {
+        Log.i(TAG, "verifyMultiSelectionCheckmark: Trying to verify that the multi-selection checkmark is displayed")
+        onView(withId(R.id.checkmark)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyMultiSelectionCheckmark: Verified that the multi-selection checkmark is displayed")
+    }
 
-    fun verifyMultiSelectionCheckmark(url: Uri) =
+    fun verifyMultiSelectionCheckmark(url: Uri) {
+        Log.i(TAG, "verifyMultiSelectionCheckmark: Trying to verify that the multi-selection checkmark for item with url: $url is displayed")
         onView(
             allOf(
                 withId(R.id.checkmark),
-                withParent(withParent(withChild(allOf(withId(R.id.url), withText(url.toString()))))),
+                withParent(
+                    withParent(
+                        withChild(
+                            allOf(
+                                withId(R.id.url),
+                                withText(url.toString()),
+                            ),
+                        ),
+                    ),
+                ),
 
                 // This is used as part of the `multiSelectionToolbarItemsTest` test. Somehow, in the view hierarchy,
                 // the match above is finding two checkmark views - one visible, one hidden, which is throwing off
@@ -49,14 +66,32 @@ class LibrarySubMenusMultipleSelectionToolbarRobot {
                 isDisplayed(),
             ),
         ).check(matches(isDisplayed()))
+        Log.i(Constants.TAG, "verifyMultiSelectionCheckmark: Verified that the multi-selection checkmark for item with url: $url is displayed")
+    }
 
-    fun verifyMultiSelectionCounter() = onView(withText("1 selected")).check(matches(isDisplayed()))
+    fun verifyMultiSelectionCounter() {
+        Log.i(TAG, "verifyMultiSelectionCounter: Trying to verify that the multi-selection toolbar containing: \"1 selected\" is displayed")
+        onView(withText("1 selected")).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyMultiSelectionCounter: Verified that the multi-selection toolbar containing: \"1 selected\" is displayed")
+    }
 
-    fun verifyShareHistoryButton() = shareHistoryButton().check(matches(isDisplayed()))
+    fun verifyShareHistoryButton() {
+        Log.i(TAG, "verifyShareHistoryButton: Trying to verify that the multi-selection share history button is displayed")
+        shareHistoryButton().check(matches(isDisplayed()))
+        Log.i(TAG, "verifyShareHistoryButton: Verified that the multi-selection share history button is displayed")
+    }
 
-    fun verifyShareBookmarksButton() = shareBookmarksButton().check(matches(isDisplayed()))
+    fun verifyShareBookmarksButton() {
+        Log.i(TAG, "verifyShareBookmarksButton: Trying to verify that the multi-selection share bookmarks button is displayed")
+        shareBookmarksButton().check(matches(isDisplayed()))
+        Log.i(TAG, "verifyShareBookmarksButton: Verified that the multi-selection share bookmarks button is displayed")
+    }
 
-    fun verifyShareOverlay() = onView(withId(R.id.shareWrapper)).check(matches(isDisplayed()))
+    fun verifyShareOverlay() {
+        Log.i(TAG, "verifyShareOverlay: Trying to verify that the share overlay is displayed")
+        onView(withId(R.id.shareWrapper)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyShareOverlay: Verified that the share overlay is displayed")
+    }
 
     fun verifyShareAppsLayout() {
         val sendToDeviceTitle = mDevice.findObject(
@@ -67,16 +102,34 @@ class LibrarySubMenusMultipleSelectionToolbarRobot {
         sendToDeviceTitle.waitForExists(TestAssetHelper.waitingTime)
     }
 
-    fun verifyShareTabFavicon() = onView(withId(R.id.share_tab_favicon)).check(matches(isDisplayed()))
+    fun verifyShareTabFavicon() {
+        Log.i(TAG, "verifyShareTabFavicon: Trying to verify that the shared tab favicon is displayed")
+        onView(withId(R.id.share_tab_favicon)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyShareTabFavicon: Verified that the shared tab favicon is displayed")
+    }
 
-    fun verifyShareTabTitle() = onView(withId(R.id.share_tab_title)).check(matches(isDisplayed()))
+    fun verifyShareTabTitle() {
+        Log.i(TAG, "verifyShareTabTitle: Trying to verify that the shared tab title is displayed")
+        onView(withId(R.id.share_tab_title)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyShareTabTitle: Verified that the shared tab title is displayed")
+    }
 
-    fun verifyShareTabUrl() = onView(withId(R.id.share_tab_url))
+    fun verifyShareTabUrl() {
+        Log.i(TAG, "verifyShareTabUrl: Trying to verify that the shared tab url is displayed")
+        onView(withId(R.id.share_tab_url)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyShareTabUrl: Verified that the shared tab url is displayed")
+    }
 
-    fun verifyCloseToolbarButton() = closeToolbarButton().check(matches(isDisplayed()))
+    fun verifyCloseToolbarButton() {
+        Log.i(TAG, "verifyCloseToolbarButton: Trying to verify that the navigate up toolbar button is displayed")
+        closeToolbarButton().check(matches(isDisplayed()))
+        Log.i(TAG, "verifyCloseToolbarButton: Verified that the navigate up toolbar button is displayed")
+    }
 
     fun clickShareHistoryButton() {
+        Log.i(TAG, "clickShareHistoryButton: Trying to click the multi-selection share history button")
         shareHistoryButton().click()
+        Log.i(TAG, "clickShareHistoryButton: Clicked the multi-selection share history button")
 
         mDevice.waitNotNull(
             Until.findObject(
@@ -87,7 +140,9 @@ class LibrarySubMenusMultipleSelectionToolbarRobot {
     }
 
     fun clickShareBookmarksButton() {
+        Log.i(TAG, "clickShareBookmarksButton: Trying to click the multi-selection share bookmarks button")
         shareBookmarksButton().click()
+        Log.i(TAG, "clickShareBookmarksButton: Clicked the multi-selection share bookmarks button")
 
         mDevice.waitNotNull(
             Until.findObject(
@@ -98,7 +153,9 @@ class LibrarySubMenusMultipleSelectionToolbarRobot {
     }
 
     fun clickMultiSelectionDelete() {
+        Log.i(TAG, "clickMultiSelectionDelete: Trying to click the multi-selection delete button")
         deleteButton().click()
+        Log.i(TAG, "clickMultiSelectionDelete: Clicked the multi-selection delete button")
     }
 
     class Transition {
@@ -108,21 +165,28 @@ class LibrarySubMenusMultipleSelectionToolbarRobot {
         }
 
         fun closeToolbarReturnToHistory(interact: HistoryRobot.() -> Unit): HistoryRobot.Transition {
+            Log.i(TAG, "closeToolbarReturnToHistory: Trying to click the navigate up toolbar button")
             closeToolbarButton().click()
+            Log.i(TAG, "closeToolbarReturnToHistory: Clicked the navigate up toolbar button")
 
             HistoryRobot().interact()
             return HistoryRobot.Transition()
         }
 
         fun closeToolbarReturnToBookmarks(interact: BookmarksRobot.() -> Unit): BookmarksRobot.Transition {
+            Log.i(TAG, "closeToolbarReturnToBookmarks: Trying to click the navigate up toolbar button")
             closeToolbarButton().click()
+            Log.i(TAG, "closeToolbarReturnToBookmarks: Clicked the navigate up toolbar button")
 
             BookmarksRobot().interact()
             return BookmarksRobot.Transition()
         }
 
         fun clickOpenNewTab(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
+            Log.i(TAG, "clickOpenNewTab: Trying to click the multi-select \"Open in a new tab\" context menu button")
             openInNewTabButton().click()
+            Log.i(TAG, "clickOpenNewTab: Clicked the multi-select \"Open in a new tab\" context menu button")
+
             mDevice.waitNotNull(
                 Until.findObject(By.res("$packageName:id/tab_layout")),
                 waitingTime,
@@ -133,15 +197,21 @@ class LibrarySubMenusMultipleSelectionToolbarRobot {
         }
 
         fun clickOpenNewTab(composeTestRule: HomeActivityComposeTestRule, interact: ComposeTabDrawerRobot.() -> Unit): ComposeTabDrawerRobot.Transition {
+            Log.i(TAG, "clickOpenNewTab: Trying to click the multi-select \"Open in a new tab\" context menu button")
             openInNewTabButton().click()
+            Log.i(TAG, "clickOpenNewTab: Clicked the multi-select \"Open in a new tab\" context menu button")
+            Log.i(TAG, "clickOpenNewTab: Trying to verify that the tabs tray exists")
             composeTestRule.onNodeWithTag(TabsTrayTestTag.tabsTray).assertExists()
+            Log.i(TAG, "clickOpenNewTab: Verified that the tabs tray exists")
 
             ComposeTabDrawerRobot(composeTestRule).interact()
             return ComposeTabDrawerRobot.Transition(composeTestRule)
         }
 
         fun clickOpenPrivateTab(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
+            Log.i(TAG, "clickOpenPrivateTab: Trying to click the multi-select \"Open in a private tab\" context menu button")
             openInPrivateTabButton().click()
+            Log.i(TAG, "clickOpenPrivateTab: Clicked the multi-select \"Open in a private tab\" context menu button")
             mDevice.waitNotNull(
                 Until.findObject(By.res("$packageName:id/tab_layout")),
                 waitingTime,
@@ -152,7 +222,9 @@ class LibrarySubMenusMultipleSelectionToolbarRobot {
         }
 
         fun clickOpenPrivateTab(composeTestRule: HomeActivityComposeTestRule, interact: ComposeTabDrawerRobot.() -> Unit): ComposeTabDrawerRobot.Transition {
+            Log.i(TAG, "clickOpenPrivateTab: Trying to click the multi-select \"Open in a private tab\" context menu button")
             openInPrivateTabButton().click()
+            Log.i(TAG, "clickOpenPrivateTab: Clicked the multi-select \"Open in a private tab\" context menu button")
 
             ComposeTabDrawerRobot(composeTestRule).interact()
             return ComposeTabDrawerRobot.Transition(composeTestRule)

From c2179540f5c55ec87b8d97ad1fdd14aa426594bc Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 9 Feb 2024 15:42:54 +0200
Subject: [PATCH 143/222] Bug 1879539 - Remove unused functions from
 LibrarySubMenusMultipleSelectionToolbarRobot

---
 ...rarySubMenusMultipleSelectionToolbarRobot.kt | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
index 1e65807a0..b3b3d395c 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
@@ -6,7 +6,6 @@ package org.mozilla.fenix.ui.robots
 
 import android.net.Uri
 import android.util.Log
-import android.widget.TextView
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -17,14 +16,12 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withParent
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.uiautomator.By
-import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import org.hamcrest.Matchers.allOf
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.Constants
 import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.HomeActivityComposeTestRule
-import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.packageName
@@ -93,15 +90,6 @@ class LibrarySubMenusMultipleSelectionToolbarRobot {
         Log.i(TAG, "verifyShareOverlay: Verified that the share overlay is displayed")
     }
 
-    fun verifyShareAppsLayout() {
-        val sendToDeviceTitle = mDevice.findObject(
-            UiSelector()
-                .instance(0)
-                .className(TextView::class.java),
-        )
-        sendToDeviceTitle.waitForExists(TestAssetHelper.waitingTime)
-    }
-
     fun verifyShareTabFavicon() {
         Log.i(TAG, "verifyShareTabFavicon: Trying to verify that the shared tab favicon is displayed")
         onView(withId(R.id.share_tab_favicon)).check(matches(isDisplayed()))
@@ -159,11 +147,6 @@ class LibrarySubMenusMultipleSelectionToolbarRobot {
     }
 
     class Transition {
-        fun closeShareDialogReturnToPage(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            BrowserRobot().interact()
-            return BrowserRobot.Transition()
-        }
-
         fun closeToolbarReturnToHistory(interact: HistoryRobot.() -> Unit): HistoryRobot.Transition {
             Log.i(TAG, "closeToolbarReturnToHistory: Trying to click the navigate up toolbar button")
             closeToolbarButton().click()

From ca23a8e95bafbe5572e8c0f4ea8b3a35abddeb5c Mon Sep 17 00:00:00 2001
From: William Durand <will+git@drnd.me>
Date: Mon, 12 Feb 2024 11:56:50 +0100
Subject: [PATCH 144/222] Bug 1879819 - Improve rating description in list of
 add-ons

---
 .../fenix/addons/AddonDetailsBindingDelegate.kt   | 15 +++++++++------
 .../addons/AddonDetailsBindingDelegateTest.kt     | 11 +++++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
index fef044b05..3cfcc9575 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
@@ -64,9 +64,13 @@ class AddonDetailsBindingDelegate(
     private fun bindRating(addon: Addon) {
         addon.rating?.let { rating ->
             val resources = binding.root.resources
-            val ratingContentDescription = resources.getString(R.string.mozac_feature_addons_rating_content_description)
+            val ratingContentDescription =
+                resources.getString(R.string.mozac_feature_addons_rating_content_description_2)
+            binding.ratingLabel.contentDescription = String.format(ratingContentDescription, rating.average)
             binding.ratingView.rating = rating.average
 
+            val reviewCount = resources.getString(R.string.mozac_feature_addons_user_rating_count_2)
+            binding.reviewCount.contentDescription = String.format(reviewCount, numberFormatter.format(rating.reviews))
             binding.reviewCount.text = numberFormatter.format(rating.reviews)
 
             if (addon.ratingUrl.isNotBlank()) {
@@ -76,7 +80,6 @@ class AddonDetailsBindingDelegate(
                     interactor.openWebsite(addon.ratingUrl.toUri())
                 }
             }
-            binding.ratingLabel.joinContextDescriptions(String.format(ratingContentDescription, rating.average))
         }
     }
 
@@ -103,7 +106,7 @@ class AddonDetailsBindingDelegate(
 
         val formattedDate = dateFormatter.format(addon.updatedAtDate)
         binding.lastUpdatedText.text = formattedDate
-        binding.lastUpdatedLabel.joinContextDescriptions(formattedDate)
+        binding.lastUpdatedLabel.joinContentDescriptions(formattedDate)
     }
 
     private fun bindVersion(addon: Addon) {
@@ -121,7 +124,7 @@ class AddonDetailsBindingDelegate(
         } else {
             binding.versionText.setOnLongClickListener(null)
         }
-        binding.versionLabel.joinContextDescriptions(version)
+        binding.versionLabel.joinContentDescriptions(version)
     }
 
     private fun bindAuthor(addon: Addon) {
@@ -142,7 +145,7 @@ class AddonDetailsBindingDelegate(
                 interactor.openWebsite(author.url.toUri())
             }
         }
-        binding.authorLabel.joinContextDescriptions(author.name)
+        binding.authorLabel.joinContentDescriptions(author.name)
     }
 
     private fun bindDetails(addon: Addon) {
@@ -192,7 +195,7 @@ class AddonDetailsBindingDelegate(
     }
 
     @VisibleForTesting
-    internal fun TextView.joinContextDescriptions(text: String) {
+    internal fun TextView.joinContentDescriptions(text: String) {
         this.contentDescription = "${this.text} $text"
     }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt b/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
index 91f27b9e9..ca27f28c9 100644
--- a/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
@@ -69,12 +69,15 @@ class AddonDetailsBindingDelegateTest {
         )
         assertEquals(4.5f, binding.ratingView.rating)
         assertEquals("100", binding.reviewCount.text)
-        val ratingContentDescription = testContext.getString(R.string.mozac_feature_addons_rating_content_description)
 
-        val formattedRatting = String.format(ratingContentDescription, 4.3f)
-        val expectedContentDescription = binding.ratingLabel.text.toString() + " " + formattedRatting
-        assertEquals(expectedContentDescription, binding.ratingLabel.contentDescription)
+        val ratingContentDescription = testContext.getString(R.string.mozac_feature_addons_rating_content_description_2)
+        var formattedRatting = String.format(ratingContentDescription, 4.3f)
+        assertEquals(formattedRatting, binding.ratingLabel.contentDescription)
         assertEquals(IMPORTANT_FOR_ACCESSIBILITY_NO, binding.ratingView.importantForAccessibility)
+
+        val reviewContentDescription = testContext.getString(R.string.mozac_feature_addons_user_rating_count_2)
+        formattedRatting = String.format(reviewContentDescription, 100)
+        assertEquals(formattedRatting, binding.reviewCount.contentDescription)
     }
 
     @Test

From 9ef4aef273d93a765e9f052533968950ac40f1bf Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Wed, 31 Jan 2024 17:25:08 -0500
Subject: [PATCH 145/222] Bug 1868469 - Update the url immediately for existing
 engineSession

When we have an existing `engineSession` we use an optimized route to
load the url without needing to dispatch the load action. This is still
a valid performance improvement to make page loads faster.

However, in this code path we do not end up update the url in the state
until we get back a response from the Engine. This gives a perceived
performance loss of slow browsing. Updating the url gives UI components
an immediate update which reflects a change that would have been entered
by the user.

It was considered if we should do this in a middleware, but since this
is an optimized route, we should not wait for the middleware to process
the action before we perform the state update.
---
 .../androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
index 84083e014..be99ebe8a 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
@@ -85,7 +85,7 @@ class CrashReportingTest : TestSetup() {
             verifyPageContent(tabCrashMessage)
         }.openTabDrawer {
             verifyExistingOpenTabs(firstWebPage.title)
-            verifyExistingOpenTabs(secondWebPage.title)
+            verifyExistingOpenTabs("about:crashcontent")
         }.closeTabDrawer {
         }.goToHomescreen {
             verifyExistingTopSitesList()

From 1343061679e21d43d0adf68c2be7352cebc2a17a Mon Sep 17 00:00:00 2001
From: Ben Dean-Kawamura <bdk@mozilla.com>
Date: Thu, 1 Feb 2024 16:57:01 -0500
Subject: [PATCH 146/222] Revert "Bug 1875294 - Record breadbcrumbs before
 crashing with UnsatsisfiedLinkError"

This reverts commit 6fb061ce5efc1a3fb11dace06b826382e0b56736.

These didn't work out in practice.  The file lists were always empty, I
think it might be a difference in permissions for release builds vs the
debug builds that I was testing with.

The package installer name was useful, but I realized there's Sentry tag for that which is even more useful.
---
 .../org/mozilla/fenix/FenixApplication.kt     | 76 ++-----------------
 1 file changed, 5 insertions(+), 71 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
index b4f37a0af..6dfd7a069 100644
--- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
+++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -112,11 +112,8 @@ import org.mozilla.fenix.session.VisibilityLifecycleCallback
 import org.mozilla.fenix.utils.Settings
 import org.mozilla.fenix.utils.Settings.Companion.TOP_SITES_PROVIDER_MAX_THRESHOLD
 import org.mozilla.fenix.wallpapers.Wallpaper
-import java.io.File
-import java.io.FileInputStream
 import java.util.UUID
 import java.util.concurrent.TimeUnit
-import java.util.zip.ZipInputStream
 import kotlin.math.roundToLong
 
 private const val RAM_THRESHOLD_MEGABYTES = 1024
@@ -525,76 +522,13 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
      * thread, early in the app startup sequence.
      */
     private fun beginSetupMegazord() {
-        try {
-            // Note: Megazord.init() must be called as soon as possible ...
-            Megazord.init()
-
-            initializeRustErrors(components.analytics.crashReporter)
-            // ... but RustHttpConfig.setClient() and RustLog.enable() can be called later.
+        // Note: Megazord.init() must be called as soon as possible ...
+        Megazord.init()
 
-            RustLog.enable()
-        } catch (e: UnsatisfiedLinkError) {
-            @Suppress("TooGenericExceptionCaught")
-            try {
-                reportUnsatisfiedLinkErrorBreadcrumbs()
-            } catch (e: Throwable) {
-                // This shouldn't happen, but if it does it's better to ignore the exception from
-                // the breadcrumb code and rethrow the initial exception.
-            }
-            throw e
-        }
-    }
+        initializeRustErrors(components.analytics.crashReporter)
+        // ... but RustHttpConfig.setClient() and RustLog.enable() can be called later.
 
-    private fun reportUnsatisfiedLinkErrorBreadcrumbs() {
-        val breadcrumbStrings = mutableListOf<String>()
-        val apkPath = applicationContext.getApplicationInfo().sourceDir
-        breadcrumbStrings.add("APK: $apkPath")
-        val apkDir = File(apkPath).getParentFile()
-        val installSourcePackage = if (SDK_INT >= Build.VERSION_CODES.R) {
-            packageManager.getInstallSourceInfo(packageName).installingPackageName
-        } else {
-            @Suppress("DEPRECATION")
-            packageManager.getInstallerPackageName(packageName)
-        }
-        breadcrumbStrings.add("Installer package name: $installSourcePackage")
-
-        val installDirFileSet = if (apkDir != null) {
-            apkDir.walk()
-                .filter { it != apkDir && !it.isDirectory() }
-                .map { it.relativeTo(apkDir).toString() }
-                .filter { it.startsWith("lib/") }
-                .toHashSet()
-        } else {
-            HashSet()
-        }
-        val apkFileSet = ZipInputStream(FileInputStream(apkPath)).use {
-            generateSequence { it.nextEntry }
-                .map { it.name }
-                .filter { it.startsWith("lib/") }
-                .toHashSet()
-        }
-        fun formatFileSet(filenames: Set<String>) = if (filenames.size > 0) {
-            filenames.joinToString(", ")
-        } else {
-            "<none>"
-        }
-        val installDirOnly = formatFileSet(installDirFileSet - apkFileSet)
-        val apkFileOnly = formatFileSet(apkFileSet - installDirFileSet)
-        val both = formatFileSet(installDirFileSet union apkFileSet)
-
-        breadcrumbStrings.add("Files only inside lib/ dir: $installDirOnly")
-        breadcrumbStrings.add("Files only inside APK lib/ dir: $apkFileOnly")
-        breadcrumbStrings.add("Files inside both lib/ dirs: $both")
-
-        for (breadcrumbString in breadcrumbStrings) {
-            components.analytics.crashReporter.recordCrashBreadcrumb(
-                Breadcrumb(
-                    category = "Startup",
-                    message = breadcrumbString,
-                    level = Breadcrumb.Level.INFO,
-                ),
-            )
-        }
+        RustLog.enable()
     }
 
     @OptIn(DelicateCoroutinesApi::class) // GlobalScope usage

From 8f8b28a19be00dc0901b0aaebd00902567738d1e Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Mon, 12 Feb 2024 14:15:25 -0500
Subject: [PATCH 147/222] Bug 1873486 - Update mockk to version 1.13.9

---
 .../fenixdependencies/src/main/java/FenixDependenciesPlugin.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
index e4a769a07..efc00ff77 100644
--- a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+++ b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
@@ -32,7 +32,7 @@ object FenixVersions {
     const val installreferrer = "2.2"
 
     const val junit = "5.9.3"
-    const val mockk = "1.13.8"
+    const val mockk = "1.13.9"
 
     const val google_ads_id_version = "16.0.0"
 

From 7f8dfd4e6171e6fa724cc199c16adad0171c413c Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Tue, 13 Feb 2024 00:03:47 +0000
Subject: [PATCH 148/222] Import translations from android-l10n

---
 app/src/main/res/values-azb/strings.xml |  56 +++++++++
 app/src/main/res/values-eu/strings.xml  | 154 +++++++++++++++++-------
 2 files changed, 168 insertions(+), 42 deletions(-)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index 1c5e4b0c8..796ef13cf 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -611,9 +611,16 @@
     <!-- Preference for open download with an external download manager app -->
     <string name="preferences_external_download_manager">خاریجی یئندیرمه موْدیری.</string>
 
+    <!-- Preference for enabling gecko engine logs -->
+    <string name="preferences_enable_gecko_logs">Gecko قیدلرینی گوجلندیر</string>
+    <!-- Message to indicate users that we are quitting the application to apply the changes -->
+    <string name="quit_application">دگیشمه‌لری یئرینه سالماق اوچون اپلیکیشن‌دن چیْخیلیر...</string>
+
     <!-- Preference for add_ons -->
     <string name="preferences_addons">تاخیلان‌لار</string>
 
+    <!-- Preference for installing a local add-on -->
+    <string name="preferences_install_local_addon">تاخیلانیْ فایل‌دان قوْش</string>
     <!-- Preference for notifications -->
     <string name="preferences_notifications">بیلدیریش‌لر</string>
     <!-- Summary for notification preference indicating notifications are allowed -->
@@ -621,11 +628,30 @@
     <!-- Summary for notification preference indicating notifications are not allowed -->
     <string name="notifications_not_allowed_summary">ایجازه وئریلمه‌دی</string>
 
+    <!-- Add-on Preferences -->
+    <!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
+    <string name="preferences_customize_amo_collection">اؤزل تاخیْلان مجموعه‌سی</string>
     <!-- Button caption to confirm the add-on collection configuration -->
     <string name="customize_addon_collection_ok">تامام</string>
     <!-- Button caption to abort the add-on collection configuration -->
     <string name="customize_addon_collection_cancel">لغو</string>
 
+    <!-- Hint displayed on input field for custom collection name -->
+    <string name="customize_addon_collection_hint">مجموعه آدیْ</string>
+    <!-- Hint displayed on input field for custom collection user ID-->
+    <string name="customize_addon_collection_user_hint">مجموعه صاحیبی (قوللانیجیْ آیدی‌سی)</string>
+    <!-- Toast shown after confirming the custom add-on collection configuration -->
+    <string name="toast_customize_addon_collection_done">تاخیْلان مجموعه‌‌سی ایصلاح اوْلدوُ. دگیشمه‌لری یئرینه سالماق اوچون اپلیکیشن‌دن چیْخیلیر...</string>
+
+    <!-- Customize Home -->
+    <!-- Header text for jumping back into the recent tab in customize the home screen -->
+    <string name="customize_toggle_jump_back_in">قاباقکی تاغ‌لارا قاییت</string>
+    <!-- Title for the customize home screen section with recently saved bookmarks. -->
+    <string name="customize_toggle_recent_bookmarks">سوْن بوکمارک‌لار</string>
+    <!-- Title for the customize home screen section with recently visited. Recently visited is
+    a section where users see a list of tabs that they have visited in the past few days -->
+    <string name="customize_toggle_recently_visited">سون باخیلان‌لار</string>
+
     <!-- Text displayed that links to website containing documentation about the "Limited Edition" wallpapers. -->
     <string name="wallpaper_learn_more">آرتیق بیلین</string>
 
@@ -671,6 +697,36 @@
     <string name="library_bookmarks">بوُکمارک‌لار</string>
 
 
+    <!-- Option in Library to open History page -->
+    <string name="library_history">گئچمیش</string>
+    <!-- Option in Library to open a new tab -->
+    <string name="library_new_tab">یئنی تاغ</string>
+    <!-- Settings Page Title -->
+    <string name="settings_title">تنظیم‌‎لر</string>
+    <!-- Content description (not visible, for screen readers etc.): "Close button for library settings" -->
+    <string name="content_description_close_button">باغلا</string>
+
+    <!-- Tab Management -->
+    <!-- Title of preference for tabs management -->
+    <string name="preferences_tabs">تاغ‌لار</string>
+    <!-- Option for a list tab view -->
+    <string name="tab_view_list">لیست</string>
+    <!-- Option for auto closing tabs that will never auto close tabs, always allows user to manually close tabs -->
+    <string name="close_tabs_manually">هئچ زامان</string>
+
+    <!-- Option for always opening the homepage when re-opening the app -->
+    <string name="opening_screen_homepage">آنایارپاق</string>
+
+    <!-- Studies -->
+    <!-- Title of the remove studies button -->
+    <string name="studies_remove">قالدیر</string>
+
+
+    <!-- Text for the cancel button on delete bookmark dialog -->
+    <string name="bookmark_delete_negative">لغو</string>
+    <!-- Bookmark overflow menu edit button -->
+    <string name="bookmark_menu_edit_button">دوزه‌لیش</string>
+
     <!-- Translations feature-->
 
     </resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index ea6c22134..7f70955c9 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -245,6 +245,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Pertsonalizatu hasiera-orria</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Hasiera-pantaila</string>
@@ -252,6 +253,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Ezabatu nabigatze-historia</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Itzuli orria</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Hautatutako hizkuntza</string>
@@ -263,8 +267,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Eskaneatu</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Bilaketa-motorra</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Bilaketa-motorren ezarpenak</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -320,25 +322,30 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Jakinarazpenek %s(r)i zuku gehiago ateratzen laguntzen dute</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Jakinarazpenek %s(r)i zuku gehiago ateratzen laguntzen dute</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sinkronizatu zure fitxak gailuen artean, kudeatu deskargak, jaso aholkuak %s(r)en pribatutasun-babesari zuku gehien ateratzeko, eta gehiago.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sinkronizatu zure fitxak gailuen artean, kudeatu deskargak, jaso aholkuak %s(r)en pribatutasun-babesari zuku gehien ateratzeko, eta gehiago.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Jarraitu</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Jarraitu</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Une honetan ez</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Une honetan ez</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Firefoxen pribatutasun-oharra</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Zu seguru mantentzea dugu xede</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Irabazi asmorik gabeko erakundeak babestutako gure nabigatzaileak laguntzen du
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Irabazi asmorik gabeko erakundeak babestutako gure nabigatzaileak laguntzen du eragozten enpresek zure webeko jarraipena sekretupean egin dezaten.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Irabazi asmorik gabeko erakundeak babestutako gure nabigatzaileak laguntzen du
 eragozten enpresek zure webeko jarraipena sekretupean egin dezaten.\n\n
 Argibide gehiago gure pribatutasun-oharrean.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">pribatutasun-oharrean</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">pribatutasun-oharrean</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Ezarri nabigatzaile lehenetsi gisa</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -443,22 +450,11 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">HTTPS-Only modua</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie iragarki-banden murrizpena</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Cookie iragarki-banden blokeatzailea</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Cookie iragarki-banden blokeatzailea nabigatze pribatuan</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Murriztu cookie iragarki-bandak</string>
 
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Desaktibatuta</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Aktibatuta</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie iragarki-bandetako eskaerak automatikoki ukatzen saiatzen da %1$s.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Desaktibatuta gune honetarako</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -476,35 +472,16 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Une honetan gune honetarako euskarririk ez</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Aktibatu cookie iragarki-banden murrizpena %1$s gunerako?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Aktibatu cookie iragarki-banden blokeatzailea %1$s gunerako?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Desaktibatu cookie iragarki-banden murrizpena %1$s gunerako?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Desaktibatu cookie iragarki-banden blokeatzailea %1$s gunerako?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s(e)k ezin ditu cookie-eskaerak automatikoki baztertu gune honetan. Etorkizunean gune honetarako euskarria gehitzeko eskaera bidal dezakezu.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s(e)k gune honetako cookieak garbitu eta orria berrituko du. Cookie guztiak garbitzean, saioak amaitu edo erosketa-orgak hustu litezke.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Desaktibatu eta %1$s(e)k gune honetako cookieak garbitu eta orria berrituko du. Saioa amaitu edo erosketa-orgak hustu litezke.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie eskaerak automatikoki ukatzen saiatzen da %1$s.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Aktibatu eta %1$s gune honetako cookie iragarki-bandak automatikoki ukatzen saiatuko da.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Baimendu %1$s(r)i cookie iragarki-bandak ukatzen?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s(e)k automatikoki uka ditzake cookie iragarki-bandetako eskaerak.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Une honetan ez</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Cookie eskaera gutxiago ikusiko dituzu</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Baimendu</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s(e)k cookieak ukatu ditu zure partez</string>
@@ -721,6 +698,8 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="preferences_sync_bookmarks">Laster-markak</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Saio-hasierak</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Pasahitzak</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Irekitako fitxak</string>
     <!-- Preference for signing out -->
@@ -748,6 +727,8 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Kreditu-txartelak</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Ordainketa metodoak</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Helbideak</string>
 
@@ -1290,8 +1271,6 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Baztertu</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Ezin da inprimatu</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Ezin da orria inprimatu</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Inprimatu</string>
@@ -1697,8 +1676,12 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Saio-hasierak eta pasahitzak</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Pasahitzak</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Gorde saio-hasierak eta pasahitzak</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Gorde pasahitzak</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Galdetu gorde aurretik</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1715,26 +1698,46 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Gehitu saio-hasiera</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Gehitu pasahitza</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sinkronizatu saio-hasierak</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sinkronizatu pasahitzak</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sinkronizatu saio-hasierak gailuen artean</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sinkronizatu pasahitzak gailuen artean</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Gordetako saio-hasierak</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Gordetako pasahitzak</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">%s(e)n gordetzen edo sinkronizatzen dituzun saio-hasierak hemen agertuko dira.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">%s(e)n gordetzen edo sinkronizatzen dituzun pasahitzak hemen agertuko dira. Gordetzen dituzun pasahitz guztiak zifratuta daude.
+</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Sinkronizazioari buruzko argibide gehiago.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Sinkronizazioari buruzko argibide gehiago</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Salbuespenak</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Gorde gabeko saio-hasiera eta pasahitzak hemen erakutsiko dira.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s(e)k ez du pasahitzik gordeko hemen zerrendatutako guneetarako.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Gune hauetarako ez da saio-hasiera eta pasahitzik gordeko.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s(e)k ez du pasahitzik gordeko gune hauetarako.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Ezabatu salbuespen guztiak</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Bilatu saio-hasierak</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Bilatu pasahitzak</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Gunea</string>
     <!-- The header for the username for a login -->
@@ -1763,10 +1766,16 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="saved_login_hide_password">Ezkutatu pasahitza</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Desblokeatu gordetako saio-hasierak ikusteko</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desblokeatu gordetako pasahitzak ikusteko</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Lortu zure saio-hasierak eta pasahitzak</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Bermatu gordetako zure pasahitzak</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Konfiguratu gailua blokeatzeko patroia, PINa edo pasahitza zure saio-hasierak eta pasahitzak babesteko zure gailua beste norbaitek izango balu.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Konfiguratu gailua blokeatzeko patroia, PINa edo pasahitza zure gordetako pasahitzak babesteko zure gailua beste norbaitek izango balu.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Geroago</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1786,6 +1795,9 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordenatu saio-hasieren menua</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Ordenatu pasahitzen menua</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Betetze automatikoa</string>
@@ -1793,10 +1805,16 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="preferences_addresses">Helbideak</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Kreditu-txartelak</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Ordainketa metodoak</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Gorde eta osatu automatikoki kreditu-txartelak</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Gorde eta bete ordainketa metodoak</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Datuak zifratuta daude</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">Gordetzen dituzun ordainketa metodo guztiak zifratzen ditu %s(e)k</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sinkronizatu txartelak gailuen artean</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1804,8 +1822,12 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Gehitu kreditu-txartela</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Gehitu txartela</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Kudeatu gordetako txartelak</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Kudeatu txartelak</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Gehitu helbidea</string>
     <!-- Preference option for managing saved addresses -->
@@ -1813,9 +1835,14 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Gorde eta osatu automatikoki helbideak</string>
 
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Gorde eta osatu helbideak</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Kontuan izan zenbakiak, helbide elektronikoak eta bidalketa-helbideak</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Telefono zenbakiak eta helbide elektronikoak ere baditu</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Gehitu txartela</string>
     <!-- Title of the "Edit card" screen -->
@@ -1836,6 +1863,8 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="credit_cards_delete_card_button">Ezabatu txartela</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Ziur zaude kreditu-txartel hau ezabatu nahi duzula?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Ezabatu txartela?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Ezabatu</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1849,15 +1878,23 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
 
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Idatzi baliozko kreditu-txartel zenbakia</string>
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Idatzi baliozko txartel-zenbakia</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Bete eremu hau mesedez</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Gehitu izena</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desblokeatu gordetako txartelak ikusteko</string>
 
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Bermatu zure kreditu-txartelak</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Bermatu gordetako zure ordainketa metodoak</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Konfiguratu gailua blokeatzeko patroia, PINa edo pasahitza zure gordetako kreditu-txartelak babesteko zure gailua beste norbaitek izango balu.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Konfiguratu gailua blokeatzeko patroia, PINa edo pasahitza gordetako zure ordainketa metodoak babesteko zure gailua beste norbaitek izango balu.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Konfiguratu orain</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1867,6 +1904,8 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Desblokeatu gordetako kreditu txartelaren informazioa erabiltzeko</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desblokeatu gordetako ordainketa metodoak erabiltzeko</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Gehitu helbidea</string>
     <!-- Title of the "Edit address" screen -->
@@ -1903,6 +1942,8 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="addressess_delete_address_button">Ezabatu helbidea</string>
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Ziur zaude helbide hau ezabatu nahi duzula?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Ezabatu helbidea?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Ezabatu</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2001,30 +2042,52 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="login_menu_edit_button">Editatu</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Ziur zaude saio-hasiera hau ezabatu nahi duzula?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Ziur zaude pasahitz hau ezabatu nahi duzula?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Ezabatu</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Utzi</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Saio-hasieren aukerak</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Pasahitzaren aukerak</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Saio-hasieraren web helbiderako testu-eremu editagarria.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Webgunearen helbidearen testu-eremu editagarria.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Saio-hasieraren erabiltzaile-izenerako testu-eremu editagarria.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Erabiltzaile-izenaren testu-eremu editagarria.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Saio-hasieraren pasahitzerako testu-eremu editagarria.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Pasahitzaren testu-eremu editagarria.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Gorde saio-hasieraren aldaketak.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Gorde aldaketak.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Editatu</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Editatu pasahitza</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Gehitu saio-hasiera berria</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Gehitu pasahitza</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Pasahitza behar da</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Idatzi pasahitz bat</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Erabiltzaile-izena behar da</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Idatzi erabiltzaile-izen bat</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Ostalari-izena behar da</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Idatzi web helbide bat</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Ahots bidezko bilaketa</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2121,6 +2184,9 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="other_default_search_engine_suggestion_header">%s bilaketa</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Aldatu zure nabigatzaile lehenetsia</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Ireki webgune, posta elektroniko eta mezuetako loturak Firefoxen automatikoki.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2195,8 +2261,6 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Nabarmentzekoak</b> %s(e)ko azken 80 egunetan fidagarriak direla uste ditugun balorazioak dira.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Argibide gehiago %s(r)i buruz.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">Mozillaren %s(e)k nola antzematen duen balorazioen kalitatea</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">Nola antzematen duen %s(e)k balorazioen kalitatea</string>
     <!-- Text for title of settings section. -->
@@ -2381,6 +2445,8 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Itzulpena burutzen</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Aukeratu hizkuntza</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Arazo bat gertatu da itzultzean. Saiatu berriro mesedez.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2402,6 +2468,10 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="translation_option_bottom_sheet_never_translate_in_language">Inoiz ez itzuli %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Inoiz ez itzuli gune hau</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Beste ezarpen guztiak baliogabetzen ditu</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Itzultzeko eskaintzak baliogabetzen ditu</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Itzulpenen ezarpenak</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->

From 1be69822901ba15c02a943e72a81b12d1e31f420 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 9 Feb 2024 16:13:15 +0200
Subject: [PATCH 149/222] Bug 1879886 - Remove unused functions from
 NavigationToolbarRobot

---
 .../fenix/ui/robots/NavigationToolbarRobot.kt | 33 -------------------
 1 file changed, 33 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
index 2cb540324..51b4656f1 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
@@ -61,16 +61,11 @@ class NavigationToolbarRobot {
     fun verifyUrl(url: String) =
         onView(withId(R.id.mozac_browser_toolbar_url_view)).check(matches(withText(url)))
 
-    fun verifyNoHistoryBookmarks() = assertNoHistoryBookmarks()
-
     fun verifyTabButtonShortcutMenuItems() = assertTabButtonShortcutMenuItems()
 
     fun verifyReaderViewDetected(visible: Boolean = false) =
         assertReaderViewDetected(visible)
 
-    fun verifyCloseReaderViewDetected(visible: Boolean = false) =
-        assertCloseReaderViewDetected(visible)
-
     fun toggleReaderView() {
         mDevice.findObject(
             UiSelector()
@@ -379,13 +374,6 @@ fun openEditURLView() {
     Log.i(TAG, "openEditURLView: Edit URL bar displayed.")
 }
 
-private fun assertNoHistoryBookmarks() {
-    onView(withId(R.id.container))
-        .check(matches(not(hasDescendant(withText("Test_Page_1")))))
-        .check(matches(not(hasDescendant(withText("Test_Page_2")))))
-        .check(matches(not(hasDescendant(withText("Test_Page_3")))))
-}
-
 private fun assertTabButtonShortcutMenuItems() {
     onView(withId(R.id.mozac_browser_menu_recyclerView))
         .check(matches(hasDescendant(withText("Close tab"))))
@@ -425,27 +413,6 @@ private fun assertReaderViewDetected(visible: Boolean) {
     )
 }
 
-private fun assertCloseReaderViewDetected(visible: Boolean) {
-    mDevice.findObject(
-        UiSelector()
-            .description("Close reader view"),
-    )
-        .waitForExists(waitingTime)
-
-    onView(
-        allOf(
-            withParent(withId(R.id.mozac_browser_toolbar_page_actions)),
-            withContentDescription("Close reader view"),
-        ),
-    ).check(
-        if (visible) {
-            matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))
-        } else {
-            ViewAssertions.doesNotExist()
-        },
-    )
-}
-
 private val searchSelectorButton =
     mDevice.findObject(UiSelector().resourceId("$packageName:id/search_selector"))
 

From cd55ceee51ea750f9c75b435cb20f2b782348845 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 9 Feb 2024 16:15:03 +0200
Subject: [PATCH 150/222] Bug 1879886 - Convert private variables to functions
 so they don't get initialized

---
 .../org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
index 51b4656f1..94af51d9e 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
@@ -114,7 +114,7 @@ class NavigationToolbarRobot {
     // New unified search UI selector
     fun verifyDefaultSearchEngine(engineName: String) =
         assertUIObjectExists(
-            searchSelectorButton.getChild(UiSelector().description(engineName)),
+            searchSelectorButton().getChild(UiSelector().description(engineName)),
         )
 
     fun verifyTextSelectionOptions(vararg textSelectionOptions: String) {
@@ -352,8 +352,8 @@ class NavigationToolbarRobot {
         }
 
         fun clickSearchSelectorButton(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
-            searchSelectorButton.waitForExists(waitingTime)
-            searchSelectorButton.click()
+            searchSelectorButton().waitForExists(waitingTime)
+            searchSelectorButton().click()
 
             SearchRobot().interact()
             return SearchRobot.Transition()
@@ -413,7 +413,7 @@ private fun assertReaderViewDetected(visible: Boolean) {
     )
 }
 
-private val searchSelectorButton =
+private fun searchSelectorButton() =
     mDevice.findObject(UiSelector().resourceId("$packageName:id/search_selector"))
 
 inline fun runWithIdleRes(ir: IdlingResource?, pendingCheck: () -> Unit) {

From 611c39e09ca15333ec0e57559a18b024e96cd2ed Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 9 Feb 2024 16:18:33 +0200
Subject: [PATCH 151/222] Bug 1879886 - Remove redundant assertion functions
 from NavigationToolbarRobot

---
 .../fenix/ui/robots/NavigationToolbarRobot.kt | 57 +++++++++----------
 1 file changed, 26 insertions(+), 31 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
index 94af51d9e..2b2914e3e 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
@@ -61,10 +61,33 @@ class NavigationToolbarRobot {
     fun verifyUrl(url: String) =
         onView(withId(R.id.mozac_browser_toolbar_url_view)).check(matches(withText(url)))
 
-    fun verifyTabButtonShortcutMenuItems() = assertTabButtonShortcutMenuItems()
+    fun verifyTabButtonShortcutMenuItems() {
+        onView(withId(R.id.mozac_browser_menu_recyclerView))
+            .check(matches(hasDescendant(withText("Close tab"))))
+            .check(matches(hasDescendant(withText("New private tab"))))
+            .check(matches(hasDescendant(withText("New tab"))))
+    }
 
-    fun verifyReaderViewDetected(visible: Boolean = false) =
-        assertReaderViewDetected(visible)
+    fun verifyReaderViewDetected(visible: Boolean = false) {
+        mDevice.findObject(
+            UiSelector()
+                .description("Reader view"),
+        )
+            .waitForExists(waitingTime)
+
+        onView(
+            allOf(
+                withParent(withId(R.id.mozac_browser_toolbar_page_actions)),
+                withContentDescription("Reader view"),
+            ),
+        ).check(
+            if (visible) {
+                matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))
+            } else {
+                ViewAssertions.doesNotExist()
+            },
+        )
+    }
 
     fun toggleReaderView() {
         mDevice.findObject(
@@ -374,13 +397,6 @@ fun openEditURLView() {
     Log.i(TAG, "openEditURLView: Edit URL bar displayed.")
 }
 
-private fun assertTabButtonShortcutMenuItems() {
-    onView(withId(R.id.mozac_browser_menu_recyclerView))
-        .check(matches(hasDescendant(withText("Close tab"))))
-        .check(matches(hasDescendant(withText("New private tab"))))
-        .check(matches(hasDescendant(withText("New tab"))))
-}
-
 private fun urlBar() = mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))
 private fun awesomeBar() =
     mDevice.findObject(UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_edit_url_view"))
@@ -392,27 +408,6 @@ private fun clearAddressBarButton() = itemWithResId("$packageName:id/mozac_brows
 private fun readerViewToggle() =
     onView(withParent(withId(R.id.mozac_browser_toolbar_page_actions)))
 
-private fun assertReaderViewDetected(visible: Boolean) {
-    mDevice.findObject(
-        UiSelector()
-            .description("Reader view"),
-    )
-        .waitForExists(waitingTime)
-
-    onView(
-        allOf(
-            withParent(withId(R.id.mozac_browser_toolbar_page_actions)),
-            withContentDescription("Reader view"),
-        ),
-    ).check(
-        if (visible) {
-            matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))
-        } else {
-            ViewAssertions.doesNotExist()
-        },
-    )
-}
-
 private fun searchSelectorButton() =
     mDevice.findObject(UiSelector().resourceId("$packageName:id/search_selector"))
 

From c3da54cfbafa68437ac92c295c14c4c890464d14 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Mon, 12 Feb 2024 12:04:33 +0200
Subject: [PATCH 152/222] Bug 1879886 - Add test logs to NavigationToolbarRobot

---
 .../fenix/ui/robots/NavigationToolbarRobot.kt | 143 +++++++++++++-----
 1 file changed, 109 insertions(+), 34 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
index 2b2914e3e..cb6a84956 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
@@ -31,7 +31,6 @@ import androidx.test.uiautomator.By.textContains
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import org.hamcrest.CoreMatchers.allOf
-import org.hamcrest.CoreMatchers.not
 import org.junit.Assert.assertTrue
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.Constants
@@ -58,23 +57,29 @@ import org.mozilla.fenix.tabstray.TabsTrayTestTag
  * Implementation of Robot Pattern for the URL toolbar.
  */
 class NavigationToolbarRobot {
-    fun verifyUrl(url: String) =
+    fun verifyUrl(url: String) {
+        Log.i(TAG, "verifyUrl: Trying to verify toolbar text matches $url")
         onView(withId(R.id.mozac_browser_toolbar_url_view)).check(matches(withText(url)))
+        Log.i(TAG, "verifyUrl: Verified toolbar text matches $url")
+    }
 
     fun verifyTabButtonShortcutMenuItems() {
+        Log.i(TAG, "verifyTabButtonShortcutMenuItems: Trying to verify tab counter shortcut options")
         onView(withId(R.id.mozac_browser_menu_recyclerView))
             .check(matches(hasDescendant(withText("Close tab"))))
             .check(matches(hasDescendant(withText("New private tab"))))
             .check(matches(hasDescendant(withText("New tab"))))
+        Log.i(TAG, "verifyTabButtonShortcutMenuItems: Verified tab counter shortcut options")
     }
 
     fun verifyReaderViewDetected(visible: Boolean = false) {
+        Log.i(TAG, "verifyReaderViewDetected: Waiting for $waitingTime ms for reader view button to exist")
         mDevice.findObject(
             UiSelector()
                 .description("Reader view"),
-        )
-            .waitForExists(waitingTime)
-
+        ).waitForExists(waitingTime)
+        Log.i(TAG, "verifyReaderViewDetected: Waited for $waitingTime ms for reader view button to exist")
+        Log.i(TAG, "verifyReaderViewDetected: Trying to verify that the reader view button is visible")
         onView(
             allOf(
                 withParent(withId(R.id.mozac_browser_toolbar_page_actions)),
@@ -87,16 +92,20 @@ class NavigationToolbarRobot {
                 ViewAssertions.doesNotExist()
             },
         )
+        Log.i(TAG, "verifyReaderViewDetected: Verified that the reader view button is visible")
     }
 
     fun toggleReaderView() {
+        Log.i(TAG, "toggleReaderView: Waiting for $waitingTime ms for reader view button to exist")
         mDevice.findObject(
             UiSelector()
                 .resourceId("$packageName:id/mozac_browser_toolbar_page_actions"),
         )
             .waitForExists(waitingTime)
-
+        Log.i(TAG, "toggleReaderView: Waited for $waitingTime ms for reader view button to exist")
+        Log.i(TAG, "toggleReaderView: Trying to click the reader view button")
         readerViewToggle().click()
+        Log.i(TAG, "toggleReaderView: Clicked the reader view button")
     }
 
     fun verifyClipboardSuggestionsAreDisplayed(link: String = "", shouldBeDisplayed: Boolean) =
@@ -109,28 +118,42 @@ class NavigationToolbarRobot {
             exists = shouldBeDisplayed,
         )
 
-    fun longClickEditModeToolbar() =
-        mDevice.findObject(By.res("$packageName:id/mozac_browser_toolbar_edit_url_view")).click(LONG_CLICK_DURATION)
+    fun longClickEditModeToolbar() {
+        Log.i(TAG, "longClickEditModeToolbar: Trying to long click the edit mode toolbar")
+        mDevice.findObject(By.res("$packageName:id/mozac_browser_toolbar_edit_url_view"))
+            .click(LONG_CLICK_DURATION)
+        Log.i(TAG, "longClickEditModeToolbar: Long clicked the edit mode toolbar")
+    }
 
     fun clickContextMenuItem(item: String) {
         mDevice.waitNotNull(
             Until.findObject(By.text(item)),
             waitingTime,
         )
+        Log.i(TAG, "clickContextMenuItem: Trying click context menu item: $item")
         mDevice.findObject(By.text(item)).click()
+        Log.i(TAG, "clickContextMenuItem: Clicked context menu item: $item")
     }
 
-    fun clickClearToolbarButton() = clearAddressBarButton().click()
+    fun clickClearToolbarButton() {
+        Log.i(TAG, "clickClearToolbarButton: Trying click the clear address button")
+        clearAddressBarButton().click()
+        Log.i(TAG, "clickClearToolbarButton: Clicked the clear address button")
+    }
 
     fun verifyToolbarIsEmpty() =
-        itemWithResIdContainingText(
-            "$packageName:id/mozac_browser_toolbar_edit_url_view",
-            getStringResource(R.string.search_hint),
+        assertUIObjectExists(
+            itemWithResIdContainingText(
+                "$packageName:id/mozac_browser_toolbar_edit_url_view",
+                getStringResource(R.string.search_hint),
+            ),
         )
 
     // New unified search UI selector
     fun verifySearchBarPlaceholder(text: String) {
+        Log.i(TAG, "verifySearchBarPlaceholder: Waiting for $waitingTime ms for the toolbar to exist")
         urlBar().waitForExists(waitingTime)
+        Log.i(TAG, "verifySearchBarPlaceholder: Waited for $waitingTime ms for the toolbar to exist")
         assertItemTextEquals(urlBar(), expectedText = text)
     }
 
@@ -156,19 +179,21 @@ class NavigationToolbarRobot {
             sessionLoadedIdlingResource = SessionLoadedIdlingResource()
 
             openEditURLView()
-            Log.i(TAG, "enterURLAndEnterToBrowser: Opened edit mode URL view")
-
+            Log.i(TAG, "enterURLAndEnterToBrowser: Trying to set toolbar text to: $url")
             awesomeBar().setText(url.toString())
-            Log.i(TAG, "enterURLAndEnterToBrowser: Set toolbar text to: $url")
+            Log.i(TAG, "enterURLAndEnterToBrowser: Toolbar text was set to: $url")
+            Log.i(TAG, "enterURLAndEnterToBrowser: Trying to press device enter button")
             mDevice.pressEnter()
-            Log.i(TAG, "enterURLAndEnterToBrowser: Clicked enter on keyboard, submitted query")
+            Log.i(TAG, "enterURLAndEnterToBrowser: Pressed device enter button")
 
             runWithIdleRes(sessionLoadedIdlingResource) {
+                Log.i(TAG, "enterURLAndEnterToBrowser: Trying to assert that home screen layout or download button or the total cookie protection contextual hint exist")
                 assertTrue(
                     itemWithResId("$packageName:id/browserLayout").waitForExists(waitingTime) ||
                         itemWithResId("$packageName:id/download_button").waitForExists(waitingTime) ||
                         itemWithResId("cfr.dismiss").waitForExists(waitingTime),
                 )
+                Log.i(TAG, "enterURLAndEnterToBrowser: Asserted that home screen layout or download button or the total cookie protection contextual hint exist")
             }
 
             BrowserRobot().interact()
@@ -180,9 +205,12 @@ class NavigationToolbarRobot {
             interact: BrowserRobot.() -> Unit,
         ): BrowserRobot.Transition {
             openEditURLView()
-
+            Log.i(TAG, "enterURLAndEnterToBrowserForTCPCFR: Trying to set toolbar text to: $url")
             awesomeBar().setText(url.toString())
+            Log.i(TAG, "enterURLAndEnterToBrowserForTCPCFR: Toolbar text was set to: $url")
+            Log.i(TAG, "enterURLAndEnterToBrowserForTCPCFR: Trying to press device enter button")
             mDevice.pressEnter()
+            Log.i(TAG, "enterURLAndEnterToBrowserForTCPCFR: Pressed device enter button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -194,12 +222,17 @@ class NavigationToolbarRobot {
             sessionLoadedIdlingResource = SessionLoadedIdlingResource()
 
             openEditURLView()
-
+            Log.i(TAG, "openTabCrashReporter: Trying to set toolbar text to: $crashUrl")
             awesomeBar().setText(crashUrl)
+            Log.i(TAG, "openTabCrashReporter: Toolbar text was set to: $crashUrl")
+            Log.i(TAG, "openTabCrashReporter: Trying to press device enter button")
             mDevice.pressEnter()
+            Log.i(TAG, "openTabCrashReporter: Pressed device enter button")
 
             runWithIdleRes(sessionLoadedIdlingResource) {
+                Log.i(TAG, "openTabCrashReporter: Trying to find the tab crasher image")
                 mDevice.findObject(UiSelector().resourceId("$packageName:id/crash_tab_image"))
+                Log.i(TAG, "openTabCrashReporter: Found the tab crasher image")
             }
 
             BrowserRobot().interact()
@@ -208,15 +241,21 @@ class NavigationToolbarRobot {
 
         fun openThreeDotMenu(interact: ThreeDotMenuMainRobot.() -> Unit): ThreeDotMenuMainRobot.Transition {
             mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/mozac_browser_toolbar_menu")), waitingTime)
+            Log.i(TAG, "openThreeDotMenu: Trying to click the main menu button")
             threeDotButton().click()
+            Log.i(TAG, "openThreeDotMenu: Clicked the main menu button")
 
             ThreeDotMenuMainRobot().interact()
             return ThreeDotMenuMainRobot.Transition()
         }
 
         fun openTabTray(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
+            Log.i(TAG, "openTabTray: Waiting for device to be idle for $waitingTime ms")
             mDevice.waitForIdle(waitingTime)
+            Log.i(TAG, "openTabTray: Waited for device to be idle for $waitingTime ms")
+            Log.i(TAG, "openTabTray: Trying to click the tabs tray button")
             tabTrayButton().click()
+            Log.i(TAG, "openTabTray: Clicked the tabs tray button")
             mDevice.waitNotNull(
                 Until.findObject(By.res("$packageName:id/tab_layout")),
                 waitingTime,
@@ -229,6 +268,7 @@ class NavigationToolbarRobot {
         fun openComposeTabDrawer(composeTestRule: HomeActivityComposeTestRule, interact: ComposeTabDrawerRobot.() -> Unit): ComposeTabDrawerRobot.Transition {
             for (i in 1..Constants.RETRY_COUNT) {
                 try {
+                    Log.i(TAG, "openComposeTabDrawer: Started try #$i")
                     mDevice.waitForObjects(
                         mDevice.findObject(
                             UiSelector()
@@ -236,30 +276,40 @@ class NavigationToolbarRobot {
                         ),
                         waitingTime,
                     )
-
+                    Log.i(TAG, "openComposeTabDrawer: Trying to click the tabs tray button")
                     tabTrayButton().click()
-
+                    Log.i(TAG, "openComposeTabDrawer: Clicked the tabs tray button")
+                    Log.i(TAG, "openComposeTabDrawer: Trying to verify that the tabs tray exists")
                     composeTestRule.onNodeWithTag(TabsTrayTestTag.tabsTray).assertExists()
+                    Log.i(TAG, "openComposeTabDrawer: Verified that the tabs tray exists")
 
                     break
                 } catch (e: AssertionError) {
+                    Log.i(TAG, "openComposeTabDrawer: AssertionError caught, executing fallback methods")
                     if (i == Constants.RETRY_COUNT) {
                         throw e
                     } else {
+                        Log.i(TAG, "openComposeTabDrawer: Waiting for device to be idle")
                         mDevice.waitForIdle()
+                        Log.i(TAG, "openComposeTabDrawer: Waited for device to be idle")
                     }
                 }
             }
-
+            Log.i(TAG, "openComposeTabDrawer: Trying to verify the tabs tray new tab FAB button exists")
             composeTestRule.onNodeWithTag(TabsTrayTestTag.fab).assertExists()
+            Log.i(TAG, "openComposeTabDrawer: Verified the tabs tray new tab FAB button exists")
 
             ComposeTabDrawerRobot(composeTestRule).interact()
             return ComposeTabDrawerRobot.Transition(composeTestRule)
         }
 
         fun visitLinkFromClipboard(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "visitLinkFromClipboard: Waiting for $waitingTimeShort ms for clear address button to exist")
             if (clearAddressBarButton().waitForExists(waitingTimeShort)) {
+                Log.i(TAG, "visitLinkFromClipboard: Waited for $waitingTimeShort ms for clear address button to exist")
+                Log.i(TAG, "visitLinkFromClipboard: Trying to click the clear address button")
                 clearAddressBarButton().click()
+                Log.i(TAG, "visitLinkFromClipboard: Clicked the clear address button")
             }
 
             mDevice.waitNotNull(
@@ -275,26 +325,33 @@ class NavigationToolbarRobot {
                     waitingTime,
                 )
             }
-
+            Log.i(TAG, "visitLinkFromClipboard: Trying to click the fill link from clipboard button")
             fillLinkButton().click()
+            Log.i(TAG, "visitLinkFromClipboard: Clicked the fill link from clipboard button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun goBackToHomeScreen(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
+            Log.i(TAG, "goBackToHomeScreen: Trying to click the device back button")
             mDevice.pressBack()
+            Log.i(TAG, "goBackToHomeScreen: Clicked the device back button")
+            Log.i(TAG, "goBackToHomeScreen: Waiting for $waitingTimeShort ms for $packageName window to be updated")
             mDevice.waitForWindowUpdate(packageName, waitingTimeShort)
+            Log.i(TAG, "goBackToHomeScreen: Waited for $waitingTimeShort ms for $packageName window to be updated")
 
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
         }
 
         fun goBackToBrowserScreen(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "goBackToBrowserScreen: Trying to click the device back button")
             mDevice.pressBack()
-            Log.i(TAG, "goBackToBrowserScreen: Dismiss awesome bar using device back button")
+            Log.i(TAG, "goBackToBrowserScreen: Clicked the device back button")
+            Log.i(TAG, "goBackToBrowserScreen: Waiting for $waitingTimeShort ms for $packageName window to be updated")
             mDevice.waitForWindowUpdate(packageName, waitingTimeShort)
-            Log.i(TAG, "goBackToBrowserScreen: Waited $waitingTimeShort for window update")
+            Log.i(TAG, "goBackToBrowserScreen: Waited for $waitingTimeShort ms for $packageName window to be updated")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -302,16 +359,19 @@ class NavigationToolbarRobot {
 
         fun openTabButtonShortcutsMenu(interact: NavigationToolbarRobot.() -> Unit): Transition {
             mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/counter_root")))
+            Log.i(TAG, "openTabButtonShortcutsMenu: Trying to long click the tab counter button")
             tabsCounter().perform(longClick())
-            Log.i(TAG, "Tabs counter long-click successful.")
+            Log.i(TAG, "openTabButtonShortcutsMenu: Long clicked the tab counter button")
 
             NavigationToolbarRobot().interact()
             return Transition()
         }
 
         fun closeTabFromShortcutsMenu(interact: NavigationToolbarRobot.() -> Unit): Transition {
+            Log.i(TAG, "closeTabFromShortcutsMenu: Waiting for device to be idle for $waitingTime ms")
             mDevice.waitForIdle(waitingTime)
-
+            Log.i(TAG, "closeTabFromShortcutsMenu: Waited for device to be idle for $waitingTime ms")
+            Log.i(TAG, "closeTabFromShortcutsMenu: Trying to click the \"Close tab\" button")
             onView(withId(R.id.mozac_browser_menu_recyclerView))
                 .perform(
                     RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
@@ -321,15 +381,17 @@ class NavigationToolbarRobot {
                         ViewActions.click(),
                     ),
                 )
-            Log.i(TAG, "Clicked the tab shortcut Close tab button.")
+            Log.i(TAG, "closeTabFromShortcutsMenu: Clicked the \"Close tab\" button")
 
             NavigationToolbarRobot().interact()
             return Transition()
         }
 
         fun openNewTabFromShortcutsMenu(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
+            Log.i(TAG, "openNewTabFromShortcutsMenu: Waiting for device to be idle for $waitingTime ms")
             mDevice.waitForIdle(waitingTime)
-            Log.i(TAG, "Looking for tab shortcut New tab button.")
+            Log.i(TAG, "openNewTabFromShortcutsMenu: Waited for device to be idle for $waitingTime ms")
+            Log.i(TAG, "openNewTabFromShortcutsMenu: Trying to click the \"New tab\" button")
             onView(withId(R.id.mozac_browser_menu_recyclerView))
                 .perform(
                     RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
@@ -339,15 +401,17 @@ class NavigationToolbarRobot {
                         ViewActions.click(),
                     ),
                 )
-            Log.i(TAG, "Clicked the tab shortcut New tab button.")
+            Log.i(TAG, "openNewTabFromShortcutsMenu: Clicked the \"New tab\" button")
 
             SearchRobot().interact()
             return SearchRobot.Transition()
         }
 
         fun openNewPrivateTabFromShortcutsMenu(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
+            Log.i(TAG, "openNewPrivateTabFromShortcutsMenu: Waiting for device to be idle for $waitingTime ms")
             mDevice.waitForIdle(waitingTime)
-            Log.i(TAG, "Looking for tab shortcut New private tab button.")
+            Log.i(TAG, "openNewPrivateTabFromShortcutsMenu: Waited for device to be idle for $waitingTime ms")
+            Log.i(TAG, "openNewPrivateTabFromShortcutsMenu: Trying to click the \"New private tab\" button")
             onView(withId(R.id.mozac_browser_menu_recyclerView))
                 .perform(
                     RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
@@ -357,26 +421,33 @@ class NavigationToolbarRobot {
                         ViewActions.click(),
                     ),
                 )
-            Log.i(TAG, "Clicked the tab shortcut New private tab button.")
+            Log.i(TAG, "openNewPrivateTabFromShortcutsMenu: Clicked the \"New private tab\" button")
 
             SearchRobot().interact()
             return SearchRobot.Transition()
         }
 
         fun clickUrlbar(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
+            Log.i(TAG, "clickUrlbar: Trying to click the toolbar")
             urlBar().click()
-
+            Log.i(TAG, "clickUrlbar: Clicked the toolbar")
+            Log.i(TAG, "clickUrlbar: Waiting for $waitingTime ms for the edit mode toolbar to exist")
             mDevice.findObject(
                 UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_edit_url_view"),
             ).waitForExists(waitingTime)
+            Log.i(TAG, "clickUrlbar: Waited for $waitingTime ms for the edit mode toolbar to exist")
 
             SearchRobot().interact()
             return SearchRobot.Transition()
         }
 
         fun clickSearchSelectorButton(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
+            Log.i(TAG, "clickSearchSelectorButton: Waiting for $waitingTime ms for the search selector button to exist")
             searchSelectorButton().waitForExists(waitingTime)
+            Log.i(TAG, "clickSearchSelectorButton: Waited for $waitingTime ms for the search selector button to exist")
+            Log.i(TAG, "clickSearchSelectorButton: Trying to click the search selector button")
             searchSelectorButton().click()
+            Log.i(TAG, "clickSearchSelectorButton: Clicked the search selector button")
 
             SearchRobot().interact()
             return SearchRobot.Transition()
@@ -390,11 +461,15 @@ fun navigationToolbar(interact: NavigationToolbarRobot.() -> Unit): NavigationTo
 }
 
 fun openEditURLView() {
+    Log.i(TAG, "openEditURLView: Waiting for $waitingTime ms for the toolbar to exist")
     urlBar().waitForExists(waitingTime)
+    Log.i(TAG, "openEditURLView: Waited for $waitingTime ms for the toolbar to exist")
+    Log.i(TAG, "openEditURLView: Trying to click the toolbar")
     urlBar().click()
-    Log.i(TAG, "openEditURLView: URL bar clicked.")
+    Log.i(TAG, "openEditURLView: Clicked the toolbar")
+    Log.i(TAG, "openEditURLView: Waiting for $waitingTime ms for the edit mode toolbar to exist")
     itemWithResId("$packageName:id/mozac_browser_toolbar_edit_url_view").waitForExists(waitingTime)
-    Log.i(TAG, "openEditURLView: Edit URL bar displayed.")
+    Log.i(TAG, "openEditURLView: Waited for $waitingTime ms for the edit mode toolbar to exist")
 }
 
 private fun urlBar() = mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))

From 2967c025c9cff7719f3d7e2ddb2acd5d05364dc8 Mon Sep 17 00:00:00 2001
From: DreVla <vlad.dreghici@gmail.com>
Date: Wed, 10 Jan 2024 16:28:38 +0200
Subject: [PATCH 153/222] Bug 1870701 - Review Checker opt-in privacy policy
 link and text update

Updated the Privacy Policy links and text to clearly explain the
minimal nature of data that's collected and processed during
Review Checker use in Firefox.
---
 .../middleware/ReviewQualityCheckNavigationMiddleware.kt  | 3 ++-
 .../shopping/ui/ReviewQualityCheckContextualOnboarding.kt | 7 ++++---
 app/src/main/res/values/strings.xml                       | 8 ++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNavigationMiddleware.kt b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNavigationMiddleware.kt
index 91b846fce..aaa1c4673 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNavigationMiddleware.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNavigationMiddleware.kt
@@ -13,7 +13,8 @@ import org.mozilla.fenix.shopping.store.ReviewQualityCheckState
 private const val POWERED_BY_URL =
     "https://www.fakespot.com/review-checker?utm_source=review-checker" +
         "&utm_campaign=fakespot-by-mozilla&utm_medium=inproduct&utm_term=core-sheet"
-private const val PRIVACY_POLICY_URL = "https://www.fakespot.com/privacy-policy"
+private const val PRIVACY_POLICY_URL = "https://www.mozilla.org/en-US/privacy/firefox/#review-checker" +
+    "?utm_source=review-checker&utm_campaign=privacy-policy&utm_medium=in-product&utm_term=opt-in-screen"
 private const val TERMS_OF_USE_URL = "https://www.fakespot.com/terms"
 
 /**
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt
index e5c53777b..afa4da62d 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt
@@ -61,7 +61,7 @@ fun ReviewQualityCheckContextualOnboarding(
     val learnMoreText =
         stringResource(id = R.string.review_quality_check_contextual_onboarding_learn_more_link)
     val privacyPolicyText =
-        stringResource(id = R.string.review_quality_check_contextual_onboarding_privacy_policy)
+        stringResource(id = R.string.review_quality_check_contextual_onboarding_privacy_policy_3)
     val termsOfUseText =
         stringResource(id = R.string.review_quality_check_contextual_onboarding_terms_use)
     val titleContentDescription =
@@ -113,9 +113,10 @@ fun ReviewQualityCheckContextualOnboarding(
 
         LinkText(
             text = stringResource(
-                id = R.string.review_quality_check_contextual_onboarding_caption,
-                stringResource(id = R.string.shopping_product_name),
+                id = R.string.review_quality_check_contextual_onboarding_caption_3,
+                stringResource(id = R.string.firefox),
                 privacyPolicyText,
+                stringResource(id = R.string.shopping_product_name),
                 termsOfUseText,
             ),
             linkTextStates = listOf(
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 179612613..38148a49f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2247,13 +2247,17 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Learn more</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">By selecting “Yes, try it” you agree to %1$s by Mozilla’s %2$s and %3$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">By selecting “Yes, try it” you agree to %1$s by Mozilla’s %2$s and %3$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">By selecting “Yes, try it” you agree to the following from %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3">By selecting “Yes, try it” you agree to %1$s\'s %2$s and %3$s\'s %4$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">privacy policy</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">privacy policy</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Privacy policy</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">privacy notice</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">terms of use</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->

From 7455523c8fc5eb51d48d77651914464014598c7e Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 13 Feb 2024 13:31:12 +0200
Subject: [PATCH 154/222] Bug 1880047 - Add missing pairs of logs to
 NotificationRobot

---
 .../fenix/ui/robots/NotificationRobot.kt      | 83 ++++++++++++-------
 1 file changed, 54 insertions(+), 29 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
index 7398746e9..5a6acc9cb 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
@@ -29,10 +29,10 @@ class NotificationRobot {
         var notificationFound = mDevice.findObject(notification).waitForExists(waitingTime)
 
         while (!notificationFound) {
+            Log.i(TAG, "verifySystemNotificationExists: Waiting for $waitingTime ms for notification: $notification to exist")
             scrollToEnd()
-            Log.i(TAG, "verifySystemNotificationExists: Scrolling to the end of the notification tray")
-            Log.i(TAG, "verifySystemNotificationExists: Looking for $notificationMessage notification")
             notificationFound = mDevice.findObject(notification).waitForExists(waitingTime)
+            Log.i(TAG, "verifySystemNotificationExists: Waited for $waitingTime ms for notification: $notification to exist")
         }
 
         assertUIObjectExists(itemWithText(notificationMessage))
@@ -40,33 +40,37 @@ class NotificationRobot {
 
     fun clearNotifications() {
         if (clearButton.exists()) {
-            Log.i(TAG, "clearNotifications: Verified that clear notifications button exists")
+            Log.i(TAG, "clearNotifications:The clear notifications button exists")
+            Log.i(TAG, "clearNotifications: Trying to click the clear notifications button")
             clearButton.click()
-            Log.i(TAG, "clearNotifications: Clicked clear notifications button")
+            Log.i(TAG, "clearNotifications: Clicked the clear notifications button")
         } else {
             scrollToEnd()
-            Log.i(TAG, "clearNotifications: Scrolled to end of notifications tray")
             if (clearButton.exists()) {
-                Log.i(TAG, "clearNotifications: Verified that clear notifications button exists")
+                Log.i(TAG, "clearNotifications:The clear notifications button exists")
+                Log.i(TAG, "clearNotifications: Trying to click the clear notifications button")
                 clearButton.click()
-                Log.i(TAG, "clearNotifications: Clicked clear notifications button")
+                Log.i(TAG, "clearNotifications: Clicked the clear notifications button")
             } else if (notificationTray().exists()) {
+                Log.i(TAG, "clearNotifications: The notifications tray is still displayed")
+                Log.i(TAG, "clearNotifications: Trying to click device back button")
                 mDevice.pressBack()
-                Log.i(TAG, "clearNotifications: Dismiss notifications tray by clicking device back button")
+                Log.i(TAG, "clearNotifications: Clicked device back button")
             }
         }
     }
 
     fun cancelAllShownNotifications() {
+        Log.i(TAG, "cancelAllShownNotifications: Trying to cancel all system notifications")
         cancelAll()
         Log.i(TAG, "cancelAllShownNotifications: Canceled all system notifications")
     }
 
     fun verifySystemNotificationDoesNotExist(notificationMessage: String) {
-        Log.i(TAG, "verifySystemNotificationDoesNotExist: Waiting for $notificationMessage notification to be gone")
+        Log.i(TAG, "verifySystemNotificationDoesNotExist: Waiting for $waitingTime ms for notification: $notificationMessage to be gone")
         mDevice.findObject(UiSelector().textContains(notificationMessage)).waitUntilGone(waitingTime)
+        Log.i(TAG, "verifySystemNotificationDoesNotExist: Waited for $waitingTime ms for notification: $notificationMessage to be gone")
         assertUIObjectExists(itemContainingText(notificationMessage), exists = false)
-        Log.i(TAG, "verifySystemNotificationDoesNotExist: Verified that $notificationMessage notification does not exist")
     }
 
     fun verifyPrivateTabsNotification() {
@@ -75,17 +79,22 @@ class NotificationRobot {
     }
 
     fun clickMediaNotificationControlButton(action: String) {
+        Log.i(TAG, "clickMediaNotificationControlButton: Waiting for $waitingTime ms for the system media control button: $action to exist")
         mediaSystemNotificationButton(action).waitForExists(waitingTime)
+        Log.i(TAG, "clickMediaNotificationControlButton: Waited for $waitingTime ms for the system media control button: $action to exist")
+        Log.i(TAG, "clickMediaNotificationControlButton: Trying to click the system media control button: $action")
         mediaSystemNotificationButton(action).click()
+        Log.i(TAG, "clickMediaNotificationControlButton: Clicked the system media control button: $action")
     }
 
     fun clickDownloadNotificationControlButton(action: String) {
         for (i in 1..RETRY_COUNT) {
-            Log.i(TAG, "clickPageObject: For loop i = $i")
+            Log.i(TAG, "clickDownloadNotificationControlButton: Started try #$i")
             try {
                 assertUIObjectExists(downloadSystemNotificationButton(action))
+                Log.i(TAG, "clickDownloadNotificationControlButton: Trying to click the download system notification: $action button and wait for $waitingTimeShort ms for a new window")
                 downloadSystemNotificationButton(action).clickAndWaitForNewWindow(waitingTimeShort)
-                Log.i(TAG, "clickDownloadNotificationControlButton: Clicked app notification $action button and waits for a new window for $waitingTimeShort ms")
+                Log.i(TAG, "clickDownloadNotificationControlButton: Clicked the download system notification: $action button and waited for $waitingTimeShort ms for a new window")
                 assertUIObjectExists(
                     downloadSystemNotificationButton(action),
                     exists = false,
@@ -93,12 +102,13 @@ class NotificationRobot {
 
                 break
             } catch (e: AssertionError) {
-                Log.i(TAG, "clickDownloadNotificationControlButton: Catch block")
+                Log.i(TAG, "clickDownloadNotificationControlButton: AssertionError caught, executing fallback methods")
                 if (i == RETRY_COUNT) {
                     throw e
                 }
+                Log.i(TAG, "clickDownloadNotificationControlButton: Waiting for $waitingTimeShort ms for $packageName window to be updated")
                 mDevice.waitForWindowUpdate(packageName, waitingTimeShort)
-                Log.i(TAG, "clickDownloadNotificationControlButton: Waited $waitingTimeShort ms for window update")
+                Log.i(TAG, "clickDownloadNotificationControlButton: Waited for $waitingTimeShort ms for $packageName window to be updated")
             }
         }
     }
@@ -108,14 +118,16 @@ class NotificationRobot {
 
     fun expandNotificationMessage() {
         while (!notificationHeader.exists()) {
+            Log.i(TAG, "expandNotificationMessage: Waiting for $appName notification to exist")
             scrollToEnd()
-            Log.i(TAG, "expandNotificationMessage: Scrolled to end of notification tray")
         }
 
         if (notificationHeader.exists()) {
+            Log.i(TAG, "expandNotificationMessage: $appName notification exists")
             // expand the notification
+            Log.i(TAG, "expandNotificationMessage: Trying to click $appName notification")
             notificationHeader.click()
-            Log.i(TAG, "expandNotificationMessage: Clicked the app notification")
+            Log.i(TAG, "expandNotificationMessage: Clicked $appName notification")
 
             // double check if notification actions are viewable by checking for action existence; otherwise scroll again
             while (!mDevice.findObject(UiSelector().resourceId("android:id/action0")).exists() &&
@@ -123,7 +135,6 @@ class NotificationRobot {
             ) {
                 Log.i(TAG, "expandNotificationMessage: App notification action buttons do not exist")
                 scrollToEnd()
-                Log.i(TAG, "expandNotificationMessage: Scrolled to end of notification tray")
             }
         }
     }
@@ -136,41 +147,46 @@ class NotificationRobot {
     ) {
         // In case it fails, retry max 3x the swipe action on download system notifications
         for (i in 1..RETRY_COUNT) {
-            Log.i(TAG, "swipeDownloadNotification: For loop i = $i")
+            Log.i(TAG, "swipeDownloadNotification: Started try #$i")
             try {
-                Log.i(TAG, "swipeDownloadNotification: Try block")
                 var retries = 0
                 while (itemContainingText(appName).exists() && retries++ < 3) {
-                    Log.i(TAG, "swipeDownloadNotification: While loop retries = $retries")
                     // Swipe left the download system notification
                     if (direction == "Left") {
                         itemContainingText(appName)
                             .also {
+                                Log.i(TAG, "swipeDownloadNotification: Waiting for $waitingTime ms for $appName notification to exist")
                                 it.waitForExists(waitingTime)
+                                Log.i(TAG, "swipeDownloadNotification: Waited for $waitingTime ms for $appName notification to exist")
+                                Log.i(TAG, "swipeDownloadNotification: Trying to perform swipe left action on $appName notification")
                                 it.swipeLeft(3)
+                                Log.i(TAG, "swipeDownloadNotification: Performed swipe left action on $appName notification")
                             }
-                        Log.i(TAG, "swipeDownloadNotification: Swiped left download notification")
                     } else {
                         // Swipe right the download system notification
                         itemContainingText(appName)
                             .also {
+                                Log.i(TAG, "swipeDownloadNotification: Waiting for $waitingTime ms for $appName notification to exist")
                                 it.waitForExists(waitingTime)
+                                Log.i(TAG, "swipeDownloadNotification: Waited for $waitingTime ms for $appName notification to exist")
+                                Log.i(TAG, "swipeDownloadNotification: Trying to perform swipe right action on $appName notification")
                                 it.swipeRight(3)
+                                Log.i(TAG, "swipeDownloadNotification: Performed swipe right action on $appName notification")
                             }
-                        Log.i(TAG, "swipeDownloadNotification: Swiped right download notification")
                     }
                 }
                 // Not all download related system notifications can be dismissed
                 if (shouldDismissNotification) {
+                    Log.i(TAG, "swipeDownloadNotification: $appName notification can't be dismissed: $shouldDismissNotification")
                     assertUIObjectExists(itemContainingText(appName), exists = false)
                 } else {
+                    Log.i(TAG, "swipeDownloadNotification: $appName notification can be dismissed: $shouldDismissNotification")
                     assertUIObjectExists(itemContainingText(appName))
-                    Log.i(TAG, "swipeDownloadNotification: Verified that $appName notification exist")
                 }
 
                 break
             } catch (e: AssertionError) {
-                Log.i(TAG, "swipeDownloadNotification: Catch block")
+                Log.i(TAG, "swipeDownloadNotification: AssertionError caught, executing fallback methods")
                 if (i == RETRY_COUNT) {
                     throw e
                 } else {
@@ -179,11 +195,12 @@ class NotificationRobot {
                     }.openNotificationShade {
                         // The download complete system notification can't be expanded
                         if (canExpandNotification) {
+                            Log.i(TAG, "swipeDownloadNotification: $appName notification can be expanded: $canExpandNotification")
                             // In all cases the download system notification title will be the app name
                             verifySystemNotificationExists(appName)
-                            Log.i(TAG, "swipeDownloadNotification: Verified that $appName notification exist")
                             expandNotificationMessage()
                         } else {
+                            Log.i(TAG, "swipeDownloadNotification: $appName notification can't be expanded: $canExpandNotification")
                             // Using the download completed system notification summary to bring in to view an properly verify it
                             verifySystemNotificationExists("Download completed")
                         }
@@ -194,10 +211,12 @@ class NotificationRobot {
     }
 
     fun clickNotification(notificationMessage: String) {
-        Log.i(TAG, "clickNotification: Looking for $notificationMessage notification")
+        Log.i(TAG, "clickNotification: Waiting for $waitingTime ms for $notificationMessage notification to exist")
         mDevice.findObject(UiSelector().text(notificationMessage)).waitForExists(waitingTime)
+        Log.i(TAG, "clickNotification: Waited for $waitingTime ms for $notificationMessage notification to exist")
+        Log.i(TAG, "clickNotification: Trying to click the $notificationMessage notification and wait for $waitingTimeShort ms for a new window")
         mDevice.findObject(UiSelector().text(notificationMessage)).clickAndWaitForNewWindow(waitingTimeShort)
-        Log.i(TAG, "clickNotification: Clicked $notificationMessage notification and waiting for $waitingTimeShort ms for a new window")
+        Log.i(TAG, "clickNotification: Clicked the $notificationMessage notification and waited for $waitingTimeShort ms for a new window")
     }
 
     class Transition {
@@ -206,18 +225,22 @@ class NotificationRobot {
             try {
                 assertUIObjectExists(closePrivateTabsNotification())
             } catch (e: AssertionError) {
+                Log.i(TAG, "clickClosePrivateTabsNotification: Trying to perform fling action to the end of the notification tray")
                 notificationTray().flingToEnd(1)
+                Log.i(TAG, "clickClosePrivateTabsNotification: Performed fling action to the end of the notification tray")
             }
-
+            Log.i(TAG, "clickClosePrivateTabsNotification: Trying to click the close private tabs notification")
             closePrivateTabsNotification().click()
+            Log.i(TAG, "clickClosePrivateTabsNotification: Clicked the close private tabs notification")
 
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
         }
 
         fun closeNotificationTray(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "closeNotificationTray: Trying to click device back button")
             mDevice.pressBack()
-            Log.i(TAG, "closeNotificationTray: Closed notification tray using device back button")
+            Log.i(TAG, "closeNotificationTray: Clicked device back button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -259,7 +282,9 @@ private val notificationHeader =
     )
 
 private fun scrollToEnd() {
+    Log.i(TAG, "scrollToEnd: Trying to perform scroll to the end of the notification tray action")
     notificationTray().scrollToEnd(1)
+    Log.i(TAG, "scrollToEnd: Performed scroll to the end of the notification tray action")
 }
 
 private val clearButton = mDevice.findObject(UiSelector().resourceId("com.android.systemui:id/dismiss_text"))

From d14cbc72f6a87ae08443789ca70cc73a0238f3fb Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 13 Feb 2024 16:02:48 +0200
Subject: [PATCH 155/222] Bug 1880047 - Convert private variables to functions
 so they don't get initialised

---
 .../fenix/ui/robots/NotificationRobot.kt       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
index 5a6acc9cb..99cbbf9a6 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
@@ -39,17 +39,17 @@ class NotificationRobot {
     }
 
     fun clearNotifications() {
-        if (clearButton.exists()) {
+        if (clearButton().exists()) {
             Log.i(TAG, "clearNotifications:The clear notifications button exists")
             Log.i(TAG, "clearNotifications: Trying to click the clear notifications button")
-            clearButton.click()
+            clearButton().click()
             Log.i(TAG, "clearNotifications: Clicked the clear notifications button")
         } else {
             scrollToEnd()
-            if (clearButton.exists()) {
+            if (clearButton().exists()) {
                 Log.i(TAG, "clearNotifications:The clear notifications button exists")
                 Log.i(TAG, "clearNotifications: Trying to click the clear notifications button")
-                clearButton.click()
+                clearButton().click()
                 Log.i(TAG, "clearNotifications: Clicked the clear notifications button")
             } else if (notificationTray().exists()) {
                 Log.i(TAG, "clearNotifications: The notifications tray is still displayed")
@@ -117,16 +117,16 @@ class NotificationRobot {
         assertUIObjectExists(mediaSystemNotificationButton(action))
 
     fun expandNotificationMessage() {
-        while (!notificationHeader.exists()) {
+        while (!notificationHeader().exists()) {
             Log.i(TAG, "expandNotificationMessage: Waiting for $appName notification to exist")
             scrollToEnd()
         }
 
-        if (notificationHeader.exists()) {
+        if (notificationHeader().exists()) {
             Log.i(TAG, "expandNotificationMessage: $appName notification exists")
             // expand the notification
             Log.i(TAG, "expandNotificationMessage: Trying to click $appName notification")
-            notificationHeader.click()
+            notificationHeader().click()
             Log.i(TAG, "expandNotificationMessage: Clicked $appName notification")
 
             // double check if notification actions are viewable by checking for action existence; otherwise scroll again
@@ -274,7 +274,7 @@ private fun notificationTray() = UiScrollable(
     UiSelector().resourceId("com.android.systemui:id/notification_stack_scroller"),
 ).setAsVerticalList()
 
-private val notificationHeader =
+private fun notificationHeader() =
     mDevice.findObject(
         UiSelector()
             .resourceId("android:id/app_name_text")
@@ -287,7 +287,7 @@ private fun scrollToEnd() {
     Log.i(TAG, "scrollToEnd: Performed scroll to the end of the notification tray action")
 }
 
-private val clearButton = mDevice.findObject(UiSelector().resourceId("com.android.systemui:id/dismiss_text"))
+private fun clearButton() = mDevice.findObject(UiSelector().resourceId("com.android.systemui:id/dismiss_text"))
 
 private fun cancelAll() {
     val notificationManager: NotificationManager =

From 1ee892eb4cd2fa5400df97f27a30623a4b5e110f Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 13 Feb 2024 14:21:00 +0200
Subject: [PATCH 156/222] Bug 1880064 - Add logs to PwaRobot

---
 .../java/org/mozilla/fenix/ui/robots/PwaRobot.kt | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt
index f9e050526..0de5dc465 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt
@@ -4,24 +4,32 @@
 
 package org.mozilla.fenix.ui.robots
 
+import android.util.Log
 import androidx.test.uiautomator.UiSelector
 import org.junit.Assert.assertTrue
 import org.mozilla.fenix.helpers.AppAndSystemHelper.isExternalAppBrowserActivityInCurrentTask
+import org.mozilla.fenix.helpers.Constants
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
+import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.packageName
 
 class PwaRobot {
-    fun verifyCustomTabToolbarIsNotDisplayed() = assertUIObjectExists(customTabToolbar(), exists = false)
-    fun verifyPwaActivityInCurrentTask() = assertTrue(isExternalAppBrowserActivityInCurrentTask())
+    fun verifyCustomTabToolbarIsNotDisplayed() = assertUIObjectExists(itemWithResId("$packageName:id/toolbar"), exists = false)
+    fun verifyPwaActivityInCurrentTask() {
+        Log.i(TAG, "Trying to verify that the latest activity of the application is used for custom tabs or PWAs")
+        assertTrue(isExternalAppBrowserActivityInCurrentTask())
+        Log.i(TAG, "Verified that the latest activity of the application is used for custom tabs or PWAs")
+    }
 
     class Transition
 }
 
 fun pwaScreen(interact: PwaRobot.() -> Unit): PwaRobot.Transition {
+    Log.i(TAG, "pwaScreen: Trying to find the engine view")
     mDevice.findObject(UiSelector().resourceId("$packageName:id/engineView"))
+    Log.i(Constants.TAG, "pwaScreen: Found the engine view")
     PwaRobot().interact()
     return PwaRobot.Transition()
 }
-
-private fun customTabToolbar() = mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))

From 5c3e6298c2b7288e121fadc864386b809ff8055e Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 13 Feb 2024 14:30:48 +0200
Subject: [PATCH 157/222] Bug 1880064 - Remove redundant assertion functions
 from ReaderViewRobot

---
 .../fenix/ui/robots/ReaderViewRobot.kt        | 117 +++++++-----------
 1 file changed, 45 insertions(+), 72 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt
index 89bd934fb..910dd846e 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt
@@ -25,31 +25,67 @@ import org.mozilla.fenix.helpers.click
 class ReaderViewRobot {
 
     fun verifyAppearanceFontGroup(visible: Boolean = false): ViewInteraction =
-        assertAppearanceFontGroup(visible)
+        onView(
+            withId(R.id.mozac_feature_readerview_font_group),
+        ).check(
+            matches(withEffectiveVisibility(visibleOrGone(visible))),
+        )
 
     fun verifyAppearanceFontSansSerif(visible: Boolean = false): ViewInteraction =
-        assertAppearanceFontSansSerif(visible)
+        onView(
+            withId(R.id.mozac_feature_readerview_font_sans_serif),
+        ).check(
+            matches(withEffectiveVisibility(visibleOrGone(visible))),
+        )
 
     fun verifyAppearanceFontSerif(visible: Boolean = false): ViewInteraction =
-        assertAppearanceFontSerif(visible)
+        onView(
+            withId(R.id.mozac_feature_readerview_font_serif),
+        ).check(
+            matches(withEffectiveVisibility(visibleOrGone(visible))),
+        )
 
     fun verifyAppearanceFontDecrease(visible: Boolean = false): ViewInteraction =
-        assertAppearanceFontDecrease(visible)
+        onView(
+            withId(R.id.mozac_feature_readerview_font_size_decrease),
+        ).check(
+            matches(withEffectiveVisibility(visibleOrGone(visible))),
+        )
 
     fun verifyAppearanceFontIncrease(visible: Boolean = false): ViewInteraction =
-        assertAppearanceFontIncrease(visible)
+        onView(
+            withId(R.id.mozac_feature_readerview_font_size_increase),
+        ).check(
+            matches(withEffectiveVisibility(visibleOrGone(visible))),
+        )
 
     fun verifyAppearanceColorGroup(visible: Boolean = false): ViewInteraction =
-        assertAppearanceColorGroup(visible)
+        onView(
+            withId(R.id.mozac_feature_readerview_color_scheme_group),
+        ).check(
+            matches(withEffectiveVisibility(visibleOrGone(visible))),
+        )
 
     fun verifyAppearanceColorSepia(visible: Boolean = false): ViewInteraction =
-        assertAppearanceColorSepia(visible)
+        onView(
+            withId(R.id.mozac_feature_readerview_color_sepia),
+        ).check(
+            matches(withEffectiveVisibility(visibleOrGone(visible))),
+        )
 
     fun verifyAppearanceColorDark(visible: Boolean = false): ViewInteraction =
-        assertAppearanceColorDark(visible)
+        onView(
+            withId(R.id.mozac_feature_readerview_color_dark),
+        ).check(
+            matches(withEffectiveVisibility(visibleOrGone(visible))),
+        )
 
     fun verifyAppearanceColorLight(visible: Boolean = false): ViewInteraction =
-        assertAppearanceColorLight(visible)
+        onView(
+            withId(R.id.mozac_feature_readerview_color_light),
+        ).check(
+            matches(withEffectiveVisibility(visibleOrGone(visible))),
+        )
 
     fun verifyAppearanceFontIsActive(fontType: String) {
         val fontTypeKey: String = "mozac-readerview-fonttype"
@@ -189,68 +225,5 @@ fun readerViewRobot(interact: ReaderViewRobot.() -> Unit): ReaderViewRobot.Trans
     return ReaderViewRobot.Transition()
 }
 
-private fun assertAppearanceFontGroup(visible: Boolean) =
-    onView(
-        withId(R.id.mozac_feature_readerview_font_group),
-    ).check(
-        matches(withEffectiveVisibility(visibleOrGone(visible))),
-    )
-
-private fun assertAppearanceFontSansSerif(visible: Boolean) =
-    onView(
-        withId(R.id.mozac_feature_readerview_font_sans_serif),
-    ).check(
-        matches(withEffectiveVisibility(visibleOrGone(visible))),
-    )
-
-private fun assertAppearanceFontSerif(visible: Boolean) =
-    onView(
-        withId(R.id.mozac_feature_readerview_font_serif),
-    ).check(
-        matches(withEffectiveVisibility(visibleOrGone(visible))),
-    )
-
-private fun assertAppearanceFontDecrease(visible: Boolean) =
-    onView(
-        withId(R.id.mozac_feature_readerview_font_size_decrease),
-    ).check(
-        matches(withEffectiveVisibility(visibleOrGone(visible))),
-    )
-
-private fun assertAppearanceFontIncrease(visible: Boolean) =
-    onView(
-        withId(R.id.mozac_feature_readerview_font_size_increase),
-    ).check(
-        matches(withEffectiveVisibility(visibleOrGone(visible))),
-    )
-
-private fun assertAppearanceColorDark(visible: Boolean) =
-    onView(
-        withId(R.id.mozac_feature_readerview_color_dark),
-    ).check(
-        matches(withEffectiveVisibility(visibleOrGone(visible))),
-    )
-
-private fun assertAppearanceColorLight(visible: Boolean) =
-    onView(
-        withId(R.id.mozac_feature_readerview_color_light),
-    ).check(
-        matches(withEffectiveVisibility(visibleOrGone(visible))),
-    )
-
-private fun assertAppearanceColorSepia(visible: Boolean) =
-    onView(
-        withId(R.id.mozac_feature_readerview_color_sepia),
-    ).check(
-        matches(withEffectiveVisibility(visibleOrGone(visible))),
-    )
-
-private fun assertAppearanceColorGroup(visible: Boolean) =
-    onView(
-        withId(R.id.mozac_feature_readerview_color_scheme_group),
-    ).check(
-        matches(withEffectiveVisibility(visibleOrGone(visible))),
-    )
-
 private fun visibleOrGone(visibility: Boolean) =
     if (visibility) ViewMatchers.Visibility.VISIBLE else ViewMatchers.Visibility.GONE

From 3f55c9095a39fdfe9865abdf1a039ec58c51d3dd Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 13 Feb 2024 15:01:48 +0200
Subject: [PATCH 158/222] Bug 1880064 - Add logs to ReaderViewRobot

---
 .../fenix/helpers/AppAndSystemHelper.kt       |  1 +
 .../org/mozilla/fenix/ui/robots/PwaRobot.kt   |  4 +-
 .../fenix/ui/robots/ReaderViewRobot.kt        | 82 ++++++++++++++-----
 3 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt
index f9b95a2dc..e3c4e532f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt
@@ -226,6 +226,7 @@ object AppAndSystemHelper {
      * @return Boolean value that helps us know if the current activity supports custom tabs or PWAs.
      */
     fun isExternalAppBrowserActivityInCurrentTask(): Boolean {
+        Log.i(TAG, "Trying to verify that the latest activity of the application is used for custom tabs or PWAs")
         val activityManager = TestHelper.appContext.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
 
         mDevice.waitForIdle(TestAssetHelper.waitingTimeShort)
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt
index 0de5dc465..cd31c2fc8 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt
@@ -18,9 +18,7 @@ import org.mozilla.fenix.helpers.TestHelper.packageName
 class PwaRobot {
     fun verifyCustomTabToolbarIsNotDisplayed() = assertUIObjectExists(itemWithResId("$packageName:id/toolbar"), exists = false)
     fun verifyPwaActivityInCurrentTask() {
-        Log.i(TAG, "Trying to verify that the latest activity of the application is used for custom tabs or PWAs")
-        assertTrue(isExternalAppBrowserActivityInCurrentTask())
-        Log.i(TAG, "Verified that the latest activity of the application is used for custom tabs or PWAs")
+        assertTrue("$TAG: The latest activity of the application is not used for custom tabs or PWAs", isExternalAppBrowserActivityInCurrentTask())
     }
 
     class Transition
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt
index 910dd846e..30d87d72c 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt
@@ -7,8 +7,8 @@
 package org.mozilla.fenix.ui.robots
 
 import android.content.Context
+import android.util.Log
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
@@ -16,6 +16,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertEquals
 import org.mozilla.fenix.R
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.click
 
@@ -24,70 +25,98 @@ import org.mozilla.fenix.helpers.click
  */
 class ReaderViewRobot {
 
-    fun verifyAppearanceFontGroup(visible: Boolean = false): ViewInteraction =
+    fun verifyAppearanceFontGroup(visible: Boolean = false) {
+        Log.i(TAG, "verifyAppearanceFontGroup: Trying to verify that the font group buttons are visible: $visible")
         onView(
             withId(R.id.mozac_feature_readerview_font_group),
         ).check(
             matches(withEffectiveVisibility(visibleOrGone(visible))),
         )
+        Log.i(TAG, "verifyAppearanceFontGroup: Verified that the font group buttons are visible: $visible")
+    }
 
-    fun verifyAppearanceFontSansSerif(visible: Boolean = false): ViewInteraction =
+    fun verifyAppearanceFontSansSerif(visible: Boolean = false) {
+        Log.i(TAG, "verifyAppearanceFontSansSerif: Trying to verify that the sans serif font button is visible: $visible")
         onView(
             withId(R.id.mozac_feature_readerview_font_sans_serif),
         ).check(
             matches(withEffectiveVisibility(visibleOrGone(visible))),
         )
+        Log.i(TAG, "verifyAppearanceFontSansSerif: Verified that the sans serif font button is visible: $visible")
+    }
 
-    fun verifyAppearanceFontSerif(visible: Boolean = false): ViewInteraction =
+    fun verifyAppearanceFontSerif(visible: Boolean = false) {
+        Log.i(TAG, "verifyAppearanceFontSerif: Trying to verify that the serif font button is visible: $visible")
         onView(
             withId(R.id.mozac_feature_readerview_font_serif),
         ).check(
             matches(withEffectiveVisibility(visibleOrGone(visible))),
         )
+        Log.i(TAG, "verifyAppearanceFontSerif: Verified that the serif font button is visible: $visible")
+    }
 
-    fun verifyAppearanceFontDecrease(visible: Boolean = false): ViewInteraction =
+    fun verifyAppearanceFontDecrease(visible: Boolean = false) {
+        Log.i(TAG, "verifyAppearanceFontDecrease: Trying to verify that the decrease font button is visible: $visible")
         onView(
             withId(R.id.mozac_feature_readerview_font_size_decrease),
         ).check(
             matches(withEffectiveVisibility(visibleOrGone(visible))),
         )
+        Log.i(TAG, "verifyAppearanceFontDecrease: Verified that the decrease font button is visible: $visible")
+    }
 
-    fun verifyAppearanceFontIncrease(visible: Boolean = false): ViewInteraction =
+    fun verifyAppearanceFontIncrease(visible: Boolean = false) {
+        Log.i(TAG, "verifyAppearanceFontIncrease: Trying to verify that the increase font button is visible: $visible")
         onView(
             withId(R.id.mozac_feature_readerview_font_size_increase),
         ).check(
             matches(withEffectiveVisibility(visibleOrGone(visible))),
         )
+        Log.i(TAG, "verifyAppearanceFontIncrease: Verified that the increase font button is visible: $visible")
+    }
 
-    fun verifyAppearanceColorGroup(visible: Boolean = false): ViewInteraction =
+    fun verifyAppearanceColorGroup(visible: Boolean = false) {
+        Log.i(TAG, "verifyAppearanceColorGroup: Trying to verify that the color group buttons are visible: $visible")
         onView(
             withId(R.id.mozac_feature_readerview_color_scheme_group),
         ).check(
             matches(withEffectiveVisibility(visibleOrGone(visible))),
         )
+        Log.i(TAG, "verifyAppearanceColorGroup: Verified that the color group buttons are visible: $visible")
+    }
 
-    fun verifyAppearanceColorSepia(visible: Boolean = false): ViewInteraction =
+    fun verifyAppearanceColorSepia(visible: Boolean = false) {
+        Log.i(TAG, "verifyAppearanceColorSepia: Trying to verify that the sepia color button is visible: $visible")
         onView(
             withId(R.id.mozac_feature_readerview_color_sepia),
         ).check(
             matches(withEffectiveVisibility(visibleOrGone(visible))),
         )
+        Log.i(TAG, "verifyAppearanceColorSepia: Verified that the sepia color button is visible: $visible")
+    }
 
-    fun verifyAppearanceColorDark(visible: Boolean = false): ViewInteraction =
+    fun verifyAppearanceColorDark(visible: Boolean = false) {
+        Log.i(TAG, "verifyAppearanceColorDark: Trying to verify that the dark color button is visible: $visible")
         onView(
             withId(R.id.mozac_feature_readerview_color_dark),
         ).check(
             matches(withEffectiveVisibility(visibleOrGone(visible))),
         )
+        Log.i(TAG, "verifyAppearanceColorDark: Verified that the dark color button is visible: $visible")
+    }
 
-    fun verifyAppearanceColorLight(visible: Boolean = false): ViewInteraction =
+    fun verifyAppearanceColorLight(visible: Boolean = false) {
+        Log.i(TAG, "verifyAppearanceColorLight: Trying to verify that the light color button is visible: $visible")
         onView(
             withId(R.id.mozac_feature_readerview_color_light),
         ).check(
             matches(withEffectiveVisibility(visibleOrGone(visible))),
         )
+        Log.i(TAG, "verifyAppearanceColorLight: Verified that the light color button is visible: $visible")
+    }
 
     fun verifyAppearanceFontIsActive(fontType: String) {
+        Log.i(TAG, "verifyAppearanceFontIsActive: Trying to verify that the font type is: $fontType")
         val fontTypeKey: String = "mozac-readerview-fonttype"
 
         val prefs = InstrumentationRegistry.getInstrumentation()
@@ -97,9 +126,11 @@ class ReaderViewRobot {
             )
 
         assertEquals(fontType, prefs.getString(fontTypeKey, ""))
+        Log.i(TAG, "verifyAppearanceFontIsActive: Verified that the font type is: $fontType")
     }
 
     fun verifyAppearanceFontSize(expectedFontSize: Int) {
+        Log.i(TAG, "verifyAppearanceFontSize: Trying to verify that the font size is: $expectedFontSize")
         val fontSizeKey: String = "mozac-readerview-fontsize"
 
         val prefs = InstrumentationRegistry.getInstrumentation()
@@ -111,9 +142,11 @@ class ReaderViewRobot {
         val fontSizeKeyValue = prefs.getInt(fontSizeKey, 3)
 
         assertEquals(expectedFontSize, fontSizeKeyValue)
+        Log.i(TAG, "verifyAppearanceFontSize: Verified that the font size is: $expectedFontSize")
     }
 
     fun verifyAppearanceColorSchemeChange(expectedColorScheme: String) {
+        Log.i(TAG, "verifyAppearanceColorSchemeChange: Trying to verify that the color scheme is: $expectedColorScheme")
         val colorSchemeKey: String = "mozac-readerview-colorscheme"
 
         val prefs = InstrumentationRegistry.getInstrumentation()
@@ -123,12 +156,15 @@ class ReaderViewRobot {
             )
 
         assertEquals(expectedColorScheme, prefs.getString(colorSchemeKey, ""))
+        Log.i(TAG, "verifyAppearanceColorSchemeChange: Verified that the color scheme is: $expectedColorScheme")
     }
 
     class Transition {
 
         fun closeAppearanceMenu(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "closeAppearanceMenu: Trying to click device back button")
             mDevice.pressBack()
+            Log.i(TAG, "closeAppearanceMenu: Clicked device back button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -139,8 +175,9 @@ class ReaderViewRobot {
                 onView(
                     withId(R.id.mozac_feature_readerview_font_sans_serif),
                 )
-
+            Log.i(TAG, "toggleSansSerif: Trying to click sans serif button")
             sansSerifButton().click()
+            Log.i(TAG, "toggleSansSerif: Clicked sans serif button")
 
             ReaderViewRobot().interact()
             return Transition()
@@ -151,8 +188,9 @@ class ReaderViewRobot {
                 onView(
                     withId(R.id.mozac_feature_readerview_font_serif),
                 )
-
+            Log.i(TAG, "toggleSerif: Trying to click serif button")
             serifButton().click()
+            Log.i(TAG, "toggleSerif: Clicked serif button")
 
             ReaderViewRobot().interact()
             return Transition()
@@ -163,8 +201,9 @@ class ReaderViewRobot {
                 onView(
                     withId(R.id.mozac_feature_readerview_font_size_decrease),
                 )
-
+            Log.i(TAG, "toggleFontSizeDecrease: Trying to click the decrease font button")
             fontSizeDecrease().click()
+            Log.i(TAG, "toggleFontSizeDecrease: Clicked the decrease font button")
 
             ReaderViewRobot().interact()
             return Transition()
@@ -175,8 +214,9 @@ class ReaderViewRobot {
                 onView(
                     withId(R.id.mozac_feature_readerview_font_size_increase),
                 )
-
+            Log.i(TAG, "toggleFontSizeIncrease: Trying to click the increase font button")
             fontSizeIncrease().click()
+            Log.i(TAG, "toggleFontSizeIncrease: Clicked the increase font button")
 
             ReaderViewRobot().interact()
             return Transition()
@@ -187,8 +227,9 @@ class ReaderViewRobot {
                 onView(
                     withId(R.id.mozac_feature_readerview_color_light),
                 )
-
+            Log.i(TAG, "toggleColorSchemeChangeLight: Trying to click the light color button")
             toggleLightColorSchemeButton().click()
+            Log.i(TAG, "toggleColorSchemeChangeLight: Clicked the light color button")
 
             ReaderViewRobot().interact()
             return Transition()
@@ -199,8 +240,9 @@ class ReaderViewRobot {
                 onView(
                     withId(R.id.mozac_feature_readerview_color_dark),
                 )
-
+            Log.i(TAG, "toggleColorSchemeChangeDark: Trying to click the dark color button")
             toggleDarkColorSchemeButton().click()
+            Log.i(TAG, "toggleColorSchemeChangeDark: Clicked the dark color button")
 
             ReaderViewRobot().interact()
             return Transition()
@@ -211,8 +253,9 @@ class ReaderViewRobot {
                 onView(
                     withId(R.id.mozac_feature_readerview_color_sepia),
                 )
-
+            Log.i(TAG, "toggleColorSchemeChangeSepia: Trying to click the sepia color button")
             toggleSepiaColorSchemeButton().click()
+            Log.i(TAG, "toggleColorSchemeChangeSepia: Clicked the sepia color button")
 
             ReaderViewRobot().interact()
             return Transition()
@@ -220,10 +263,5 @@ class ReaderViewRobot {
     }
 }
 
-fun readerViewRobot(interact: ReaderViewRobot.() -> Unit): ReaderViewRobot.Transition {
-    ReaderViewRobot().interact()
-    return ReaderViewRobot.Transition()
-}
-
 private fun visibleOrGone(visibility: Boolean) =
     if (visibility) ViewMatchers.Visibility.VISIBLE else ViewMatchers.Visibility.GONE

From 40c37e67efd4bb5a8e5522f0bfd25b9dcb8b3075 Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Thu, 27 Jul 2023 13:30:14 +0300
Subject: [PATCH 159/222] Bug 1850316 - Remove navigation library duplication
 from FenixDependencies.

---
 app/build.gradle                                              | 4 ++--
 build.gradle                                                  | 2 +-
 .../src/main/java/FenixDependenciesPlugin.kt                  | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bacca9711..4a689a89a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -640,8 +640,8 @@ dependencies {
     implementation ComponentsDependencies.androidx_paging
     implementation ComponentsDependencies.androidx_preferences
     implementation ComponentsDependencies.androidx_fragment
-    implementation FenixDependencies.androidx_navigation_fragment
-    implementation FenixDependencies.androidx_navigation_ui
+    implementation ComponentsDependencies.androidx_navigation_fragment
+    implementation ComponentsDependencies.androidx_navigation_ui
     implementation ComponentsDependencies.androidx_compose_navigation
     implementation ComponentsDependencies.androidx_recyclerview
 
diff --git a/build.gradle b/build.gradle
index cb9ff542e..bd002d017 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,7 +78,7 @@ buildscript {
         classpath ComponentsDependencies.tools_androidgradle
         classpath ComponentsDependencies.tools_kotlingradle
         classpath FenixDependencies.tools_benchmarkgradle
-        classpath FenixDependencies.androidx_safeargs
+        classpath ComponentsDependencies.androidx_safeargs
         classpath FenixDependencies.osslicenses_plugin
         classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
         classpath "${ApplicationServicesConfig.groupId}:tooling-nimbus-gradle:${ApplicationServicesConfig.version}"
diff --git a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
index efc00ff77..a8657de94 100644
--- a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+++ b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
@@ -22,6 +22,7 @@ object FenixVersions {
     const val androidx_benchmark = "1.2.2"
     const val androidx_profileinstaller = "1.3.1"
     const val androidx_legacy = "1.0.0"
+    const val androidx_lifecycle = "2.6.1"
     const val androidx_navigation = "2.5.3"
     const val androidx_splash_screen = "1.0.1"
     const val androidx_transition = "1.4.1"
@@ -55,6 +56,7 @@ object FenixDependencies {
     const val androidx_profileinstaller = "androidx.profileinstaller:profileinstaller:${FenixVersions.androidx_profileinstaller}"
     const val androidx_activity_ktx = "androidx.activity:activity-ktx:${FenixVersions.androidx_activity}"
     const val androidx_legacy = "androidx.legacy:legacy-support-v4:${FenixVersions.androidx_legacy}"
+    const val androidx_lifecycle_common = "androidx.lifecycle:lifecycle-common:${FenixVersions.androidx_lifecycle}"
     const val androidx_safeargs = "androidx.navigation:navigation-safe-args-gradle-plugin:${FenixVersions.androidx_navigation}"
     const val androidx_navigation_fragment = "androidx.navigation:navigation-fragment-ktx:${FenixVersions.androidx_navigation}"
     const val androidx_navigation_ui = "androidx.navigation:navigation-ui:${FenixVersions.androidx_navigation}"

From 764786b0158d6ec9155fe9af916e6294391063e4 Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Thu, 27 Jul 2023 15:01:57 +0300
Subject: [PATCH 160/222] Bug 1850316 - Use alternative ways to get backQueue
 elements.

backQueue is now private in NavController.
---
 app/src/main/java/org/mozilla/fenix/ext/NavController.kt  | 2 +-
 .../java/org/mozilla/fenix/search/SearchDialogFragment.kt | 2 +-
 .../org/mozilla/fenix/search/SearchDialogFragmentTest.kt  | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/ext/NavController.kt b/app/src/main/java/org/mozilla/fenix/ext/NavController.kt
index 07e9713b9..e768d72f2 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/NavController.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/NavController.kt
@@ -68,7 +68,7 @@ fun NavController.navigateWithBreadcrumb(
  */
 @SuppressLint("RestrictedApi")
 fun NavController.hasTopDestination(fragmentClassName: String): Boolean {
-    return this.backQueue.lastOrNull()?.destination?.displayName?.contains(
+    return this.currentBackStackEntry?.destination?.displayName?.contains(
         fragmentClassName,
         true,
     ) == true
diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
index f6fd7de78..c41d5ea4c 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
@@ -959,7 +959,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
     internal fun getPreviousDestination(): NavBackStackEntry? {
         // This duplicates the platform functionality for "previousBackStackEntry" but additionally skips this entry.
 
-        val descendingEntries = findNavController().backQueue.reversed().iterator()
+        val descendingEntries = findNavController().currentBackStack.value.reversed().iterator()
         // Throw the topmost destination away.
         if (descendingEntries.hasNext()) {
             descendingEntries.next()
diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt
index c7aa3e72b..ff71df0ff 100644
--- a/app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt
@@ -50,14 +50,14 @@ internal class SearchDialogFragmentTest {
 
     @Test
     fun `GIVEN this is the only visible fragment WHEN asking for the previous destination THEN return null`() {
-        every { navController.backQueue } returns ArrayDeque(listOf(getDestination(fragmentName)))
+        every { navController.currentBackStack.value } returns ArrayDeque(listOf(getDestination(fragmentName)))
 
         assertNull(fragment.getPreviousDestination())
     }
 
     @Test
     fun `GIVEN this and FragmentB on top of this are visible WHEN asking for the previous destination THEN return null`() {
-        every { navController.backQueue } returns ArrayDeque(
+        every { navController.currentBackStack.value } returns ArrayDeque(
             listOf(
                 getDestination(fragmentName),
                 getDestination("FragmentB"),
@@ -70,7 +70,7 @@ internal class SearchDialogFragmentTest {
     @Test
     fun `GIVEN FragmentA, this and FragmentB are visible WHEN asking for the previous destination THEN return FragmentA`() {
         val fragmentADestination = getDestination("FragmentA")
-        every { navController.backQueue } returns ArrayDeque(
+        every { navController.currentBackStack.value } returns ArrayDeque(
             listOf(
                 fragmentADestination,
                 getDestination(fragmentName),
@@ -84,7 +84,7 @@ internal class SearchDialogFragmentTest {
     @Test
     fun `GIVEN FragmentA and this on top of it are visible WHEN asking for the previous destination THEN return FragmentA`() {
         val fragmentADestination = getDestination("FragmentA")
-        every { navController.backQueue } returns ArrayDeque(
+        every { navController.currentBackStack.value } returns ArrayDeque(
             listOf(
                 fragmentADestination,
                 getDestination(fragmentName),

From a7c42269cd698bb2063abe853ac545653ee0cef9 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Mon, 12 Feb 2024 09:59:46 -0500
Subject: [PATCH 161/222] Bug 1851947 - Update Google Accompanist to version
 0.32.0

---
 .../fenixdependencies/src/main/java/FenixDependenciesPlugin.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
index a8657de94..6cce2f427 100644
--- a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+++ b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
@@ -27,7 +27,7 @@ object FenixVersions {
     const val androidx_splash_screen = "1.0.1"
     const val androidx_transition = "1.4.1"
     const val androidx_datastore = "1.0.0"
-    const val google_accompanist = "0.30.1"
+    const val google_accompanist = "0.32.0"
 
     const val adjust = "4.35.1"
     const val installreferrer = "2.2"

From ff6e0c2cd8eba0e71227151247b6c4cfcd09a65b Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Tue, 13 Feb 2024 14:21:40 -0500
Subject: [PATCH 162/222] Bug 1880150 - Do not wait for attribution before
 dismissing splash screen

---
 app/src/main/java/org/mozilla/fenix/HomeActivity.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 659c832c5..eb59219be 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -447,8 +447,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
             var maxDurationReached = false
             val delay = FxNimbus.features.splashScreen.value().maximumDurationMs.toLong()
             splashScreen.setKeepOnScreenCondition {
-                val dataFetched = components.settings.utmParamsKnown &&
-                    components.settings.nimbusExperimentsFetched
+                val dataFetched = components.settings.nimbusExperimentsFetched
+
                 val keepOnScreen = !maxDurationReached && !dataFetched
                 if (!keepOnScreen) {
                     SplashScreen.firstLaunchExtended.record(

From 9c7b08282944287dc9ade01ca0e4be2770cd35bd Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Wed, 14 Feb 2024 00:03:31 +0000
Subject: [PATCH 163/222] Import translations from android-l10n

---
 app/src/main/res/values-azb/strings.xml    |  50 +++++++++
 app/src/main/res/values-be/strings.xml     | 112 +++++++++++++--------
 app/src/main/res/values-cak/strings.xml    | 108 ++++++++++++--------
 app/src/main/res/values-es-rCL/strings.xml |   3 +
 app/src/main/res/values-it/strings.xml     |  12 +--
 5 files changed, 197 insertions(+), 88 deletions(-)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index 796ef13cf..06f3ceead 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -652,9 +652,40 @@
     a section where users see a list of tabs that they have visited in the past few days -->
     <string name="customize_toggle_recently_visited">سون باخیلان‌لار</string>
 
+    <!-- Title for the customize home screen section with Pocket. -->
+    <string name="customize_toggle_pocket_2">دوشوندوروجو ناغیل‌لار</string>
+    <!-- Summary for the customize home screen section with Pocket. The first parameter is product name Pocket -->
+    <string name="customize_toggle_pocket_summary">%sطرفیندن گوج آلینان مقاله‌لر</string>
+    <!-- Title for the customize home screen section with sponsored Pocket stories. -->
+    <string name="customize_toggle_pocket_sponsored">اسپانسرلی ناغیل‌لار</string>
+
+    <!-- Title for the opening wallpaper settings screen -->
+    <string name="customize_wallpapers">دال پرده‌لر</string>
+
+    <!-- Wallpapers -->
+    <!-- Content description for various wallpapers. The first parameter is the name of the wallpaper -->
+    <string name="wallpapers_item_name_content_description">دال پرده: %1$s</string>
+    <!-- Snackbar message for when wallpaper is selected -->
+    <string name="wallpaper_updated_snackbar_message">دال پرده گونجللندی!</string>
+    <!-- Snackbar label for action to view selected wallpaper -->
+    <string name="wallpaper_updated_snackbar_action">گؤستر</string>
+    <!-- Snackbar message for when wallpaper couldn't be downloaded -->
+    <string name="wallpaper_download_error_snackbar_message">دال پرده یئندیریلنمه‌دی</string>
+    <!-- Snackbar label for action to retry downloading the wallpaper -->
+    <string name="wallpaper_download_error_snackbar_action">گئنه چالیش</string>
+    <!-- Snackbar message for when wallpaper couldn't be selected because of the disk error -->
+    <string name="wallpaper_select_error_snackbar_message">دال پرده دگیشیله بیلمه‌دی</string>
     <!-- Text displayed that links to website containing documentation about the "Limited Edition" wallpapers. -->
     <string name="wallpaper_learn_more">آرتیق بیلین</string>
 
+    <!-- Text for classic wallpapers title. The first parameter is the Firefox name. -->
+    <string name="wallpaper_classic_title">کلاسیک %s</string>
+
+    <!-- Text for artist series wallpapers title. "Artist series" represents a collection of artist collaborated wallpapers. -->
+    <string name="wallpaper_artist_series_title">هونرمند سئری‌سی</string>
+    <!-- Description text for the artist series wallpapers with learn more link. The first parameter is the learn more string defined in wallpaper_learn_more. "Independent voices" is the name of the wallpaper collection -->
+    <string name="wallpaper_artist_series_description_with_learn_more">باغیْمسیز سس‌لر مجموعه‌سی. %s</string>
+
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">ایندی دؤنگل‌لندیر</string>
     <!-- Preference for syncing history -->
@@ -662,6 +693,8 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">بوُکمارک‌لار</string>
 
+    <!-- Preference for syncing logins -->
+    <string name="preferences_sync_logins">گیریش‌لر</string>
     <!-- Preference for syncing passwords -->
     <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">رمز‌لر</string>
     <!-- Preference for syncing tabs -->
@@ -669,6 +702,23 @@
     <!-- Preference for signing out -->
     <string name="preferences_sign_out">چیخیش</string>
 
+    <!-- Preference displays and allows changing current FxA device name -->
+    <string name="preferences_sync_device_name">جهاز آدی</string>
+    <!-- Text shown when user enters empty device name -->
+    <string name="empty_device_name_error">جهاز آدیْ بوْش اوْلمالیدیر</string>
+    <!-- Label indicating that sync is in progress -->
+    <string name="sync_syncing_in_progress">دؤنگل‌لنیر...</string>
+    <!-- Label summary indicating that sync failed. The first parameter is the date stamp showing last time it succeeded -->
+    <string name="sync_failed_summary">دؤنگل خطا وئردی. سوْن باشاریْ: %s</string>
+
+    <!-- Label summary showing never synced -->
+    <string name="sync_failed_never_synced_summary">دؤنگل خطا وئردی. سوْن دؤنگل: یوْخدور</string>
+    <!-- Label summary the date we last synced. The first parameter is date stamp showing last time synced -->
+    <string name="sync_last_synced_summary">سوْن دؤنگل: %s</string>
+
+    <!-- Label summary showing never synced -->
+    <string name="sync_never_synced_summary">سوْن دؤنگل: هئچ</string>
+
     <!-- Toolbar Preferences -->
     <!-- Preference for using top toolbar -->
     <string name="preference_top_toolbar">اوست</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 4351428f7..d0e080a57 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -242,6 +242,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Уладкаваць хатнюю старонку</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Хатні экран</string>
@@ -249,6 +250,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Сцерці гісторыю аглядання</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Перакласці старонку</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Абраная мова</string>
@@ -260,8 +264,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Сканаваць</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Пашукавік</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Налады пошукавых сістэм</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -316,23 +318,28 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Апавяшчэнні дапамогуць вам зрабіць больш з %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Апавяшчэнні дапамогуць вам зрабіць больш з %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Сінхранізуйце свае карткі паміж прыладамі, кіруйце сцягваннямі, атрымлівайце парады, як максімальна выкарыстоўваць ахову прыватнасці %s, і многае іншае.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Сінхранізуйце свае карткі паміж прыладамі, кіруйце сцягваннямі, атрымлівайце парады, як максімальна выкарыстоўваць ахову прыватнасці %s, і многае іншае.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Працягнуць</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Працягнуць</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Не зараз</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Не зараз</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Паведамленне аб прыватнасці Firefox</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Нам падабаецца забяспечваць вашу бяспеку</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Наш браўзер, падтрыманы некамерцыйнай арганізацыяй, дапамагае абмяжоўваць кампаніі ад сачэння за вамі ў Інтэрнэце.\n\nДаведайцеся больш у нашым паведамленні аб прыватнасці.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_3">Наш браўзер, падтрыманы некамерцыйнай арганізацыяй, дапамагае не даваць кампаніям таемна сачыць за вамі ў сеціве.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Наш браўзер, падтрыманы некамерцыйнай арганізацыяй, дапамагае абмяжоўваць кампаніі ад сачэння за вамі ў Інтэрнэце.\n\nДаведайцеся больш у нашым паведамленні аб прыватнасці.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">паведамленні аб прыватнасці</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">паведамленні аб прыватнасці</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Зрабіць прадвызначаным браўзерам</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -435,21 +442,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Рэжым «Толькі HTTPS»</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Памяншэнне колькасці банераў кукі</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Блакіроўшчык банераў кукі</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Блакіроўшчык банераў кукі ў прыватным праглядзе</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Памяншаць колькасць банераў кукі</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Выключана</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Уключана</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s аўтаматычна спрабуе адхіліць запыты файлаў кукі на банерах кукі.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Выключана для гэтага сайта</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -468,36 +465,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Сайт зараз не падтрымліваецца</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Уключыць памяншэнне колькасці банераў кукі для %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Уключыць блакіроўшчык банераў кукі для %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Выключыць памяншэнне колькасці банераў кукі для %1$s?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Выключыць блакіроўшчык банераў кукі для %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s не можа аўтаматычна адхіляць запыты кукаў на гэтым сайце. Вы можаце адправіць запыт на падтрымку гэтага сайта ў будучыні.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s выдаліць файлы кукі гэтага сайта і абновіць старонку. Выдаленне ўсіх файлаў кукі можа прывесці да выхаду з сістэмы або ачышчэння кошыка для пакупак.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Выключыць, і %1$s выдаліць файлы кукі і перазагрузіць гэты сайт.  Гэта можа прывесці да выхаду з уліковага запісу або ачышчэння кошыка.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s спрабуе аўтаматычна адхіляць усе запыты файлаў кукі на сайтах, якія падтрымліваюцца.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Уключыце, і %1$s паспрабуе аўтаматычна адхіляць банеры кукі на гэтым сайце.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Дазволіць %1$s адхіляць банеры кукі?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s можа аўтаматычна адхіляць многія запыты банераў кукі.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Не зараз</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Вы ўбачыце менш запытаў пра кукі</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Дазволіць</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s толькі што адмовіўся ад кукі для вас</string>
@@ -716,6 +694,8 @@
     <string name="preferences_sync_bookmarks">Закладкі</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Лагіны</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Паролі</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Адкрытыя карткі</string>
     <!-- Preference for signing out -->
@@ -742,6 +722,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Крэдытныя карты</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Спосабы аплаты</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Адрасы</string>
 
@@ -1285,8 +1267,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Адхіліць</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Немагчыма надрукаваць</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Немагчыма надрукаваць гэту старонку</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Друкаваць</string>
@@ -1699,8 +1679,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Лагіны і паролі</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Паролі</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Захаванне лагінаў і пароляў</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Захоўваць паролі</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Пытаць пра захаванне</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1717,12 +1701,17 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Дадаць лагін</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Дадаць пароль</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Сінхранізацыя лагінаў</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Сінхранізаваць лагіны паміж прыладамі</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Захаваныя лагіны</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Захаваныя паролі</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Лагіны, якія вы захаваеце альбо сінхранізуеце праз %s, з’явяцца тут.</string>
     <!-- Preference to access list of saved logins -->
@@ -1738,6 +1727,8 @@
     <string name="preferences_passwords_exceptions_remove_all">Выдаліць усе выключэнні</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Шукаць лагіны</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Пошук пароляў</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Сайт</string>
     <!-- The header for the username for a login -->
@@ -1767,9 +1758,13 @@
     <string name="saved_login_hide_password">Схаваць пароль</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Разблакуйце, каб пабачыць захаваныя лагіны</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Разблакуйце, каб пабачыць захаваныя паролі</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Абараніце свае лагіны і паролі</string>
 
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Абараніце захаваныя паролі</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Наладзьце графічны ключ, пін ці пароль для блакавання прылады, каб абараніць захаваныя лагіны і паролі ад крадзяжу, калі Вашай прыладай завалодае хтосьці іншы.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1798,8 +1793,12 @@
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Крэдытныя карты</string>
 
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Спосабы аплаты</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Захоўваць і аўтаматычна запаўняць карты</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Захоўваць і запаўняць спосабы аплаты</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Дадзеныя зашыфраваны</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
@@ -1808,9 +1807,13 @@
     <string name="preferences_credit_cards_sync_cards">Сінхранізаваць карты</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Дадаць крэдытную карту</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Дадаць карту</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Кіраванне захаванымі картамі</string>
 
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Кіраваць картамі</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Дадаць адрас</string>
     <!-- Preference option for managing saved addresses -->
@@ -1818,6 +1821,8 @@
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Захоўваць і аўтаматычна запаўняць адрасы</string>
 
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Захоўваць і запаўняць адрасы</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Уключаць звесткі, такія як нумары, адрасы электроннай пошты і дастаўкі</string>
 
@@ -1842,6 +1847,8 @@
     <string name="credit_cards_delete_card_button">Выдаліць карту</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Вы ўпэўнены, што жадаеце выдаліць гэту крэдытную карту?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Выдаліць карту?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Выдаліць</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1856,12 +1863,18 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Калі ласка, увядзіце сапраўдны нумар крэдытнай карты</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Увядзіце сапраўдны нумар карты</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Калі ласка, запоўніце гэтае поле</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Дадайце імя</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Разблакуйце, каб пабачыць захаваныя карты</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Абараніце свае крэдытныя карты</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Абараніце захаваныя спосабы аплаты</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Наладзьце графічны ключ, пін або пароль для блакавання прылады, каб абараніць захаваныя крэдытныя карты, калі хтось іншы атрымае доступ да вашай прылады.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1911,6 +1924,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Вы ўпэўнены, што жадаеце выдаліць гэты адрас?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Выдаліць гэты адрас?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Выдаліць</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2029,16 +2044,26 @@
     <string name="saved_login_password_description">Тэкставае поле для рэдагавання пароля для ўваходу ў сістэму.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Захаваць змены ва ўваходных даных.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Захаваць змены.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Рэдагаванне</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Дадаць новы лагін</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Дадаць пароль</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Патрабуецца пароль</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Увядзіце пароль</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Патрабуецца імя карыстальніка</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Увядзіце імя карыстальніка</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Патрабуецца імя хоста</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Увядзіце вэб-адрас</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Галасавы пошук</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2136,6 +2161,9 @@
     <string name="other_default_search_engine_suggestion_header">Пошук %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Змяніць прадвызначаны браўзер</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Наладзьце аўтаматычнае адкрыццё спасылак з сайтаў, пошты і паведамленняў у Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2187,6 +2215,8 @@
     <string name="review_quality_check_adjusted_rating_title">Скарэктаваны рэйтынг</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Ненадзейныя водгукі выдалены</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description_2">На аснове надзейных водгукаў</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Асноўныя моманты з апошніх водгукаў</string>
     <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
@@ -2207,8 +2237,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Асноўныя моманты</b> з водгукаў пра %s за апошнія 80 дзён, якія мы лічым надзейнымі.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Даведайцеся больш пра %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">як %s ад Mozilla вызначае якасць водгукаў</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">як %s вызначае якасць водгукаў</string>
     <!-- Text for title of settings section. -->
diff --git a/app/src/main/res/values-cak/strings.xml b/app/src/main/res/values-cak/strings.xml
index 7b77ffa09..338cfa7d8 100644
--- a/app/src/main/res/values-cak/strings.xml
+++ b/app/src/main/res/values-cak/strings.xml
@@ -248,6 +248,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Tawichinaj ri ruxaq atikirib\'al</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Rutikirib\'al ruwäch</string>
@@ -255,6 +256,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Tiyuj runatab\'al okem pa k\'amaya\'l</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Titzalq\'omïx ruxaq</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Xcha\' ch\'ab\'äl</string>
@@ -266,8 +270,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Tiwachib\'ëx</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Kanob\'äl</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Runuk\'ulem kanob\'äl</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -322,23 +324,26 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Ri taq rutzijol yatkito\' richin nasamajij  ch\'aqa\' chik pa %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Ri taq rutzijol yatkito\' richin nasamajij  ch\'aqa\' chik pa %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Ke\'axima\' ri taq ruwi\' chi kikojol ri taq okisaxel, ke\'anuk\'samajij taq qasanïk, ke\'ak\'ulu\' taq na\'oj chi rij rub\'eyal nawïl ri rutzil ruchajixik richinanem %s chuqa\' ch\'aqa\' chik.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Ke\'axima\' ri taq ruwi\' chi kikojol ri taq okisaxel, ke\'anuk\'samajij taq qasanïk, ke\'ak\'ulu\' taq na\'oj chi rij rub\'eyal nawïl ri rutzil ruchajixik richinanem %s chuqa\' ch\'aqa\' chik.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Titikïr chik el</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Titikïr chik el</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Wakami mani</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Wakami mani</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Firefox ichinan rutzijol</string>
+    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Niqa chi qawäch chi atqajikib\'an</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">Ri qokik\'amaya\'l majun ch\'akoj rojqan, yatruto\' chi ri ajk\'ayij taq moloj yatkitzeqelb\'ej pa ewan pa ajk\'amaya\'l.\n\nCh\'aqa\' chik taq na\'oj pa ri rutzijol ichinanem.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Ri qokik\'amaya\'l majun ch\'akoj rojqan, yatruto\' chi ri ajk\'ayij taq moloj yatkitzeqelb\'ej pa ewan pa ajk\'amaya\'l.\n\nCh\'aqa\' chik taq na\'oj pa ri rutzijol ichinanem.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">ichinan na\'oj</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">ichinan na\'oj</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Tiya\' kan achi\'el kanob\'äl k\'o wi</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -435,20 +440,10 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">HTTPS-Only B\'anikil</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Kech\'utinirisäx kitzijol kuki</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Kiq\'atöy kitzijol cookie</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Ruq\'atöy kitzijol taq cookie pan ichinan okem</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Kech\'utinär ri taq kib\'aner koki</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Tichup</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Titzij</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s nutojtob\'ej yeruxutuj ruyonil ri kik\'utuxik kuki pa ri taq kinimawuj kuki.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Chupül pa re ruxaq re\'</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -467,32 +462,13 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Wakami man koch\'el ta re ruxaq re\'</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">¿La nitzij ri kich\'utinisaxik rutzijol kuki richin %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">¿La nitzij ri kiq\'atik taq kitzijol cookie richin %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">¿La nichup ri kich\'utinisaxik rutzijol kuki richin %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">¿La nichup ri ruq\'atoj kitzijol taq cookie richin %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2"> Man yeruq\'ät ta ri %1$s pa ruyonil ri taq kik\'utuj taq cookie pa re ruxaq re\'. Yatikïr natäq un k\'utuj richin nito\' re ruxaq re\' ri chwa\'q kab\'ij.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s xkeruyüj ri taq rukuki re ruxaq chuqa\' xtuk\'ëx re ruxaq. Xkeruyüj ronojel ri taq kuki, nitikïr nutz\'apij ri molojri\'ïl o yerujäm ri taq ruch\'ich\' loq\'oj.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s nitikïr nutojtob\'ej yeruxutuj pa ruyonil ronojel ri kik\'utuxik taq kuki pa koch\'el taq ruxaq.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Toq nitzij, ri %1$s xtutojtob\'ej xkeruxutuj pa ruyonil ri taq kitzijol taq cookie pa re ruxaq re\'.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">¿La niya\' q\'ij chi %1$s yeruxutuj ri kik\'utuxik taq kuki? </string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s nitikïr yeruxutuj pa ruyonil k\'ïy kik\'utuxik taq kuki.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Wakami mani</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Xtatz\'ët jub\'a kik\'utuxik kuki</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Tiya\' q\'ij</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s k\'a b\'a\' keruxutuj taq cookie</string>
@@ -702,6 +678,8 @@
     <string name="preferences_sync_bookmarks">Taq yaketal</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Ketikirisäx molojri\'ïl</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Ewan taq tzij</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Kejaq ruwi\'</string>
     <!-- Preference for signing out -->
@@ -729,6 +707,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Rutarjeta\' kre\'ito\'</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Rub\'eyal tojïk</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Taq ochochib\'äl</string>
 
@@ -1269,8 +1249,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Tewäx</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Man tikirel ta xtz\'ajb\'äx</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Man tikirel ta nitz\'ajb\'äx re ruxaq re\'</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Titz\'ajb\'äx</string>
@@ -1316,6 +1294,10 @@
     <!-- Notifications -->
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">Ketz\'apïx ichinan taq ruwi\'</string>
+
+    <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
+    <string name="notification_erase_title_android_14">La yetz\'apïx ichinan taq ruwi\'?</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">Markentin</string>
 
@@ -1658,8 +1640,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Kitikirisaxik molojri\'ïl chuqa\' ewan taq tzij</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Ewan taq tzij</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Keyak kitikirisaxik molojri\'ïl chuqa\' ewan taq tzij</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Keyak ewan taq tzij</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Tik\'utüx chi niyak</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1672,16 +1658,25 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Tatz\'aqatisaj rutikirib\'al molojri\'ïl</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Titz\'aqatisäx ewan tzij</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sync tikirisanïk molojri\'ïl</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Kexim ewan taq tzij</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sync rutikirib\'al molojri\'ïl rik\'in okisaxel</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Xeyak kitikirisaxik mojojri\'ïl</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Xeyak ewan taq tzij</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Wawe\' xkeq\'alajin ri taq tikirisanïk molojri\'ïl xke\'ayäk o xke\'axïm rik\'in %s.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Tawetamaj ch\'aqa\' chik chi rij ri Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Tawetamaj ch\'aqa\' chik chi rij ri sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Taq man relik ta</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
@@ -1692,6 +1687,8 @@
     <string name="preferences_passwords_exceptions_remove_all">Tiyuj ronojel man relik ta</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Kekanöx tikirib\'äl taq molojri\'ïl</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Kekanöx ewan taq tzij</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Ruxaq k\'amaya\'l</string>
     <!-- The header for the username for a login -->
@@ -1721,10 +1718,14 @@
     <string name="saved_login_hide_password">Tewäx ewan tzij</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Man tiq\'at chik richin ye\'atz\'ët ri tikirib\'äl amolojri\'ïl e\'ayakon</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Man tiq\'at chik richin ye\'atz\'ët ri ewan taq tzij e\'ayakon</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Ke\'ajikib\'a\' kitikirisaxik amolojri\'ïl chuqa\' ewan taq atzij</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Tab\'ana\' runuk\'ulem jun retal ruq\'atoj okisab\'äl, jun PIN o jun ewan tzij richin nachajij ri kitikirib\'al amolojri\'ïl chuqa\' ewan taq atzij e\'ayakon we xa ta k\'o xtichapo ri awokisab\'al.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Tab\'ana\' runuk\'ulem jun retal ruq\'atoj okisab\'äl, jun PIN o jun ewan tzij richin nachajij ri ewan taq atzij e\'ayakon we xa ta k\'o xtichapo ri awokisab\'al.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Jub\'a\' chik na</string>
 
@@ -1753,6 +1754,8 @@
     <string name="preferences_addresses">Taq ochochib\'äl</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Rutarjeta\' kre\'ito\'</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Rub\'eyal tojïk</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Keyak chuqa\' ruyon kenojisäx ri tarjeta\'</string>
 
@@ -1765,9 +1768,13 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Titz\'aqatisäx rutarjeta\' kre\'ito\'</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Titz\'aqatisäx tarjeta\'</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Kenuk\'samajïx yakon taq tarjeta\'</string>
 
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Kenuk\'samajïx taq tarjeta\'</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Titz\'aqatisäx ochochib\'äl</string>
     <!-- Preference option for managing saved addresses -->
@@ -1775,6 +1782,9 @@
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Keyak chuqa\' ruyon kenojisäx ri ochochib\'äl</string>
 
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Keyak chuqa\' kenojisäx ri ochochib\'äl</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Titz\'aqatisäx tarjeta\'</string>
     <!-- Title of the "Edit card" screen -->
@@ -1795,6 +1805,8 @@
     <string name="credit_cards_menu_delete_card">Tiyuj tarjeta\'</string>
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Tiyuj tarjeta\'</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">La niyuj tarjeta\'?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Tiyuj</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1811,6 +1823,8 @@
 
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Tanojisaj re k\'ojlem re\'</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Titz\'aqatisäx jun b\'i\'aj</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Man tiq\'at chik richin ye\'atz\'ët ri tarjeta\' e\'ayakon</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1959,16 +1973,28 @@ Achi\'el: \nhttps://www.google.com/search?q=%s</string>
     <string name="saved_login_username_description">Ruk\'ojlem nuk\'el rutz\'ib\'axik rub\'i\' winäq pa ri rutikirib\'al molojri\'ïl.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Ruk\'ojlem nuk\'el rutz\'ib\'axik ewan tzij pa ri rutikirib\'al molojri\'ïl.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Ruk\'ojlem nuk\'el rutz\'ib\'axik ewan tzij.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Keyaj taq jaloj richin ri rutikirib\'al molojri\'ïl.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Keyak taq jaloj.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Tinuk\'</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Tinuk\' ewan tzij</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Titz\'aqatisäx k\'ak\'a\' rub\'i\' taqoya\'l</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Titz\'aqatisäx ewan tzij</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Najowäx ewan tzij</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Titz\'ib\'äx jun ewan tzij</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Najowäx rub\'i\' okisanel</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Titz\'ib\'äx jun ewan rutzij okisaxel</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Najowäx rub\'i\' ruk\'u\'x k\'amb\'ey</string>
     <!-- Voice search button content description  -->
@@ -2052,7 +2078,7 @@ Achi\'el: \nhttps://www.google.com/search?q=%s</string>
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Tikanöx pa %s</string>
 
-    <!-- Default browser experiment -->
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Nub\'än kinuk\'ulem ximonel ajk\'amaya\'l taq ruxaq, taq taqoya\'l chuqa\' taq rutzijol richin yejaq pa ruyonil pa Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2072,6 +2098,8 @@ Achi\'el: \nhttps://www.google.com/search?q=%s</string>
     <string name="pocket_stories_header_1">B\'anob\'äl richin yach\'ob\'on</string>
     <!-- Text of a button allowing users to access an external url for more Pocket recommendations. -->
     <string name="pocket_stories_placeholder_text">Tilitäj ch\'aqa\' chik</string>
+    <!-- Title of an app feature. Smaller than a heading. The first parameter is product name Pocket -->
+    <string name="pocket_stories_feature_title_2">B\'anon ruma %s.</string>
     <!-- Clickable text for opening an external link for more information about Pocket. -->
     <string name="pocket_stories_feature_learn_more">Tetamäx ch\'aqa\' chik</string>
     <!-- Text indicating that the Pocket story that also displays this text is a sponsored story by other 3rd party entity. -->
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index 883e691fa..db20b1724 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -2167,6 +2167,9 @@
     <string name="other_default_search_engine_suggestion_header">Buscar con %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Cambia tu navegador predeterminado</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Configura enlaces de sitios web, correos electrónicos y mensajes para que se abran automáticamente en Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3a6cd2169..e7ee8061b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -2295,13 +2295,13 @@
     <!-- Text for title of settings section. -->
     <string name="review_quality_check_settings_title">Impostazioni</string>
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
-    <string name="review_quality_check_settings_recommended_products">Mostra annunci nella verifica recensioni</string>
+    <string name="review_quality_check_settings_recommended_products">Mostra annunci in Verifica recensioni</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
     <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Verranno visualizzati annunci occasionali per prodotti pertinenti. Promuoviamo solo prodotti con recensioni affidabili. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Ulteriori informazioni</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
-    <string name="review_quality_check_settings_turn_off">Disattiva verifica recensioni</string>
+    <string name="review_quality_check_settings_turn_off">Disattiva Verifica recensioni</string>
     <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
     <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Altri prodotti da valutare</string>
     <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
@@ -2395,17 +2395,17 @@
     <!-- Text for the first CFR presenting the review quality check feature. -->
     <string name="review_quality_check_first_cfr_message">Prima di acquistare, scopri se puoi fidarti delle recensioni di questo prodotto.</string>
     <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
-    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Prova verifica recensioni</string>
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Prova Verifica recensioni</string>
     <!-- Text for the second CFR presenting the review quality check feature. -->
     <string name="review_quality_check_second_cfr_message">Queste recensioni sono affidabili? Controlla ora per vedere la valutazione rettificata.</string>
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
-    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Apri verifica recensioni</string>
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Apri Verifica recensioni</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
     <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="review_quality_check_open_handle_content_description">Apri verifica recensioni</string>
+    <string name="review_quality_check_open_handle_content_description">Apri Verifica recensioni</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="review_quality_check_close_handle_content_description">Chiudi verifica recensioni</string>
+    <string name="review_quality_check_close_handle_content_description">Chiudi Verifica recensioni</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s su 5 stelle</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->

From b5b4abb1ff71d2164f6253228847b1ad82bcef22 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 13 Feb 2024 15:45:42 +0200
Subject: [PATCH 164/222] Bug 1880221 - Convert private variables to functions
 so they don't get initialised

---
 .../fenix/ui/robots/RecentlyClosedTabsRobot.kt       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt
index d77962cfb..2a3996fd9 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt
@@ -87,21 +87,21 @@ class RecentlyClosedTabsRobot {
         }
 
         fun clickOpenInNewTab(testRule: HomeActivityComposeTestRule, interact: ComposeTabDrawerRobot.() -> Unit): ComposeTabDrawerRobot.Transition {
-            openInNewTabOption.click()
+            openInNewTabOption().click()
 
             ComposeTabDrawerRobot(testRule).interact()
             return ComposeTabDrawerRobot.Transition(testRule)
         }
 
         fun clickOpenInPrivateTab(testRule: HomeActivityComposeTestRule, interact: ComposeTabDrawerRobot.() -> Unit): ComposeTabDrawerRobot.Transition {
-            openInPrivateTabOption.click()
+            openInPrivateTabOption().click()
 
             ComposeTabDrawerRobot(testRule).interact()
             return ComposeTabDrawerRobot.Transition(testRule)
         }
 
         fun clickShare(interact: ShareOverlayRobot.() -> Unit): ShareOverlayRobot.Transition {
-            multipleSelectionShareButton.click()
+            multipleSelectionShareButton().click()
 
             ShareOverlayRobot().interact()
             return ShareOverlayRobot.Transition()
@@ -132,8 +132,8 @@ private fun recentlyClosedTabDeleteButton() =
         ),
     )
 
-private val openInNewTabOption = onView(withText("Open in new tab"))
+private fun openInNewTabOption() = onView(withText("Open in new tab"))
 
-private val openInPrivateTabOption = onView(withText("Open in private tab"))
+private fun openInPrivateTabOption() = onView(withText("Open in private tab"))
 
-private val multipleSelectionShareButton = onView(withId(R.id.share_history_multi_select))
+private fun multipleSelectionShareButton() = onView(withId(R.id.share_history_multi_select))

From 2229abaf0583dac82262511a34e146ed10faf499 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 13 Feb 2024 15:56:16 +0200
Subject: [PATCH 165/222] Bug 1880221 - Add logs to RecentlyClosedTabsRobot

---
 .../ui/robots/RecentlyClosedTabsRobot.kt      | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt
index 2a3996fd9..8034e4674 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.ui.robots
 
 import android.net.Uri
+import android.util.Log
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.Visibility
@@ -17,6 +18,7 @@ import androidx.test.uiautomator.UiSelector
 import org.hamcrest.Matchers
 import org.hamcrest.Matchers.allOf
 import org.mozilla.fenix.R
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.HomeActivityComposeTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText
@@ -32,28 +34,36 @@ import org.mozilla.fenix.helpers.click
 
 class RecentlyClosedTabsRobot {
 
-    fun waitForListToExist() =
+    fun waitForListToExist() {
+        Log.i(TAG, "waitForListToExist: Waiting for $waitingTime ms for recently closed tabs list to exist")
         mDevice.findObject(UiSelector().resourceId("$packageName:id/recently_closed_list"))
             .waitForExists(waitingTime)
+        Log.i(TAG, "waitForListToExist: Waited for $waitingTime ms for recently closed tabs list to exist")
+    }
 
     fun verifyRecentlyClosedTabsMenuView() {
+        Log.i(TAG, "verifyRecentlyClosedTabsMenuView: Trying to verify that the recently closed tabs menu view is visible")
         onView(
             allOf(
                 withText("Recently closed tabs"),
                 withParent(withId(R.id.navigationToolbar)),
             ),
         ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyRecentlyClosedTabsMenuView: Verified that the recently closed tabs menu view is visible")
     }
 
     fun verifyEmptyRecentlyClosedTabsList() {
+        Log.i(TAG, "verifyEmptyRecentlyClosedTabsList: Waiting for device to be idle")
         mDevice.waitForIdle()
-
+        Log.i(TAG, "verifyEmptyRecentlyClosedTabsList: Waited for device to be idle")
+        Log.i(TAG, "verifyEmptyRecentlyClosedTabsList: Trying to verify that the empty recently closed tabs list is visible")
         onView(
             allOf(
                 withId(R.id.recently_closed_empty_view),
                 withText(R.string.recently_closed_empty_message),
             ),
         ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyEmptyRecentlyClosedTabsList: Verified that the empty recently closed tabs list is visible")
     }
 
     fun verifyRecentlyClosedTabsPageTitle(title: String) =
@@ -62,6 +72,7 @@ class RecentlyClosedTabsRobot {
         )
 
     fun verifyRecentlyClosedTabsUrl(expectedUrl: Uri) {
+        Log.i(TAG, "verifyRecentlyClosedTabsUrl: Trying to verify that the recently closed tab with url: $expectedUrl is visible")
         onView(
             allOf(
                 withId(R.id.url),
@@ -70,45 +81,64 @@ class RecentlyClosedTabsRobot {
                 ),
             ),
         ).check(matches(withText(Matchers.containsString(expectedUrl.toString()))))
+        Log.i(TAG, "verifyRecentlyClosedTabsUrl: Verified that the recently closed tab with url: $expectedUrl is visible")
     }
 
-    fun clickDeleteRecentlyClosedTabs() = recentlyClosedTabDeleteButton().click()
+    fun clickDeleteRecentlyClosedTabs() {
+        Log.i(TAG, "clickDeleteRecentlyClosedTabs: Trying to click the recently closed tab item delete button")
+        recentlyClosedTabDeleteButton().click()
+        Log.i(TAG, "clickDeleteRecentlyClosedTabs: Clicked the recently closed tab item delete button")
+    }
 
     class Transition {
         fun clickRecentlyClosedItem(title: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
             recentlyClosedTabsPageTitle(title).also {
+                Log.i(TAG, "clickRecentlyClosedItem: Waiting for $waitingTimeShort ms for recently closed tab with title: $title to exist")
                 it.waitForExists(waitingTimeShort)
+                Log.i(TAG, "clickRecentlyClosedItem: Waited for $waitingTimeShort ms for recently closed tab with title: $title to exist")
+                Log.i(TAG, "clickRecentlyClosedItem: Trying to click the recently closed tab with title: $title")
                 it.click()
+                Log.i(TAG, "clickRecentlyClosedItem: Clicked the recently closed tab with title: $title")
             }
+            Log.i(TAG, "clickRecentlyClosedItem: Waiting for device to be idle")
             mDevice.waitForIdle()
+            Log.i(TAG, "clickRecentlyClosedItem: Waited for device to be idle")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun clickOpenInNewTab(testRule: HomeActivityComposeTestRule, interact: ComposeTabDrawerRobot.() -> Unit): ComposeTabDrawerRobot.Transition {
+            Log.i(TAG, "clickOpenInNewTab: Trying to click the multi-select \"Open in a new tab\" context menu button")
             openInNewTabOption().click()
+            Log.i(TAG, "clickOpenInNewTab: Clicked the multi-select \"Open in a new tab\" context menu button")
 
             ComposeTabDrawerRobot(testRule).interact()
             return ComposeTabDrawerRobot.Transition(testRule)
         }
 
         fun clickOpenInPrivateTab(testRule: HomeActivityComposeTestRule, interact: ComposeTabDrawerRobot.() -> Unit): ComposeTabDrawerRobot.Transition {
+            Log.i(TAG, "clickOpenInPrivateTab: Trying to click the multi-select \"Open in a private tab\" context menu button")
             openInPrivateTabOption().click()
+            Log.i(TAG, "clickOpenInPrivateTab: Clicked the multi-select \"Open in a private tab\" context menu button")
 
             ComposeTabDrawerRobot(testRule).interact()
             return ComposeTabDrawerRobot.Transition(testRule)
         }
 
         fun clickShare(interact: ShareOverlayRobot.() -> Unit): ShareOverlayRobot.Transition {
+            Log.i(TAG, "clickShare: Trying to click the share recently closed tabs button")
             multipleSelectionShareButton().click()
+            Log.i(TAG, "clickShare: Clicked the share recently closed tabs button")
 
             ShareOverlayRobot().interact()
             return ShareOverlayRobot.Transition()
         }
 
         fun goBackToHistoryMenu(interact: HistoryRobot.() -> Unit): HistoryRobot.Transition {
+            Log.i(TAG, "goBackToHistoryMenu: Trying to click navigate up toolbar button")
             onView(withContentDescription("Navigate up")).click()
+            Log.i(TAG, "goBackToHistoryMenu: Clicked navigate up toolbar button")
 
             HistoryRobot().interact()
             return HistoryRobot.Transition()

From 45e3e14e5eb2cc62d0a62162fa0700f48b8159d2 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Wed, 31 Jan 2024 21:29:21 -0500
Subject: [PATCH 166/222] Bug 1877888 - Update Adjust to version 4.38.1

---
 .../fenixdependencies/src/main/java/FenixDependenciesPlugin.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
index 6cce2f427..0cdb5a6d1 100644
--- a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+++ b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
@@ -29,7 +29,7 @@ object FenixVersions {
     const val androidx_datastore = "1.0.0"
     const val google_accompanist = "0.32.0"
 
-    const val adjust = "4.35.1"
+    const val adjust = "4.38.1"
     const val installreferrer = "2.2"
 
     const val junit = "5.9.3"

From 3e0231b3f784c5e403e579fd56b3d6d343d120dc Mon Sep 17 00:00:00 2001
From: DreVla <vlad.dreghici@gmail.com>
Date: Wed, 14 Feb 2024 11:56:46 +0200
Subject: [PATCH 167/222] Bug 1870701 - Replace straight quotes with curly
 quotes in RC onboarding

Due to straight quotes giving an error in pontoon, these have to be
replaced with curly quotes.
---
 .../shopping/ui/ReviewQualityCheckContextualOnboarding.kt     | 2 +-
 app/src/main/res/values/strings.xml                           | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt
index afa4da62d..0ab8bca52 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt
@@ -113,7 +113,7 @@ fun ReviewQualityCheckContextualOnboarding(
 
         LinkText(
             text = stringResource(
-                id = R.string.review_quality_check_contextual_onboarding_caption_3,
+                id = R.string.review_quality_check_contextual_onboarding_caption_4,
                 stringResource(id = R.string.firefox),
                 privacyPolicyText,
                 stringResource(id = R.string.shopping_product_name),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 38148a49f..486a5a0ca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2251,7 +2251,9 @@
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">By selecting “Yes, try it” you agree to the following from %1$s:</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
-    <string name="review_quality_check_contextual_onboarding_caption_3">By selecting “Yes, try it” you agree to %1$s\'s %2$s and %3$s\'s %4$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">By selecting “Yes, try it” you agree to %1$s\'s %2$s and %3$s\'s %4$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">By selecting “Yes, try it” you agree to %1$s\’s %2$s and %3$s\’s %4$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">privacy policy</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->

From 37138b62a1e5c435e0b5d23e8f477d68d789d40a Mon Sep 17 00:00:00 2001
From: William Durand <will+git@drnd.me>
Date: Mon, 12 Feb 2024 17:23:44 +0100
Subject: [PATCH 168/222] Bug 1875229 - Add support for extensions not allowed
 in private windows

---
 .../addons/InstalledAddonDetailsFragment.kt   | 78 +++++++++++--------
 .../InstalledAddonDetailsFragmentTest.kt      | 26 ++++++-
 2 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
index 3da061c25..f5a873c36 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
@@ -162,9 +162,10 @@ class InstalledAddonDetailsFragment : Fragment() {
                         runIfFragmentIsAttached {
                             this.addon = it
                             switch.isClickable = true
-                            privateBrowsingSwitch.isVisible = it.isEnabled()
-                            privateBrowsingSwitch.isChecked = it.isAllowedInPrivateBrowsing()
                             switch.setText(R.string.mozac_feature_addons_enabled)
+                            privateBrowsingSwitch.isVisible = it.isEnabled()
+                            privateBrowsingSwitch.isChecked =
+                                it.incognito != Addon.Incognito.NOT_ALLOWED && it.isAllowedInPrivateBrowsing()
                             binding.settings.isVisible = shouldSettingsBeVisible()
                             enableButtons()
                             context?.let {
@@ -203,8 +204,8 @@ class InstalledAddonDetailsFragment : Fragment() {
                         runIfFragmentIsAttached {
                             this.addon = it
                             switch.isClickable = true
-                            privateBrowsingSwitch.isVisible = it.isEnabled()
                             switch.setText(R.string.mozac_feature_addons_disabled)
+                            privateBrowsingSwitch.isVisible = it.isEnabled()
                             enableButtons()
                             context?.let {
                                 showSnackBar(
@@ -220,9 +221,8 @@ class InstalledAddonDetailsFragment : Fragment() {
                     onError = {
                         runIfFragmentIsAttached {
                             switch.isClickable = true
-                            privateBrowsingSwitch.isClickable = true
-                            enableButtons()
                             switch.setState(addon.isEnabled())
+                            enableButtons()
                             context?.let {
                                 showSnackBar(
                                     binding.root,
@@ -261,6 +261,45 @@ class InstalledAddonDetailsFragment : Fragment() {
         }
     }
 
+    @VisibleForTesting
+    internal fun bindAllowInPrivateBrowsingSwitch() {
+        val switch = providePrivateBrowsingSwitch()
+        switch.isVisible = addon.isEnabled()
+
+        if (addon.incognito == Addon.Incognito.NOT_ALLOWED) {
+            switch.isChecked = false
+            switch.isEnabled = false
+            switch.text = requireContext().getString(R.string.mozac_feature_addons_not_allowed_in_private_browsing)
+            return
+        }
+
+        switch.isChecked = addon.isAllowedInPrivateBrowsing()
+
+        switch.setOnCheckedChangeListener { v, isChecked ->
+            val addonManager = v.context.components.addonManager
+            switch.isClickable = false
+            disableButtons()
+            addonManager.setAddonAllowedInPrivateBrowsing(
+                addon,
+                isChecked,
+                onSuccess = {
+                    runIfFragmentIsAttached {
+                        this.addon = it
+                        switch.isClickable = true
+                        enableButtons()
+                    }
+                },
+                onError = {
+                    runIfFragmentIsAttached {
+                        switch.isChecked = addon.isAllowedInPrivateBrowsing()
+                        switch.isClickable = true
+                        enableButtons()
+                    }
+                },
+            )
+        }
+    }
+
     private fun bindReportButton() {
         binding.reportAddOn.setOnClickListener {
             val shouldCreatePrivateSession = (activity as HomeActivity).browsingModeManager.mode.isPrivate
@@ -325,35 +364,6 @@ class InstalledAddonDetailsFragment : Fragment() {
         }
     }
 
-    private fun bindAllowInPrivateBrowsingSwitch() {
-        val switch = binding.allowInPrivateBrowsingSwitch
-        switch.isChecked = addon.isAllowedInPrivateBrowsing()
-        switch.isVisible = addon.isEnabled()
-        switch.setOnCheckedChangeListener { v, isChecked ->
-            val addonManager = v.context.components.addonManager
-            switch.isClickable = false
-            disableButtons()
-            addonManager.setAddonAllowedInPrivateBrowsing(
-                addon,
-                isChecked,
-                onSuccess = {
-                    runIfFragmentIsAttached {
-                        this.addon = it
-                        switch.isClickable = true
-                        enableButtons()
-                    }
-                },
-                onError = {
-                    runIfFragmentIsAttached {
-                        switch.isChecked = addon.isAllowedInPrivateBrowsing()
-                        switch.isClickable = true
-                        enableButtons()
-                    }
-                },
-            )
-        }
-    }
-
     private fun bindRemoveButton() {
         binding.removeAddOn.setOnClickListener {
             setAllInteractiveViewsClickable(binding, false)
diff --git a/app/src/test/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragmentTest.kt
index 6d8871228..2f88c0817 100644
--- a/app/src/test/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragmentTest.kt
@@ -76,7 +76,7 @@ class InstalledAddonDetailsFragmentTest {
     }
 
     @Test
-    fun `GIVEN blocklisted addon WHEN biding the enable switch THEN disable the switch`() {
+    fun `GIVEN blocklisted addon WHEN binding the enable switch THEN disable the switch`() {
         val addon = mockk<Addon>()
         val enableSwitch = mockk<SwitchMaterial>(relaxed = true)
         val privateBrowsingSwitch = mockk<SwitchMaterial>(relaxed = true)
@@ -93,7 +93,7 @@ class InstalledAddonDetailsFragmentTest {
     }
 
     @Test
-    fun `GIVEN enabled addon WHEN biding the enable switch THEN do not disable the switch`() {
+    fun `GIVEN enabled addon WHEN binding the enable switch THEN do not disable the switch`() {
         val addon = mockk<Addon>()
         val enableSwitch = mockk<SwitchMaterial>(relaxed = true)
         val privateBrowsingSwitch = mockk<SwitchMaterial>(relaxed = true)
@@ -112,7 +112,7 @@ class InstalledAddonDetailsFragmentTest {
     }
 
     @Test
-    fun `GIVEN addon not correctly signed WHEN biding the enable switch THEN disable the switch`() {
+    fun `GIVEN addon not correctly signed WHEN binding the enable switch THEN disable the switch`() {
         val addon = mockk<Addon>()
         val enableSwitch = mockk<SwitchMaterial>(relaxed = true)
         val privateBrowsingSwitch = mockk<SwitchMaterial>(relaxed = true)
@@ -130,7 +130,7 @@ class InstalledAddonDetailsFragmentTest {
     }
 
     @Test
-    fun `GIVEN incompatible addon WHEN biding the enable switch THEN disable the switch`() {
+    fun `GIVEN incompatible addon WHEN binding the enable switch THEN disable the switch`() {
         val addon = mockk<Addon>()
         val enableSwitch = mockk<SwitchMaterial>(relaxed = true)
         val privateBrowsingSwitch = mockk<SwitchMaterial>(relaxed = true)
@@ -228,9 +228,27 @@ class InstalledAddonDetailsFragmentTest {
         }
     }
 
+    @Test
+    fun `GIVEN addon does not allow private browsing WHEN binding THEN update switch`() {
+        val addon = mockAddon()
+        val privateBrowsingSwitch = mockk<SwitchMaterial>(relaxed = true)
+
+        every { fragment.providePrivateBrowsingSwitch() } returns privateBrowsingSwitch
+        every { addon.incognito } returns Addon.Incognito.NOT_ALLOWED
+        every { fragment.addon } returns addon
+        every { fragment.context } returns testContext
+
+        fragment.bindAllowInPrivateBrowsingSwitch()
+
+        verify { privateBrowsingSwitch.isEnabled = false }
+        verify { privateBrowsingSwitch.isChecked = false }
+        verify { privateBrowsingSwitch.text = "Not allowed in private windows" }
+    }
+
     private fun mockAddon(): Addon {
         val addon: Addon = mockk()
         every { addon.id } returns "some-addon-id"
+        every { addon.incognito } returns Addon.Incognito.SPANNING
         every { addon.isEnabled() } returns true
         every { addon.isDisabledAsBlocklisted() } returns false
         every { addon.isDisabledAsNotCorrectlySigned() } returns false

From 6e38c30c81a511b5e73411bd21f11520206561db Mon Sep 17 00:00:00 2001
From: JohanLorenzo <JohanLorenzo@users.noreply.github.com>
Date: Wed, 14 Feb 2024 19:02:32 +0000
Subject: [PATCH 169/222] Update Fenix initial_experiments.json based on the
 current first-run experiments in experimenter

---
 app/src/main/res/raw/initial_experiments.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/raw/initial_experiments.json b/app/src/main/res/raw/initial_experiments.json
index f7397a63c..6717b9e5c 100644
--- a/app/src/main/res/raw/initial_experiments.json
+++ b/app/src/main/res/raw/initial_experiments.json
@@ -232,7 +232,7 @@
       "channel": "release",
       "userFacingName": "Fx 122 Android set to default notifications timing experiment",
       "userFacingDescription": "Timing test for the set to default message on Firefox for Android (Fenix).",
-      "isEnrollmentPaused": false,
+      "isEnrollmentPaused": true,
       "isRollout": false,
       "bucketConfig": {
         "randomizationUnit": "nimbus_id",

From 3c2274e8ac0d6bf9801ba0e537c608d36cc52624 Mon Sep 17 00:00:00 2001
From: ohall-m <ohall@mozilla.com>
Date: Wed, 14 Feb 2024 10:41:40 -0500
Subject: [PATCH 170/222] Bug 1877278 - AC Translations Check for if the Engine
 is Supported

This patch supports the workflow for checking if the device architecture supports translations.

This patch adds:
* New `TranslationsBrowserState` to hold global translations engine state
* New `SetEngineSupportedAction` to set the isEngineSupported value on `TranslationsBrowserState`
* New `EngineExceptionAction` to set errors on `TranslationsBrowserState`
---
 .../java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt
index 4c8eace86..dfbb1ba68 100644
--- a/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt
@@ -86,6 +86,7 @@ class TelemetryMiddlewareTest {
         val engine: Engine = mockk()
         every { engine.enableExtensionProcessSpawning() } just runs
         every { engine.disableExtensionProcessSpawning() } just runs
+        every { engine.isTranslationsEngineSupported(any(), any()) } just runs
         store = BrowserStore(
             middleware = listOf(telemetryMiddleware) + EngineMiddleware.create(engine),
             initialState = BrowserState(),

From 38b129539e090a061b983345cf7ac61513c235e9 Mon Sep 17 00:00:00 2001
From: JohanLorenzo <JohanLorenzo@users.noreply.github.com>
Date: Wed, 14 Feb 2024 21:32:13 +0000
Subject: [PATCH 171/222] Update Fenix initial_experiments.json based on the
 current first-run experiments in experimenter

---
 app/src/main/res/raw/initial_experiments.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/raw/initial_experiments.json b/app/src/main/res/raw/initial_experiments.json
index 6717b9e5c..1d486af1d 100644
--- a/app/src/main/res/raw/initial_experiments.json
+++ b/app/src/main/res/raw/initial_experiments.json
@@ -380,7 +380,7 @@
       ],
       "targeting": "((is_already_enrolled) || ((isFirstRun == 'true') && (app_version|versionCompare('122.!') >= 0) && (language in ['en'])))",
       "startDate": "2024-01-23",
-      "enrollmentEndDate": null,
+      "enrollmentEndDate": "2024-02-14",
       "endDate": null,
       "proposedDuration": 43,
       "proposedEnrollment": 14,

From 4c71cc875ef37ddc9bf20fb31572766394a28567 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Wed, 14 Feb 2024 12:52:44 +0200
Subject: [PATCH 172/222] Bug 1807268 - Fix verifySavedAddressCanBeEditedTest
 UI test

---
 .../ui/robots/SettingsSubMenuAutofillRobot.kt      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt
index 67b82b283..349451b69 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt
@@ -9,7 +9,9 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.RootMatchers
 import androidx.test.espresso.matcher.ViewMatchers.isChecked
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isNotChecked
+import androidx.test.espresso.matcher.ViewMatchers.withChild
 import androidx.test.espresso.matcher.ViewMatchers.withClassName
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
@@ -38,8 +40,16 @@ class SettingsSubMenuAutofillRobot {
         Log.i(TAG, "verifyAutofillToolbarTitle: Verified \"Autofill\" toolbar title exists")
     }
     fun verifyManageAddressesToolbarTitle() {
-        assertUIObjectExists(manageAddressesToolbarTitle)
-        Log.i(TAG, "verifyManageAddressesToolbarTitle: Verified \"Manage addresses\" toolbar title exists")
+        Log.i(TAG, "verifyManageAddressesToolbarTitle: Trying to verify the \"Manage addresses\" toolbar title is displayed")
+        onView(
+            allOf(
+                withId(R.id.navigationToolbar),
+                withChild(
+                    withText(R.string.preferences_addresses_manage_addresses),
+                ),
+            ),
+        ).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyManageAddressesToolbarTitle: Verified the \"Manage addresses\" toolbar title is displayed")
     }
 
     fun verifyAddressAutofillSection(isAddressAutofillEnabled: Boolean, userHasSavedAddress: Boolean) {

From d4a5b09f11d6a00b891dfb3321e47f5c48f1faec Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Wed, 14 Feb 2024 13:56:19 +0200
Subject: [PATCH 173/222] Bug 1880445 - Remove redundant assertion functions
 from SettingsRobot

---
 .../mozilla/fenix/ui/robots/SettingsRobot.kt  | 400 ++++++++----------
 1 file changed, 175 insertions(+), 225 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
index 84da4f5d1..d8bf72e3b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
@@ -11,12 +11,10 @@ import android.net.Uri
 import android.util.Log
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.intent.Intents.intended
-import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasData
 import androidx.test.espresso.matcher.ViewMatchers
@@ -69,18 +67,43 @@ import org.mozilla.fenix.ui.robots.SettingsRobot.Companion.DEFAULT_APPS_SETTINGS
 class SettingsRobot {
 
     // BASICS SECTION
-    fun verifyGeneralHeading() = assertGeneralHeading()
+    fun verifyGeneralHeading() {
+        scrollToElementByText("General")
+        onView(withText("General"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+
+    fun verifySearchButton() {
+        mDevice.wait(Until.findObject(By.text("Search")), waitingTime)
+        onView(withText(R.string.preferences_search))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifyCustomizeButton() {
+        onView(withText("Customize"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
 
-    fun verifySearchButton() = assertSearchButton()
-    fun verifyCustomizeButton() = assertCustomizeButton()
-    fun verifyThemeSelected() = assertThemeSelected()
-    fun verifyAccessibilityButton() = assertAccessibilityButton()
-    fun verifySetAsDefaultBrowserButton() = assertSetAsDefaultBrowserButton()
+    fun verifyAccessibilityButton() {
+        onView(withText("Accessibility"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifySetAsDefaultBrowserButton() {
+        scrollToElementByText("Set as default browser")
+        onView(withText("Set as default browser"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
     fun verifyTabsButton() =
         assertUIObjectExists(itemContainingText(getStringResource(R.string.preferences_tabs)))
-    fun verifyHomepageButton() = assertHomepageButton()
-    fun verifyAutofillButton() = assertAutofillButton()
-    fun verifyLanguageButton() = assertLanguageButton()
+    fun verifyHomepageButton() {
+        onView(withText(R.string.preferences_home_2)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifyAutofillButton() {
+        onView(withText(R.string.preferences_autofill)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifyLanguageButton() {
+        scrollToElementByText(getStringResource(R.string.preferences_language))
+        onView(withText(R.string.preferences_language)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
     fun verifyDefaultBrowserToggle(isEnabled: Boolean) {
         scrollToElementByText(getStringResource(R.string.preferences_set_as_default_browser))
         onView(withText(R.string.preferences_set_as_default_browser))
@@ -101,12 +124,22 @@ class SettingsRobot {
     }
 
     fun clickDefaultBrowserSwitch() = toggleDefaultBrowserSwitch()
-    fun verifyAndroidDefaultAppsMenuAppears() = assertAndroidDefaultAppsMenuAppears()
+    fun verifyAndroidDefaultAppsMenuAppears() {
+        intended(hasAction(DEFAULT_APPS_SETTINGS_ACTION))
+    }
 
     // PRIVACY SECTION
-    fun verifyPrivacyHeading() = assertPrivacyHeading()
-
-    fun verifyHTTPSOnlyModeButton() = assertHTTPSOnlyModeButton()
+    fun verifyPrivacyHeading() {
+        scrollToElementByText("Privacy and security")
+        onView(withText("Privacy and security"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifyHTTPSOnlyModeButton() {
+        scrollToElementByText(getStringResource(R.string.preferences_https_only_title))
+        onView(
+            withText(R.string.preferences_https_only_title),
+        ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
 
     fun verifyCookieBannerBlockerButton(enabled: Boolean) {
         scrollToElementByText(getStringResource(R.string.preferences_cookie_banner_reduction_private_mode))
@@ -128,21 +161,104 @@ class SettingsRobot {
         Log.i(TAG, "verifyCookieBannerBlockerButton: Verified if cookie banner blocker toggle is enabled: $enabled")
     }
 
-    fun verifyEnhancedTrackingProtectionButton() = assertEnhancedTrackingProtectionButton()
-    fun verifyLoginsAndPasswordsButton() = assertLoginsAndPasswordsButton()
-    fun verifyPrivateBrowsingButton() = assertPrivateBrowsingButton()
-    fun verifySitePermissionsButton() = assertSitePermissionsButton()
-    fun verifyDeleteBrowsingDataButton() = assertDeleteBrowsingDataButton()
-    fun verifyDeleteBrowsingDataOnQuitButton() = assertDeleteBrowsingDataOnQuitButton()
-    fun verifyNotificationsButton() = assertNotificationsButton()
-    fun verifyDataCollectionButton() = assertDataCollectionButton()
-    fun verifyOpenLinksInAppsButton() = assertOpenLinksInAppsButton()
-    fun verifySettingsView() = assertSettingsView()
-    fun verifySettingsToolbar() = assertSettingsToolbar()
+    fun verifyEnhancedTrackingProtectionButton() {
+        mDevice.wait(Until.findObject(By.text("Privacy and Security")), waitingTime)
+        onView(withId(R.id.recycler_view)).perform(
+            RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
+                hasDescendant(withText("Enhanced Tracking Protection")),
+            ),
+        ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifyLoginsAndPasswordsButton() {
+        scrollToElementByText("Logins and passwords")
+        onView(withText(R.string.preferences_passwords_logins_and_passwords))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifyPrivateBrowsingButton() {
+        scrollToElementByText("Private browsing")
+        mDevice.wait(Until.findObject(By.text("Private browsing")), waitingTime)
+        onView(withText("Private browsing"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifySitePermissionsButton() {
+        scrollToElementByText("Site permissions")
+        onView(withText("Site permissions"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifyDeleteBrowsingDataButton() {
+        scrollToElementByText("Delete browsing data")
+        onView(withText("Delete browsing data"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifyDeleteBrowsingDataOnQuitButton() {
+        scrollToElementByText("Delete browsing data on quit")
+        onView(withText("Delete browsing data on quit"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifyNotificationsButton() {
+        scrollToElementByText("Notifications")
+        onView(withText("Notifications"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifyDataCollectionButton() {
+        scrollToElementByText("Data collection")
+        onView(withText("Data collection"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifyOpenLinksInAppsButton() {
+        scrollToElementByText("Open links in apps")
+        openLinksInAppsButton()
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "clickOpenLinksInAppsGoToSettingsCFRButton: Verified \"Open links in apps\" setting option")
+    }
+    fun verifySettingsView() {
+        scrollToElementByText("General")
+        onView(withText("General"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        scrollToElementByText("Privacy and security")
+        onView(withText("Privacy and security"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        onView(withId(R.id.recycler_view)).perform(
+            RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
+                hasDescendant(withText("Add-ons")),
+            ),
+        )
+        onView(withText("Add-ons"))
+            .check(matches(isCompletelyDisplayed()))
+        settingsList().scrollToEnd(LISTS_MAXSWIPES)
+        onView(withText("About"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifySettingsToolbar() =
+        onView(
+            CoreMatchers.allOf(
+                withId(R.id.navigationToolbar),
+                hasDescendant(ViewMatchers.withContentDescription(R.string.action_bar_up_description)),
+                hasDescendant(withText(R.string.settings)),
+            ),
+        ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 
     // ADVANCED SECTION
-    fun verifyAdvancedHeading() = assertAdvancedHeading()
-    fun verifyAddons() = assertAddonsButton()
+    fun verifyAdvancedHeading() {
+        onView(withId(R.id.recycler_view)).perform(
+            RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
+                hasDescendant(withText("Add-ons")),
+            ),
+        )
+
+        onView(withText("Add-ons"))
+            .check(matches(isCompletelyDisplayed()))
+    }
+    fun verifyAddons() {
+        onView(withId(R.id.recycler_view)).perform(
+            RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
+                hasDescendant(withText("Add-ons")),
+            ),
+        )
+
+        addonsManagerButton()
+            .check(matches(isCompletelyDisplayed()))
+    }
 
     fun verifyExternalDownloadManagerButton() =
         onView(
@@ -201,15 +317,42 @@ class SettingsRobot {
             )
 
     // DEVELOPER TOOLS SECTION
-    fun verifyRemoteDebuggingButton() = assertRemoteDebuggingButton()
-    fun verifyLeakCanaryButton() = assertLeakCanaryButton()
+    fun verifyRemoteDebuggingButton() {
+        scrollToElementByText("Remote debugging via USB")
+        onView(withText("Remote debugging via USB"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+    fun verifyLeakCanaryButton() {
+        scrollToElementByText("LeakCanary")
+        onView(withText("LeakCanary"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
 
     // ABOUT SECTION
-    fun verifyAboutHeading() = assertAboutHeading()
+    fun verifyAboutHeading() {
+        settingsList().scrollToEnd(LISTS_MAXSWIPES)
+        onView(withText("About"))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
 
     fun verifyRateOnGooglePlay() = assertUIObjectExists(rateOnGooglePlayHeading())
     fun verifyAboutFirefoxPreview() = assertUIObjectExists(aboutFirefoxHeading())
-    fun verifyGooglePlayRedirect() = assertGooglePlayRedirect()
+    fun verifyGooglePlayRedirect() {
+        if (isPackageInstalled(GOOGLE_PLAY_SERVICES)) {
+            try {
+                intended(
+                    allOf(
+                        hasAction(Intent.ACTION_VIEW),
+                        hasData(Uri.parse(SupportUtils.RATE_APP_URL)),
+                    ),
+                )
+            } catch (e: AssertionFailedError) {
+                BrowserRobot().verifyRateOnGooglePlayURL()
+            }
+        } else {
+            BrowserRobot().verifyRateOnGooglePlayURL()
+        }
+    }
 
     fun verifySettingsOptionSummary(setting: String, summary: String) {
         scrollToElementByText(setting)
@@ -466,189 +609,13 @@ fun settingsScreen(interact: SettingsRobot.() -> Unit): SettingsRobot.Transition
     return SettingsRobot.Transition()
 }
 
-private fun assertSettingsView() {
-    // verify that we are in the correct library view
-    assertGeneralHeading()
-    assertPrivacyHeading()
-    assertAdvancedHeading()
-    assertAboutHeading()
-}
-
-// GENERAL SECTION
-
-private fun assertSettingsToolbar() =
-    onView(
-        CoreMatchers.allOf(
-            withId(R.id.navigationToolbar),
-            hasDescendant(ViewMatchers.withContentDescription(R.string.action_bar_up_description)),
-            hasDescendant(withText(R.string.settings)),
-        ),
-    ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-
-private fun assertGeneralHeading() {
-    scrollToElementByText("General")
-    onView(withText("General"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertSearchButton() {
-    mDevice.wait(Until.findObject(By.text("Search")), waitingTime)
-    onView(withText(R.string.preferences_search))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertHomepageButton() =
-    onView(withText(R.string.preferences_home_2)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-
-private fun assertAutofillButton() =
-    onView(withText(R.string.preferences_autofill)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-
-private fun assertLanguageButton() {
-    scrollToElementByText(getStringResource(R.string.preferences_language))
-    onView(withText(R.string.preferences_language)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertCustomizeButton() = onView(withText("Customize"))
-    .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-
-private fun assertThemeSelected() = onView(withText("Light"))
-    .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-
-private fun assertAccessibilityButton() = onView(withText("Accessibility"))
-    .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-
-private fun assertSetAsDefaultBrowserButton() {
-    scrollToElementByText("Set as default browser")
-    onView(withText("Set as default browser"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
 private fun toggleDefaultBrowserSwitch() {
     scrollToElementByText("Privacy and security")
     onView(withText("Set as default browser")).perform(ViewActions.click())
 }
 
-private fun assertAndroidDefaultAppsMenuAppears() {
-    intended(IntentMatchers.hasAction(DEFAULT_APPS_SETTINGS_ACTION))
-}
-
-// PRIVACY SECTION
-private fun assertPrivacyHeading() {
-    scrollToElementByText("Privacy and security")
-    onView(withText("Privacy and security"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertHTTPSOnlyModeButton() {
-    scrollToElementByText(getStringResource(R.string.preferences_https_only_title))
-    onView(
-        withText(R.string.preferences_https_only_title),
-    ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertEnhancedTrackingProtectionButton() {
-    mDevice.wait(Until.findObject(By.text("Privacy and Security")), waitingTime)
-    onView(withId(R.id.recycler_view)).perform(
-        RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
-            hasDescendant(withText("Enhanced Tracking Protection")),
-        ),
-    ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertLoginsAndPasswordsButton() {
-    scrollToElementByText("Logins and passwords")
-    onView(withText(R.string.preferences_passwords_logins_and_passwords))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertPrivateBrowsingButton() {
-    scrollToElementByText("Private browsing")
-    mDevice.wait(Until.findObject(By.text("Private browsing")), waitingTime)
-    onView(withText("Private browsing"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertSitePermissionsButton() {
-    scrollToElementByText("Site permissions")
-    onView(withText("Site permissions"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertDeleteBrowsingDataButton() {
-    scrollToElementByText("Delete browsing data")
-    onView(withText("Delete browsing data"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertDeleteBrowsingDataOnQuitButton() {
-    scrollToElementByText("Delete browsing data on quit")
-    onView(withText("Delete browsing data on quit"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertNotificationsButton() {
-    scrollToElementByText("Notifications")
-    onView(withText("Notifications"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertDataCollectionButton() {
-    scrollToElementByText("Data collection")
-    onView(withText("Data collection"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
 private fun openLinksInAppsButton() = onView(withText(R.string.preferences_open_links_in_apps))
 
-private fun assertOpenLinksInAppsButton() {
-    scrollToElementByText("Open links in apps")
-    openLinksInAppsButton()
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-    Log.i(TAG, "clickOpenLinksInAppsGoToSettingsCFRButton: Verified \"Open links in apps\" setting option")
-}
-
-// ADVANCED SECTION
-private fun assertAdvancedHeading() {
-    onView(withId(R.id.recycler_view)).perform(
-        RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
-            hasDescendant(withText("Add-ons")),
-        ),
-    )
-
-    onView(withText("Add-ons"))
-        .check(matches(isCompletelyDisplayed()))
-}
-
-private fun assertAddonsButton() {
-    onView(withId(R.id.recycler_view)).perform(
-        RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
-            hasDescendant(withText("Add-ons")),
-        ),
-    )
-
-    addonsManagerButton()
-        .check(matches(isCompletelyDisplayed()))
-}
-
-private fun assertRemoteDebuggingButton() {
-    scrollToElementByText("Remote debugging via USB")
-    onView(withText("Remote debugging via USB"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-private fun assertLeakCanaryButton() {
-    scrollToElementByText("LeakCanary")
-    onView(withText("LeakCanary"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
-// ABOUT SECTION
-private fun assertAboutHeading(): ViewInteraction {
-    settingsList().scrollToEnd(LISTS_MAXSWIPES)
-    return onView(withText("About"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
 private fun rateOnGooglePlayHeading(): UiObject {
     val rateOnGooglePlay = mDevice.findObject(UiSelector().text("Rate on Google Play"))
     settingsList().scrollToEnd(LISTS_MAXSWIPES)
@@ -679,23 +646,6 @@ fun clickRateButtonGooglePlay() {
     rateOnGooglePlayHeading().click()
 }
 
-private fun assertGooglePlayRedirect() {
-    if (isPackageInstalled(GOOGLE_PLAY_SERVICES)) {
-        try {
-            intended(
-                allOf(
-                    hasAction(Intent.ACTION_VIEW),
-                    hasData(Uri.parse(SupportUtils.RATE_APP_URL)),
-                ),
-            )
-        } catch (e: AssertionFailedError) {
-            BrowserRobot().verifyRateOnGooglePlayURL()
-        }
-    } else {
-        BrowserRobot().verifyRateOnGooglePlayURL()
-    }
-}
-
 private fun addonsManagerButton() = onView(withText(R.string.preferences_addons))
 
 private fun goBackButton() =

From 183188b3db1cd76beb5a5db9e729d18a4af53253 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Wed, 14 Feb 2024 14:35:39 +0200
Subject: [PATCH 174/222] Bug 1880445 - Add logs to SettingsRobot

---
 .../fenix/helpers/AppAndSystemHelper.kt       |   3 +-
 .../mozilla/fenix/ui/robots/SettingsRobot.kt  | 233 ++++++++++++++----
 2 files changed, 192 insertions(+), 44 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt
index e3c4e532f..bc10b79ab 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt
@@ -178,11 +178,12 @@ object AppAndSystemHelper {
     }
 
     fun isPackageInstalled(packageName: String): Boolean {
+        Log.i(TAG, "isPackageInstalled: Trying to verify that $packageName is installed")
         return try {
             val packageManager = InstrumentationRegistry.getInstrumentation().context.packageManager
             packageManager.getApplicationInfo(packageName, 0).enabled
         } catch (e: PackageManager.NameNotFoundException) {
-            Log.i(TAG, "isPackageInstalled: Catch block - ${e.message}")
+            Log.i(TAG, "isPackageInstalled: $packageName is not installed - ${e.message}")
             false
         }
     }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
index d8bf72e3b..8e6a98de4 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
@@ -17,7 +17,6 @@ import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.intent.Intents.intended
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasData
-import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.Visibility
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.hasSibling
@@ -26,6 +25,7 @@ import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isNotChecked
 import androidx.test.espresso.matcher.ViewMatchers.withClassName
+import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
@@ -69,43 +69,62 @@ class SettingsRobot {
     // BASICS SECTION
     fun verifyGeneralHeading() {
         scrollToElementByText("General")
+        Log.i(TAG, "verifyGeneralHeading: Trying to verify that the \"General\" heading is visible")
         onView(withText("General"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyGeneralHeading: Verified that the \"General\" heading is visible")
     }
 
     fun verifySearchButton() {
+        Log.i(TAG, "verifySearchButton: Waiting for $waitingTime ms until finding the \"Search\" button")
         mDevice.wait(Until.findObject(By.text("Search")), waitingTime)
+        Log.i(TAG, "verifySearchButton: Waited for $waitingTime ms until the \"Search\" button was found")
+        Log.i(TAG, "verifySearchButton: Trying to verify that the \"Search\" button is visible")
         onView(withText(R.string.preferences_search))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifySearchButton: Verified that the \"Search\" button is visible")
     }
     fun verifyCustomizeButton() {
+        Log.i(TAG, "verifyCustomizeButton: Trying to verify that the \"Customize\" button is visible")
         onView(withText("Customize"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyCustomizeButton: Verified that the \"Customize\" button is visible")
     }
 
     fun verifyAccessibilityButton() {
+        Log.i(TAG, "verifyAccessibilityButton: Trying to verify that the \"Accessibility\" button is visible")
         onView(withText("Accessibility"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyAccessibilityButton: Verified that the \"Accessibility\" button is visible")
     }
     fun verifySetAsDefaultBrowserButton() {
         scrollToElementByText("Set as default browser")
+        Log.i(TAG, "verifySetAsDefaultBrowserButton: Trying to verify that the \"Set as default browser\" button is visible")
         onView(withText("Set as default browser"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifySetAsDefaultBrowserButton: Verified that the \"Set as default browser\" button is visible")
     }
     fun verifyTabsButton() =
         assertUIObjectExists(itemContainingText(getStringResource(R.string.preferences_tabs)))
     fun verifyHomepageButton() {
+        Log.i(TAG, "verifyHomepageButton: Trying to verify that the \"Homepage\" button is visible")
         onView(withText(R.string.preferences_home_2)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyHomepageButton: Verified that the \"Homepage\" button is visible")
     }
     fun verifyAutofillButton() {
+        Log.i(TAG, "verifyAutofillButton: Trying to verify that the \"Autofill\" button is visible")
         onView(withText(R.string.preferences_autofill)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyAutofillButton: Verified that the \"Autofill\" button is visible")
     }
     fun verifyLanguageButton() {
         scrollToElementByText(getStringResource(R.string.preferences_language))
+        Log.i(TAG, "verifyLanguageButton: Trying to verify that the \"Language\" button is visible")
         onView(withText(R.string.preferences_language)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyLanguageButton: Verified that the \"Language\" button is visible")
     }
     fun verifyDefaultBrowserToggle(isEnabled: Boolean) {
         scrollToElementByText(getStringResource(R.string.preferences_set_as_default_browser))
+        Log.i(TAG, "verifyDefaultBrowserToggle: Trying to verify that the \"Set as default browser\" toggle is enabled: $isEnabled")
         onView(withText(R.string.preferences_set_as_default_browser))
             .check(
                 matches(
@@ -121,28 +140,36 @@ class SettingsRobot {
                     ),
                 ),
             )
+        Log.i(TAG, "verifyDefaultBrowserToggle: Verified that the \"Set as default browser\" toggle is enabled: $isEnabled")
     }
 
     fun clickDefaultBrowserSwitch() = toggleDefaultBrowserSwitch()
     fun verifyAndroidDefaultAppsMenuAppears() {
+        Log.i(TAG, "verifyAndroidDefaultAppsMenuAppears: Trying to verify that default browser apps dialog appears")
         intended(hasAction(DEFAULT_APPS_SETTINGS_ACTION))
+        Log.i(TAG, "verifyAndroidDefaultAppsMenuAppears: Verified that the default browser apps dialog appears")
     }
 
     // PRIVACY SECTION
     fun verifyPrivacyHeading() {
         scrollToElementByText("Privacy and security")
+        Log.i(TAG, "verifyPrivacyHeading: Trying to verify that the \"Privacy and security\" heading is visible")
         onView(withText("Privacy and security"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyPrivacyHeading: Verified that the \"Privacy and security\" heading is visible")
     }
     fun verifyHTTPSOnlyModeButton() {
         scrollToElementByText(getStringResource(R.string.preferences_https_only_title))
+        Log.i(TAG, "verifyHTTPSOnlyModeButton: Trying to verify that the \"HTTPS-Only Mode\" button is visible")
         onView(
             withText(R.string.preferences_https_only_title),
         ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyHTTPSOnlyModeButton: Verified that the \"HTTPS-Only Mode\" button is visible")
     }
 
     fun verifyCookieBannerBlockerButton(enabled: Boolean) {
         scrollToElementByText(getStringResource(R.string.preferences_cookie_banner_reduction_private_mode))
+        Log.i(TAG, "verifyCookieBannerBlockerButton: Trying to verify that the \"Cookie Banner Blocker in private browsing\" toggle is enabled: $enabled")
         onView(withText(R.string.preferences_cookie_banner_reduction_private_mode))
             .check(
                 matches(
@@ -158,114 +185,167 @@ class SettingsRobot {
                     ),
                 ),
             )
-        Log.i(TAG, "verifyCookieBannerBlockerButton: Verified if cookie banner blocker toggle is enabled: $enabled")
+        Log.i(TAG, "verifyCookieBannerBlockerButton: Verified that the \"Cookie Banner Blocker in private browsing\" toggle is enabled: $enabled")
     }
 
     fun verifyEnhancedTrackingProtectionButton() {
+        Log.i(TAG, "verifyEnhancedTrackingProtectionButton: Waiting for $waitingTime ms until finding the \"Privacy and Security\" heading")
         mDevice.wait(Until.findObject(By.text("Privacy and Security")), waitingTime)
+        Log.i(TAG, "verifyEnhancedTrackingProtectionButton: Waited for $waitingTime ms until the \"Privacy and Security\" heading was found")
+        Log.i(TAG, "verifyEnhancedTrackingProtectionButton: Trying to verify that the \"Enhanced Tracking Protection\" button is visible")
         onView(withId(R.id.recycler_view)).perform(
             RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
                 hasDescendant(withText("Enhanced Tracking Protection")),
             ),
         ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyEnhancedTrackingProtectionButton: Verified that the \"Enhanced Tracking Protection\" button is visible")
     }
     fun verifyLoginsAndPasswordsButton() {
         scrollToElementByText("Logins and passwords")
+        Log.i(TAG, "verifyLoginsAndPasswordsButton: Trying to verify that the \"Logins and passwords\" button is visible")
         onView(withText(R.string.preferences_passwords_logins_and_passwords))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyLoginsAndPasswordsButton: Verified that the \"Logins and passwords\" button is visible")
     }
     fun verifyPrivateBrowsingButton() {
         scrollToElementByText("Private browsing")
+        Log.i(TAG, "verifyPrivateBrowsingButton: Waiting for $waitingTime ms until finding the \"Private browsing\" button")
         mDevice.wait(Until.findObject(By.text("Private browsing")), waitingTime)
+        Log.i(TAG, "verifyPrivateBrowsingButton: Waited for $waitingTime ms until the \"Private browsing\" button was found")
+        Log.i(TAG, "verifyPrivateBrowsingButton: Trying to verify that the \"Private browsing\" button is visible")
         onView(withText("Private browsing"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyPrivateBrowsingButton: Verified that the \"Private browsing\" button is visible")
     }
     fun verifySitePermissionsButton() {
         scrollToElementByText("Site permissions")
+        Log.i(TAG, "verifySitePermissionsButton: Trying to verify that the \"Site permissions\" button is visible")
         onView(withText("Site permissions"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifySitePermissionsButton: Verified that the \"Site permissions\" button is visible")
     }
     fun verifyDeleteBrowsingDataButton() {
         scrollToElementByText("Delete browsing data")
+        Log.i(TAG, "verifyDeleteBrowsingDataButton: Trying to verify that the \"Delete browsing data\" button is visible")
         onView(withText("Delete browsing data"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyDeleteBrowsingDataButton: Verified that the \"Delete browsing data\" button is visible")
     }
     fun verifyDeleteBrowsingDataOnQuitButton() {
         scrollToElementByText("Delete browsing data on quit")
+        Log.i(TAG, "verifyDeleteBrowsingDataOnQuitButton: Trying to verify that the \"Delete browsing data on quit\" button is visible")
         onView(withText("Delete browsing data on quit"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyDeleteBrowsingDataOnQuitButton: Verified that the \"Delete browsing data on quit\" button is visible")
     }
     fun verifyNotificationsButton() {
         scrollToElementByText("Notifications")
+        Log.i(TAG, "verifyNotificationsButton: Trying to verify that the \"Notifications\" button is visible")
         onView(withText("Notifications"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyNotificationsButton: Verified that the \"Notifications\" button is visible")
     }
     fun verifyDataCollectionButton() {
         scrollToElementByText("Data collection")
+        Log.i(TAG, "verifyDataCollectionButton: Trying to verify that the \"Data collection\" button is visible")
         onView(withText("Data collection"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyDataCollectionButton: Verified that the \"Data collection\" button is visible")
     }
     fun verifyOpenLinksInAppsButton() {
         scrollToElementByText("Open links in apps")
+        Log.i(TAG, "verifyOpenLinksInAppsButton: Trying to verify that the \"Open links in apps\" button is visible")
         openLinksInAppsButton()
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-        Log.i(TAG, "clickOpenLinksInAppsGoToSettingsCFRButton: Verified \"Open links in apps\" setting option")
+        Log.i(TAG, "verifyOpenLinksInAppsButton: Verified that the \"Open links in apps\" button is visible")
     }
     fun verifySettingsView() {
         scrollToElementByText("General")
+        Log.i(TAG, "verifySettingsView: Trying to verify that the \"General\" heading is visible")
         onView(withText("General"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifySettingsView: Verified that the \"General\" heading is visible")
         scrollToElementByText("Privacy and security")
+        Log.i(TAG, "verifySettingsView: Trying to verify that the \"Privacy and security\" heading is visible")
         onView(withText("Privacy and security"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifySettingsView: Verified that the \"Privacy and security\" heading is visible")
+        Log.i(TAG, "verifySettingsView: Trying to perform scroll to the \"Add-ons\" button")
         onView(withId(R.id.recycler_view)).perform(
             RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
                 hasDescendant(withText("Add-ons")),
             ),
         )
+        Log.i(TAG, "verifySettingsView: Performed scroll to the \"Add-ons\" button")
+        Log.i(TAG, "verifySettingsView: Trying to verify that the \"Add-ons\" button is completely displayed")
         onView(withText("Add-ons"))
             .check(matches(isCompletelyDisplayed()))
+        Log.i(TAG, "verifySettingsView: Verified that the \"Add-ons\" button is completely displayed")
+        Log.i(TAG, "verifySettingsView: Trying to perform ${LISTS_MAXSWIPES}x a scroll action to the end of the settings list")
         settingsList().scrollToEnd(LISTS_MAXSWIPES)
+        Log.i(TAG, "verifySettingsView: Performed ${LISTS_MAXSWIPES}x a scroll action to the end of the settings list")
+        Log.i(TAG, "verifySettingsView: Trying to verify that the \"About\" heading is visible")
         onView(withText("About"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifySettingsView: Verified that the \"About\" heading is visible")
     }
-    fun verifySettingsToolbar() =
+    fun verifySettingsToolbar() {
+        Log.i(TAG, "verifySettingsToolbar: Trying to verify that the navigate up button is visible")
         onView(
-            CoreMatchers.allOf(
+            allOf(
+                withId(R.id.navigationToolbar),
+                hasDescendant(withContentDescription(R.string.action_bar_up_description)),
+            ),
+        ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifySettingsToolbar: Verified that the navigate up button is visible")
+        Log.i(TAG, "verifySettingsToolbar: Trying to verify that the \"Settings\" toolbar title is visible")
+        onView(
+            allOf(
                 withId(R.id.navigationToolbar),
-                hasDescendant(ViewMatchers.withContentDescription(R.string.action_bar_up_description)),
                 hasDescendant(withText(R.string.settings)),
             ),
         ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifySettingsToolbar: Verified that the \"Settings\" toolbar title is visible")
+    }
 
     // ADVANCED SECTION
     fun verifyAdvancedHeading() {
+        Log.i(TAG, "verifyAdvancedHeading: Trying to perform scroll to the \"Add-ons\" button")
         onView(withId(R.id.recycler_view)).perform(
             RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
                 hasDescendant(withText("Add-ons")),
             ),
         )
-
+        Log.i(TAG, "verifyAdvancedHeading: Performed scroll to the \"Add-ons\" button")
+        Log.i(TAG, "verifyAdvancedHeading: Trying to verify that the \"Add-ons\" button is completely displayed")
         onView(withText("Add-ons"))
             .check(matches(isCompletelyDisplayed()))
+        Log.i(TAG, "verifyAdvancedHeading: Verified that the \"Add-ons\" button is completely displayed")
     }
     fun verifyAddons() {
+        Log.i(TAG, "verifyAddons: Trying to perform scroll to the \"Add-ons\" button")
         onView(withId(R.id.recycler_view)).perform(
             RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
                 hasDescendant(withText("Add-ons")),
             ),
         )
-
+        Log.i(TAG, "verifyAddons: Performed scroll to the \"Add-ons\" button")
+        Log.i(TAG, "verifyAddons: Trying to verify that the \"Add-ons\" button is completely displayed")
         addonsManagerButton()
             .check(matches(isCompletelyDisplayed()))
+        Log.i(TAG, "verifyAddons: Verified that the \"Add-ons\" button is completely displayed")
     }
 
-    fun verifyExternalDownloadManagerButton() =
+    fun verifyExternalDownloadManagerButton() {
+        Log.i(TAG, "verifyExternalDownloadManagerButton: Trying to verify that the \"External download manager\" button is visible")
         onView(
             withText(R.string.preferences_external_download_manager),
         ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyExternalDownloadManagerButton: Verified that the \"External download manager\" button is visible")
+    }
 
-    fun verifyExternalDownloadManagerToggle(enabled: Boolean) =
+    fun verifyExternalDownloadManagerToggle(enabled: Boolean) {
+        Log.i(TAG, "verifyExternalDownloadManagerToggle: Trying to verify that the \"External download manager\" toggle is enabled: $enabled")
         onView(withText(R.string.preferences_external_download_manager))
             .check(
                 matches(
@@ -281,8 +361,11 @@ class SettingsRobot {
                     ),
                 ),
             )
+        Log.i(TAG, "verifyExternalDownloadManagerToggle: Verified that the \"External download manager\" toggle is enabled: $enabled")
+    }
 
-    fun verifyLeakCanaryToggle(enabled: Boolean) =
+    fun verifyLeakCanaryToggle(enabled: Boolean) {
+        Log.i(TAG, "verifyLeakCanaryToggle: Trying to verify that the \"LeakCanary\" toggle is enabled: $enabled")
         onView(withText(R.string.preference_leakcanary))
             .check(
                 matches(
@@ -298,8 +381,11 @@ class SettingsRobot {
                     ),
                 ),
             )
+        Log.i(TAG, "verifyLeakCanaryToggle: Verified that the \"LeakCanary\" toggle is enabled: $enabled")
+    }
 
-    fun verifyRemoteDebuggingToggle(enabled: Boolean) =
+    fun verifyRemoteDebuggingToggle(enabled: Boolean) {
+        Log.i(TAG, "verifyRemoteDebuggingToggle: Trying to verify that the \"Remote debugging via USB\" toggle is enabled: $enabled")
         onView(withText(R.string.preferences_remote_debugging))
             .check(
                 matches(
@@ -315,38 +401,52 @@ class SettingsRobot {
                     ),
                 ),
             )
+        Log.i(TAG, "verifyRemoteDebuggingToggle: Verified that the \"Remote debugging via USB\" toggle is enabled: $enabled")
+    }
 
     // DEVELOPER TOOLS SECTION
     fun verifyRemoteDebuggingButton() {
         scrollToElementByText("Remote debugging via USB")
+        Log.i(TAG, "verifyRemoteDebuggingButton: Trying to verify that the \"Remote debugging via USB\" button is visible")
         onView(withText("Remote debugging via USB"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyRemoteDebuggingButton: Verified that the \"Remote debugging via USB\" button is visible")
     }
     fun verifyLeakCanaryButton() {
         scrollToElementByText("LeakCanary")
+        Log.i(TAG, "verifyLeakCanaryButton: Trying to verify that the \"LeakCanary\" button is visible")
         onView(withText("LeakCanary"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyLeakCanaryButton: Verified that the \"LeakCanary\" button is visible")
     }
 
     // ABOUT SECTION
     fun verifyAboutHeading() {
+        Log.i(TAG, "verifyAboutHeading: Trying to perform ${LISTS_MAXSWIPES}x a scroll action to the end of the settings list")
         settingsList().scrollToEnd(LISTS_MAXSWIPES)
+        Log.i(TAG, "verifyAboutHeading: Performed ${LISTS_MAXSWIPES}x a scroll action to the end of the settings list")
+        Log.i(TAG, "verifyAboutHeading: Trying to verify that the \"About\" heading is visible")
         onView(withText("About"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyAboutHeading: Verified that the \"About\" heading is visible")
     }
 
     fun verifyRateOnGooglePlay() = assertUIObjectExists(rateOnGooglePlayHeading())
     fun verifyAboutFirefoxPreview() = assertUIObjectExists(aboutFirefoxHeading())
     fun verifyGooglePlayRedirect() {
         if (isPackageInstalled(GOOGLE_PLAY_SERVICES)) {
+            Log.i(TAG, "verifyGooglePlayRedirect: $GOOGLE_PLAY_SERVICES is installed")
             try {
+                Log.i(TAG, "verifyGooglePlayRedirect: Trying to verify intent to: $GOOGLE_PLAY_SERVICES")
                 intended(
                     allOf(
                         hasAction(Intent.ACTION_VIEW),
                         hasData(Uri.parse(SupportUtils.RATE_APP_URL)),
                     ),
                 )
+                Log.i(TAG, "verifyGooglePlayRedirect: Verified intent to: $GOOGLE_PLAY_SERVICES")
             } catch (e: AssertionFailedError) {
+                Log.i(TAG, "verifyGooglePlayRedirect: AssertionFailedError caught, executing fallback methods")
                 BrowserRobot().verifyRateOnGooglePlayURL()
             }
         } else {
@@ -356,39 +456,51 @@ class SettingsRobot {
 
     fun verifySettingsOptionSummary(setting: String, summary: String) {
         scrollToElementByText(setting)
+        Log.i(TAG, "verifySettingsOptionSummary: Trying to verify that setting: $setting with summary:$summary is visible")
         onView(
             allOf(
                 withText(setting),
                 hasSibling(withText(summary)),
             ),
         ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifySettingsOptionSummary: Verified that setting: $setting with summary:$summary is visible")
     }
 
     class Transition {
         fun goBack(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
+            Log.i(TAG, "goBack: Trying to click the navigate up button")
             goBackButton().click()
+            Log.i(TAG, "goBack: Clicked the navigate up button")
 
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
         }
 
         fun goBackToOnboardingScreen(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
+            Log.i(TAG, "goBackToOnboardingScreen: Trying to click device back button")
             mDevice.pressBack()
+            Log.i(TAG, "goBackToOnboardingScreen: Clicked device back button")
+            Log.i(TAG, "goBackToOnboardingScreen: Waiting for device to be idle for $waitingTimeShort ms")
             mDevice.waitForIdle(waitingTimeShort)
+            Log.i(TAG, "goBackToOnboardingScreen: Device was idle for $waitingTimeShort ms")
 
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
         }
 
         fun goBackToBrowser(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            Log.i(TAG, "goBackToBrowser: Trying to click the navigate up button")
             goBackButton().click()
+            Log.i(TAG, "goBackToBrowser: Clicked the navigate up button")
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
 
         fun openAboutFirefoxPreview(interact: SettingsSubMenuAboutRobot.() -> Unit): SettingsSubMenuAboutRobot.Transition {
+            Log.i(TAG, "openAboutFirefoxPreview: Trying to click the \"About Firefox\" button")
             aboutFirefoxHeading().click()
+            Log.i(TAG, "openAboutFirefoxPreview: Clicked the \"About Firefox\" button")
             SettingsSubMenuAboutRobot().interact()
             return SettingsSubMenuAboutRobot.Transition()
         }
@@ -396,8 +508,12 @@ class SettingsRobot {
         fun openSearchSubMenu(interact: SettingsSubMenuSearchRobot.() -> Unit): SettingsSubMenuSearchRobot.Transition {
             itemWithText(getStringResource(R.string.preferences_search))
                 .also {
+                    Log.i(TAG, "openSearchSubMenu: Waiting for $waitingTimeShort ms for the \"Search\" button to exist")
                     it.waitForExists(waitingTimeShort)
+                    Log.i(TAG, "openSearchSubMenu: Waited for $waitingTimeShort ms for the \"Search\" button to exist")
+                    Log.i(TAG, "openSearchSubMenu: Trying to click the \"Search\" button")
                     it.click()
+                    Log.i(TAG, "openSearchSubMenu: Clicked the \"Search\" button")
                 }
 
             SettingsSubMenuSearchRobot().interact()
@@ -405,8 +521,9 @@ class SettingsRobot {
         }
 
         fun openCustomizeSubMenu(interact: SettingsSubMenuCustomizeRobot.() -> Unit): SettingsSubMenuCustomizeRobot.Transition {
-            fun customizeButton() = onView(withText("Customize"))
-            customizeButton().click()
+            Log.i(TAG, "openCustomizeSubMenu: Trying to click the \"Customize\" button")
+            onView(withText("Customize")).click()
+            Log.i(TAG, "openCustomizeSubMenu: Clicked the \"Customize\" button")
 
             SettingsSubMenuCustomizeRobot().interact()
             return SettingsSubMenuCustomizeRobot.Transition()
@@ -415,8 +532,12 @@ class SettingsRobot {
         fun openTabsSubMenu(interact: SettingsSubMenuTabsRobot.() -> Unit): SettingsSubMenuTabsRobot.Transition {
             itemWithText(getStringResource(R.string.preferences_tabs))
                 .also {
+                    Log.i(TAG, "openTabsSubMenu: Waiting for $waitingTime ms for the \"Tabs\" button to exist")
                     it.waitForExists(waitingTime)
+                    Log.i(TAG, "openTabsSubMenu: Waited for $waitingTime ms for the \"Tabs\" button to exist")
+                    Log.i(TAG, "openTabsSubMenu: Trying to click the \"Tabs\" button and wait for $waitingTimeShort ms for a new window")
                     it.clickAndWaitForNewWindow(waitingTimeShort)
+                    Log.i(TAG, "openTabsSubMenu: Clicked the \"Tabs\" button and wait for $waitingTimeShort ms for a new window")
                 }
 
             SettingsSubMenuTabsRobot().interact()
@@ -424,8 +545,12 @@ class SettingsRobot {
         }
 
         fun openHomepageSubMenu(interact: SettingsSubMenuHomepageRobot.() -> Unit): SettingsSubMenuHomepageRobot.Transition {
+            Log.i(TAG, "openHomepageSubMenu: Waiting for $waitingTime ms for the \"Homepage\" button to exist")
             mDevice.findObject(UiSelector().textContains("Homepage")).waitForExists(waitingTime)
+            Log.i(TAG, "openHomepageSubMenu: Waited for $waitingTime ms for the \"Homepage\" button to exist")
+            Log.i(TAG, "openHomepageSubMenu: Trying to click the \"Homepage\" button")
             onView(withText(R.string.preferences_home_2)).click()
+            Log.i(TAG, "openHomepageSubMenu: Clicked the \"Homepage\" button")
 
             SettingsSubMenuHomepageRobot().interact()
             return SettingsSubMenuHomepageRobot.Transition()
@@ -434,10 +559,12 @@ class SettingsRobot {
         fun openAutofillSubMenu(interact: SettingsSubMenuAutofillRobot.() -> Unit): SettingsSubMenuAutofillRobot.Transition {
             mDevice.findObject(UiSelector().textContains(getStringResource(R.string.preferences_autofill)))
                 .also {
-                    Log.i(TAG, "openAutofillSubMenu: Looking for \"Autofill\" settings button")
+                    Log.i(TAG, "openAutofillSubMenu: Waiting for $waitingTime ms for the \"Autofill\" button to exist")
                     it.waitForExists(waitingTime)
+                    Log.i(TAG, "openAutofillSubMenu: Waited for $waitingTime ms for the \"Autofill\" button to exist")
+                    Log.i(TAG, "openAutofillSubMenu: Trying to click the \"Autofill\" button")
                     it.click()
-                    Log.i(TAG, "openAutofillSubMenu: Clicked \"Autofill\" settings button")
+                    Log.i(TAG, "openAutofillSubMenu: Clicked the \"Autofill\" button")
                 }
 
             SettingsSubMenuAutofillRobot().interact()
@@ -446,11 +573,12 @@ class SettingsRobot {
 
         fun openAccessibilitySubMenu(interact: SettingsSubMenuAccessibilityRobot.() -> Unit): SettingsSubMenuAccessibilityRobot.Transition {
             scrollToElementByText("Accessibility")
-
-            fun accessibilityButton() = onView(withText("Accessibility"))
-            accessibilityButton()
-                .check(matches(isDisplayed()))
-                .click()
+            Log.i(TAG, "openAccessibilitySubMenu: Trying to verify that the \"Accessibility\" button is displayed")
+            onView(withText("Accessibility")).check(matches(isDisplayed()))
+            Log.i(TAG, "openAccessibilitySubMenu: Verified that the \"Accessibility\" button is displayed")
+            Log.i(TAG, "openAccessibilitySubMenu: Trying to click the \"Accessibility\" button")
+            onView(withText("Accessibility")).click()
+            Log.i(TAG, "openAccessibilitySubMenu: Clicked the \"Accessibility\" button")
 
             SettingsSubMenuAccessibilityRobot().interact()
             return SettingsSubMenuAccessibilityRobot.Transition()
@@ -460,6 +588,7 @@ class SettingsRobot {
             localizedText: String = getStringResource(R.string.preferences_language),
             interact: SettingsSubMenuLanguageRobot.() -> Unit,
         ): SettingsSubMenuLanguageRobot.Transition {
+            Log.i(TAG, "openLanguageSubMenu: Trying to click the $localizedText button")
             onView(withId(R.id.recycler_view))
                 .perform(
                     RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
@@ -469,6 +598,7 @@ class SettingsRobot {
                         ViewActions.click(),
                     ),
                 )
+            Log.i(TAG, "openLanguageSubMenu: Clicked the $localizedText button")
 
             SettingsSubMenuLanguageRobot().interact()
             return SettingsSubMenuLanguageRobot.Transition()
@@ -476,8 +606,9 @@ class SettingsRobot {
 
         fun openSetDefaultBrowserSubMenu(interact: SettingsSubMenuSetDefaultBrowserRobot.() -> Unit): SettingsSubMenuSetDefaultBrowserRobot.Transition {
             scrollToElementByText("Set as default browser")
-            fun setDefaultBrowserButton() = onView(withText("Set as default browser"))
-            setDefaultBrowserButton().click()
+            Log.i(TAG, "openSetDefaultBrowserSubMenu: Trying to click the \"Set as default browser\" button")
+            onView(withText("Set as default browser")).click()
+            Log.i(TAG, "openSetDefaultBrowserSubMenu: Clicked the \"Set as default browser\" button")
 
             SettingsSubMenuSetDefaultBrowserRobot().interact()
             return SettingsSubMenuSetDefaultBrowserRobot.Transition()
@@ -485,9 +616,9 @@ class SettingsRobot {
 
         fun openEnhancedTrackingProtectionSubMenu(interact: SettingsSubMenuEnhancedTrackingProtectionRobot.() -> Unit): SettingsSubMenuEnhancedTrackingProtectionRobot.Transition {
             scrollToElementByText("Enhanced Tracking Protection")
-            fun enhancedTrackingProtectionButton() =
-                onView(withText("Enhanced Tracking Protection"))
-            enhancedTrackingProtectionButton().click()
+            Log.i(TAG, "openEnhancedTrackingProtectionSubMenu: Trying to click the \"Enhanced Tracking Protection\" button")
+            onView(withText("Enhanced Tracking Protection")).click()
+            Log.i(TAG, "openEnhancedTrackingProtectionSubMenu: Clicked the \"Enhanced Tracking Protection\" button")
 
             SettingsSubMenuEnhancedTrackingProtectionRobot().interact()
             return SettingsSubMenuEnhancedTrackingProtectionRobot.Transition()
@@ -495,16 +626,18 @@ class SettingsRobot {
 
         fun openLoginsAndPasswordSubMenu(interact: SettingsSubMenuLoginsAndPasswordRobot.() -> Unit): SettingsSubMenuLoginsAndPasswordRobot.Transition {
             scrollToElementByText("Logins and passwords")
-            fun loginsAndPasswordsButton() = onView(withText("Logins and passwords"))
-            loginsAndPasswordsButton().click()
+            Log.i(TAG, "openLoginsAndPasswordSubMenu: Trying to click the \"Logins and passwords\" button")
+            onView(withText("Logins and passwords")).click()
+            Log.i(TAG, "openLoginsAndPasswordSubMenu: Clicked the \"Logins and passwords\" button")
 
             SettingsSubMenuLoginsAndPasswordRobot().interact()
             return SettingsSubMenuLoginsAndPasswordRobot.Transition()
         }
 
         fun openTurnOnSyncMenu(interact: SettingsTurnOnSyncRobot.() -> Unit): SettingsTurnOnSyncRobot.Transition {
-            fun turnOnSyncButton() = onView(withText("Sync and save your data"))
-            turnOnSyncButton().click()
+            Log.i(TAG, "openTurnOnSyncMenu: Trying to click the \"Sync and save your data\" button")
+            onView(withText("Sync and save your data")).click()
+            Log.i(TAG, "openTurnOnSyncMenu: Clicked the \"Sync and save your data\" button")
 
             SettingsTurnOnSyncRobot().interact()
             return SettingsTurnOnSyncRobot.Transition()
@@ -512,8 +645,9 @@ class SettingsRobot {
 
         fun openPrivateBrowsingSubMenu(interact: SettingsSubMenuPrivateBrowsingRobot.() -> Unit): SettingsSubMenuPrivateBrowsingRobot.Transition {
             scrollToElementByText("Private browsing")
-            fun privateBrowsingButton() = mDevice.findObject(textContains("Private browsing"))
-            privateBrowsingButton().click()
+            Log.i(TAG, "openPrivateBrowsingSubMenu: Trying to click the \"Private browsing\" button")
+            mDevice.findObject(textContains("Private browsing")).click()
+            Log.i(TAG, "openPrivateBrowsingSubMenu: Clicked the \"Private browsing\" button")
 
             SettingsSubMenuPrivateBrowsingRobot().interact()
             return SettingsSubMenuPrivateBrowsingRobot.Transition()
@@ -521,8 +655,9 @@ class SettingsRobot {
 
         fun openSettingsSubMenuSitePermissions(interact: SettingsSubMenuSitePermissionsRobot.() -> Unit): SettingsSubMenuSitePermissionsRobot.Transition {
             scrollToElementByText("Site permissions")
-            fun sitePermissionButton() = mDevice.findObject(textContains("Site permissions"))
-            sitePermissionButton().click()
+            Log.i(TAG, "openSettingsSubMenuSitePermissions: Trying to click the \"Site permissions\" button")
+            mDevice.findObject(textContains("Site permissions")).click()
+            Log.i(TAG, "openSettingsSubMenuSitePermissions: Clicked the \"Site permissions\" button")
 
             SettingsSubMenuSitePermissionsRobot().interact()
             return SettingsSubMenuSitePermissionsRobot.Transition()
@@ -530,8 +665,9 @@ class SettingsRobot {
 
         fun openSettingsSubMenuDeleteBrowsingData(interact: SettingsSubMenuDeleteBrowsingDataRobot.() -> Unit): SettingsSubMenuDeleteBrowsingDataRobot.Transition {
             scrollToElementByText("Delete browsing data")
-            fun deleteBrowsingDataButton() = mDevice.findObject(textContains("Delete browsing data"))
-            deleteBrowsingDataButton().click()
+            Log.i(TAG, "openSettingsSubMenuDeleteBrowsingData: Trying to click the \"Delete browsing data\" button")
+            mDevice.findObject(textContains("Delete browsing data")).click()
+            Log.i(TAG, "openSettingsSubMenuDeleteBrowsingData: Clicked the \"Delete browsing data\" button")
 
             SettingsSubMenuDeleteBrowsingDataRobot().interact()
             return SettingsSubMenuDeleteBrowsingDataRobot.Transition()
@@ -539,8 +675,9 @@ class SettingsRobot {
 
         fun openSettingsSubMenuDeleteBrowsingDataOnQuit(interact: SettingsSubMenuDeleteBrowsingDataOnQuitRobot.() -> Unit): SettingsSubMenuDeleteBrowsingDataOnQuitRobot.Transition {
             scrollToElementByText("Delete browsing data on quit")
-            fun deleteBrowsingDataOnQuitButton() = mDevice.findObject(textContains("Delete browsing data on quit"))
-            deleteBrowsingDataOnQuitButton().click()
+            Log.i(TAG, "openSettingsSubMenuDeleteBrowsingDataOnQuit: Trying to click the \"Delete browsing data on quit\" button")
+            mDevice.findObject(textContains("Delete browsing data on quit")).click()
+            Log.i(TAG, "openSettingsSubMenuDeleteBrowsingDataOnQuit: Clicked the \"Delete browsing data on quit\" button")
 
             SettingsSubMenuDeleteBrowsingDataOnQuitRobot().interact()
             return SettingsSubMenuDeleteBrowsingDataOnQuitRobot.Transition()
@@ -548,8 +685,9 @@ class SettingsRobot {
 
         fun openSettingsSubMenuNotifications(interact: SystemSettingsRobot.() -> Unit): SystemSettingsRobot.Transition {
             scrollToElementByText("Notifications")
-            fun notificationsButton() = mDevice.findObject(textContains("Notifications"))
-            notificationsButton().click()
+            Log.i(TAG, "openSettingsSubMenuNotifications: Trying to click the \"Notifications\" button")
+            mDevice.findObject(textContains("Notifications")).click()
+            Log.i(TAG, "openSettingsSubMenuNotifications: Clicked the \"Notifications\" button")
 
             SystemSettingsRobot().interact()
             return SystemSettingsRobot.Transition()
@@ -557,22 +695,27 @@ class SettingsRobot {
 
         fun openSettingsSubMenuDataCollection(interact: SettingsSubMenuDataCollectionRobot.() -> Unit): SettingsSubMenuDataCollectionRobot.Transition {
             scrollToElementByText("Data collection")
-            fun dataCollectionButton() = mDevice.findObject(textContains("Data collection"))
-            dataCollectionButton().click()
+            Log.i(TAG, "openSettingsSubMenuDataCollection: Trying to click the \"Data collection\" button")
+            mDevice.findObject(textContains("Data collection")).click()
+            Log.i(TAG, "openSettingsSubMenuDataCollection: Clicked the \"Data collection\" button")
 
             SettingsSubMenuDataCollectionRobot().interact()
             return SettingsSubMenuDataCollectionRobot.Transition()
         }
 
         fun openAddonsManagerMenu(interact: SettingsSubMenuAddonsManagerRobot.() -> Unit): SettingsSubMenuAddonsManagerRobot.Transition {
+            Log.i(TAG, "openAddonsManagerMenu: Trying to click the \"Add-ons\" button")
             addonsManagerButton().click()
+            Log.i(TAG, "openAddonsManagerMenu: Clicked the \"Add-ons\" button")
 
             SettingsSubMenuAddonsManagerRobot().interact()
             return SettingsSubMenuAddonsManagerRobot.Transition()
         }
 
         fun openOpenLinksInAppsMenu(interact: SettingsSubMenuOpenLinksInAppsRobot.() -> Unit): SettingsSubMenuOpenLinksInAppsRobot.Transition {
+            Log.i(TAG, "openOpenLinksInAppsMenu: Trying to click the \"Open links in apps\" button")
             openLinksInAppsButton().click()
+            Log.i(TAG, "openOpenLinksInAppsMenu: Clicked the \"Open links in apps\" button")
 
             SettingsSubMenuOpenLinksInAppsRobot().interact()
             return SettingsSubMenuOpenLinksInAppsRobot.Transition()
@@ -580,7 +723,9 @@ class SettingsRobot {
 
         fun openHttpsOnlyModeMenu(interact: SettingsSubMenuHttpsOnlyModeRobot.() -> Unit): SettingsSubMenuHttpsOnlyModeRobot.Transition {
             scrollToElementByText("HTTPS-Only Mode")
+            Log.i(TAG, "openHttpsOnlyModeMenu: Trying to click the \"HTTPS-Only Mode\" button")
             onView(withText(getStringResource(R.string.preferences_https_only_title))).click()
+            Log.i(TAG, "openHttpsOnlyModeMenu: Clicked the \"HTTPS-Only Mode\" button")
             mDevice.waitNotNull(
                 Until.findObjects(By.res("$packageName:id/https_only_switch")),
                 waitingTime,
@@ -611,7 +756,9 @@ fun settingsScreen(interact: SettingsRobot.() -> Unit): SettingsRobot.Transition
 
 private fun toggleDefaultBrowserSwitch() {
     scrollToElementByText("Privacy and security")
+    Log.i(TAG, "toggleDefaultBrowserSwitch: Trying to click the \"Set as default browser\" button")
     onView(withText("Set as default browser")).perform(ViewActions.click())
+    Log.i(TAG, "toggleDefaultBrowserSwitch: Clicked the \"Set as default browser\" button")
 }
 
 private fun openLinksInAppsButton() = onView(withText(R.string.preferences_open_links_in_apps))
@@ -649,7 +796,7 @@ fun clickRateButtonGooglePlay() {
 private fun addonsManagerButton() = onView(withText(R.string.preferences_addons))
 
 private fun goBackButton() =
-    onView(CoreMatchers.allOf(ViewMatchers.withContentDescription("Navigate up")))
+    onView(CoreMatchers.allOf(withContentDescription("Navigate up")))
 
 private fun settingsList() =
     UiScrollable(UiSelector().resourceId("$packageName:id/recycler_view"))

From e1fc09fe7e1289b6fab62d949e05e890d9d26f6e Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 15 Feb 2024 14:14:23 +0200
Subject: [PATCH 175/222] Bug 1880466 - Remove redundant assertion functions
 from SettingsSubMenuAccessibilityRobot

---
 .../SettingsSubMenuAccessibilityRobot.kt      | 94 +++++++------------
 1 file changed, 36 insertions(+), 58 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAccessibilityRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAccessibilityRobot.kt
index 26655f2da..170cf4a37 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAccessibilityRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAccessibilityRobot.kt
@@ -50,17 +50,48 @@ class SettingsSubMenuAccessibilityRobot {
         const val TEXT_SIZE = 16f
     }
 
-    fun verifyAutomaticFontSizingMenuItems() = assertAutomaticFontSizingMenuItems()
-
     fun clickFontSizingSwitch() = toggleFontSizingSwitch()
 
-    fun verifyEnabledMenuItems() = assertEnabledMenuItems()
+    fun verifyEnabledMenuItems() {
+        val view = onView(withText("Font Size"))
+        view.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+            .check(matches(isEnabled(true)))
+
+        val strFont = "Make text on websites larger or smaller"
+        onView(withText(strFont))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+            .check(matches(isEnabled(true)))
+
+        onView(withId(org.mozilla.fenix.R.id.sampleText))
+            .check(matches(withText("This is sample text. It is here to show how text will appear when you increase or decrease the size with this setting.")))
+
+        onView(withId(org.mozilla.fenix.R.id.seekbar_value))
+            .check(matches(withText("100%")))
+
+        onView(withId(org.mozilla.fenix.R.id.seekbar))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
+
+    fun verifyMenuItemsAreDisabled() {
+        onView(withText("Font Size")).assertIsEnabled(false)
+
+        val strFont = "Make text on websites larger or smaller"
+
+        onView(withText(strFont)).assertIsEnabled(false)
+
+        onView(withId(org.mozilla.fenix.R.id.sampleText)).assertIsEnabled(false)
 
-    fun verifyMenuItemsAreDisabled() = assertMenuItemsAreDisabled()
+        onView(withId(org.mozilla.fenix.R.id.seekbar_value)).assertIsEnabled(false)
+
+        onView(withId(org.mozilla.fenix.R.id.seekbar)).assertIsEnabled(false)
+    }
 
     fun changeTextSizeSlider(seekBarPercentage: Int) = adjustTextSizeSlider(seekBarPercentage)
 
-    fun verifyTextSizePercentage(textSize: Int) = assertTextSizePercentage(textSize)
+    fun verifyTextSizePercentage(textSize: Int) {
+        onView(withId(org.mozilla.fenix.R.id.sampleText))
+            .check(textSizePercentageEquals(textSize))
+    }
 
     class Transition {
         fun goBack(interact: SettingsRobot.() -> Unit): SettingsRobot.Transition {
@@ -73,14 +104,6 @@ class SettingsSubMenuAccessibilityRobot {
     }
 }
 
-private fun assertAutomaticFontSizingMenuItems() {
-    onView(withText("Automatic font sizing"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-    val strFont = "Font size will match your Android settings. Disable to manage font size here."
-    onView(withText(strFont))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
 private fun toggleFontSizingSwitch() {
     // Toggle font size to off
     onView(withText("Automatic font sizing"))
@@ -88,56 +111,11 @@ private fun toggleFontSizingSwitch() {
         .perform(click())
 }
 
-private fun assertEnabledMenuItems() {
-    assertFontSize()
-    assertSliderBar()
-}
-
-private fun assertFontSize() {
-    val view = onView(withText("Font Size"))
-    view.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-        .check(matches(isEnabled(true)))
-    val strFont = "Make text on websites larger or smaller"
-    onView(withText(strFont))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-        .check(matches(isEnabled(true)))
-}
-
-private fun assertSliderBar() {
-    onView(withId(org.mozilla.fenix.R.id.sampleText))
-        .check(matches(withText("This is sample text. It is here to show how text will appear when you increase or decrease the size with this setting.")))
-
-    onView(withId(org.mozilla.fenix.R.id.seekbar_value))
-        .check(matches(withText("100%")))
-
-    onView(withId(org.mozilla.fenix.R.id.seekbar))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-}
-
 private fun adjustTextSizeSlider(seekBarPercentage: Int) {
     onView(withId(org.mozilla.fenix.R.id.seekbar))
         .perform(SeekBarChangeProgressViewAction(seekBarPercentage))
 }
 
-private fun assertTextSizePercentage(textSize: Int) {
-    onView(withId(org.mozilla.fenix.R.id.sampleText))
-        .check(textSizePercentageEquals(textSize))
-}
-
-private fun assertMenuItemsAreDisabled() {
-    onView(withText("Font Size")).assertIsEnabled(false)
-
-    val strFont = "Make text on websites larger or smaller"
-
-    onView(withText(strFont)).assertIsEnabled(false)
-
-    onView(withId(org.mozilla.fenix.R.id.sampleText)).assertIsEnabled(false)
-
-    onView(withId(org.mozilla.fenix.R.id.seekbar_value)).assertIsEnabled(false)
-
-    onView(withId(org.mozilla.fenix.R.id.seekbar)).assertIsEnabled(false)
-}
-
 private fun goBackButton() =
     onView(allOf(withContentDescription("Navigate up")))
 

From a66d8287c8616905f1a8d6ad86610593f529b9b9 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 15 Feb 2024 15:39:03 +0200
Subject: [PATCH 176/222] Bug 1880466 - Add logs to
 SettingsSubMenuAccessibilityRobot

---
 .../SettingsSubMenuAccessibilityRobot.kt      | 72 ++++++++++++-------
 1 file changed, 48 insertions(+), 24 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAccessibilityRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAccessibilityRobot.kt
index 170cf4a37..77c5650ab 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAccessibilityRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAccessibilityRobot.kt
@@ -6,6 +6,7 @@
 
 package org.mozilla.fenix.ui.robots
 
+import android.util.Log
 import android.view.KeyEvent
 import android.view.KeyEvent.ACTION_DOWN
 import android.view.KeyEvent.KEYCODE_DPAD_LEFT
@@ -28,7 +29,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.platform.app.InstrumentationRegistry
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.Matcher
+import org.junit.Assert.assertTrue
 import org.mozilla.fenix.components.Components
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.assertIsEnabled
 import org.mozilla.fenix.helpers.isEnabled
@@ -53,50 +56,65 @@ class SettingsSubMenuAccessibilityRobot {
     fun clickFontSizingSwitch() = toggleFontSizingSwitch()
 
     fun verifyEnabledMenuItems() {
-        val view = onView(withText("Font Size"))
-        view.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-            .check(matches(isEnabled(true)))
-
-        val strFont = "Make text on websites larger or smaller"
-        onView(withText(strFont))
-            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-            .check(matches(isEnabled(true)))
-
+        Log.i(TAG, "verifyEnabledMenuItems: Trying to verify that the \"Font Size\" title is visible")
+        onView(withText("Font Size")).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyEnabledMenuItems: Verified that the \"Font Size\" title is visible")
+        Log.i(TAG, "verifyEnabledMenuItems: Trying to verify that the \"Font Size\" title is enabled")
+        onView(withText("Font Size")).check(matches(isEnabled(true)))
+        Log.i(TAG, "verifyEnabledMenuItems: Verified that the \"Font Size\" title is enabled")
+        Log.i(TAG, "verifyEnabledMenuItems: Trying to verify that the \"Make text on websites larger or smaller\" summary is visible")
+        onView(withText("Make text on websites larger or smaller")).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyEnabledMenuItems: Verified that the \"Make text on websites larger or smaller\" summary is visible")
+        Log.i(TAG, "verifyEnabledMenuItems: Trying to verify that the \"Make text on websites larger or smaller\" summary is enabled")
+        onView(withText("Make text on websites larger or smaller")).check(matches(isEnabled(true)))
+        Log.i(TAG, "verifyEnabledMenuItems: Verified that the \"Make text on websites larger or smaller\" summary is enabled")
+        Log.i(TAG, "verifyEnabledMenuItems: Trying to verify the \"This is sample text. It is here to show how text will appear\" sample text")
         onView(withId(org.mozilla.fenix.R.id.sampleText))
             .check(matches(withText("This is sample text. It is here to show how text will appear when you increase or decrease the size with this setting.")))
-
-        onView(withId(org.mozilla.fenix.R.id.seekbar_value))
-            .check(matches(withText("100%")))
-
-        onView(withId(org.mozilla.fenix.R.id.seekbar))
-            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyEnabledMenuItems: Verified the \"This is sample text. It is here to show how text will appear\" sample text")
+        Log.i(TAG, "verifyEnabledMenuItems: Trying to verify that the seek bar value is set to 100%")
+        onView(withId(org.mozilla.fenix.R.id.seekbar_value)).check(matches(withText("100%")))
+        Log.i(TAG, "verifyEnabledMenuItems: Verified that the seek bar value is set to 100%")
+        Log.i(TAG, "verifyEnabledMenuItems: Trying to verify that the seek bar is visible")
+        onView(withId(org.mozilla.fenix.R.id.seekbar)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyEnabledMenuItems: Verified that the seek bar is visible")
     }
 
     fun verifyMenuItemsAreDisabled() {
+        Log.i(TAG, "verifyMenuItemsAreDisabled: Trying to verify that the \"Font Size\" title is not enabled")
         onView(withText("Font Size")).assertIsEnabled(false)
-
-        val strFont = "Make text on websites larger or smaller"
-
-        onView(withText(strFont)).assertIsEnabled(false)
-
+        Log.i(TAG, "verifyMenuItemsAreDisabled: Verified that the \"Font Size\" title is not enabled")
+        Log.i(TAG, "verifyMenuItemsAreDisabled: Trying to verify that the \"Make text on websites larger or smaller\" summary is not enabled")
+        onView(withText("Make text on websites larger or smaller")).assertIsEnabled(false)
+        Log.i(TAG, "verifyMenuItemsAreDisabled: Verified that the \"Make text on websites larger or smaller\" summary is not enabled")
+        Log.i(TAG, "verifyMenuItemsAreDisabled: Trying to verify that the \"This is sample text. It is here to show how text will appear\" sample text is not enabled")
         onView(withId(org.mozilla.fenix.R.id.sampleText)).assertIsEnabled(false)
-
+        Log.i(TAG, "verifyMenuItemsAreDisabled: Verified that the \"This is sample text. It is here to show how text will appear\" sample text is not enabled")
+        Log.i(TAG, "verifyMenuItemsAreDisabled: Trying to verify that the seek bar value is not enabled")
         onView(withId(org.mozilla.fenix.R.id.seekbar_value)).assertIsEnabled(false)
-
+        Log.i(TAG, "verifyMenuItemsAreDisabled: Verified that the seek bar value is not enabled")
+        Log.i(TAG, "verifyMenuItemsAreDisabled: Trying to verify that the seek bar is not enabled")
         onView(withId(org.mozilla.fenix.R.id.seekbar)).assertIsEnabled(false)
+        Log.i(TAG, "verifyMenuItemsAreDisabled: Verified that the seek bar is not enabled")
     }
 
     fun changeTextSizeSlider(seekBarPercentage: Int) = adjustTextSizeSlider(seekBarPercentage)
 
     fun verifyTextSizePercentage(textSize: Int) {
+        Log.i(TAG, "verifyTextSizePercentage: Trying to verify that the text size percentage is set to: $textSize")
         onView(withId(org.mozilla.fenix.R.id.sampleText))
             .check(textSizePercentageEquals(textSize))
+        Log.i(TAG, "verifyTextSizePercentage: Verified that the text size percentage is set to: $textSize")
     }
 
     class Transition {
         fun goBack(interact: SettingsRobot.() -> Unit): SettingsRobot.Transition {
+            Log.i(TAG, "goBack: Waiting for device to be idle")
             mDevice.waitForIdle()
+            Log.i(TAG, "goBack: Waited for device to be idle")
+            Log.i(TAG, "goBack: Trying to click the navigate up toolbar button")
             goBackButton().perform(click())
+            Log.i(TAG, "goBack: Clicked the navigate up toolbar button")
 
             SettingsRobot().interact()
             return SettingsRobot.Transition()
@@ -105,15 +123,19 @@ class SettingsSubMenuAccessibilityRobot {
 }
 
 private fun toggleFontSizingSwitch() {
+    Log.i(TAG, "toggleFontSizingSwitch: Trying to click the \"Automatic font sizing\" toggle")
     // Toggle font size to off
     onView(withText("Automatic font sizing"))
         .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
         .perform(click())
+    Log.i(TAG, "toggleFontSizingSwitch: Clicked the \"Automatic font sizing\" toggle")
 }
 
 private fun adjustTextSizeSlider(seekBarPercentage: Int) {
+    Log.i(TAG, "adjustTextSizeSlider: Trying to set the seek bar value to: $seekBarPercentage")
     onView(withId(org.mozilla.fenix.R.id.seekbar))
         .perform(SeekBarChangeProgressViewAction(seekBarPercentage))
+    Log.i(TAG, "adjustTextSizeSlider: Seek bar value was set to: $seekBarPercentage")
 }
 
 private fun goBackButton() =
@@ -167,9 +189,11 @@ fun calculateStepSizeFromPercentage(textSizePercentage: Int): Int {
     return ((textSizePercentage - MIN_VALUE) / STEP_SIZE)
 }
 
-fun checkTextSizeOnWebsite(textSizePercentage: Int, components: Components): Boolean {
+fun checkTextSizeOnWebsite(textSizePercentage: Int, components: Components) {
+    Log.i(TAG, "checkTextSizeOnWebsite: Trying to verify that text size on website is: $textSizePercentage")
     // Checks the Gecko engine settings for the font size
     val textSize = calculateStepSizeFromPercentage(textSizePercentage)
     val newTextScale = ((textSize * STEP_SIZE) + MIN_VALUE).toFloat() / DECIMAL_CONVERSION
-    return components.core.engine.settings.fontSizeFactor == newTextScale
+    assertTrue("$TAG: text size on website was not set to: $textSizePercentage", components.core.engine.settings.fontSizeFactor == newTextScale)
+    Log.i(TAG, "checkTextSizeOnWebsite: Verified that text size on website is: $textSizePercentage")
 }

From bff1d7d16ab691e7003dfb3e71c5790fadd6c013 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Thu, 15 Feb 2024 09:16:24 -0500
Subject: [PATCH 177/222] Bug 1880494 - Update JUnit5 to version 5.10.2

---
 .../fenixdependencies/src/main/java/FenixDependenciesPlugin.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
index 0cdb5a6d1..5916113c3 100644
--- a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+++ b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
@@ -32,7 +32,7 @@ object FenixVersions {
     const val adjust = "4.38.1"
     const val installreferrer = "2.2"
 
-    const val junit = "5.9.3"
+    const val junit = "5.10.2"
     const val mockk = "1.13.9"
 
     const val google_ads_id_version = "16.0.0"

From 5bbee4c6795d912c3c154138069a897a097f9ee4 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Thu, 15 Feb 2024 16:51:35 +0000
Subject: [PATCH 178/222] Import translations from android-l10n

---
 app/src/main/res/values-azb/strings.xml    | 42 +++++++++++++++++++---
 app/src/main/res/values-bs/strings.xml     |  3 ++
 app/src/main/res/values-fy-rNL/strings.xml |  3 ++
 app/src/main/res/values-it/strings.xml     |  2 +-
 app/src/main/res/values-zh-rCN/strings.xml |  3 ++
 5 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index 06f3ceead..596ba4638 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -544,7 +544,7 @@
     <string name="preferences_override_sync_tokenserver">اؤزل دؤنگل سرور</string>
 
     <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
-    <string name="toast_override_account_sync_server_done">موْزیلا حسابیْ/دؤنگل سروری دگیشدیریلدی. دگیشمه‌لری یئرینه سالماق اوچون اپلیکیشن‌دن چیخیلیر...</string>
+    <string name="toast_override_account_sync_server_done">موْزیلا حسابیْ/دؤنگل سروری دگیشدیریلدی. دگیشمه‌لری یئرینه سالماق اوچون اپلیکیشن‌دن چیخیلیر…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">حساب</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -614,7 +614,7 @@
     <!-- Preference for enabling gecko engine logs -->
     <string name="preferences_enable_gecko_logs">Gecko قیدلرینی گوجلندیر</string>
     <!-- Message to indicate users that we are quitting the application to apply the changes -->
-    <string name="quit_application">دگیشمه‌لری یئرینه سالماق اوچون اپلیکیشن‌دن چیْخیلیر...</string>
+    <string name="quit_application">دگیشمه‌لری یئرینه سالماق اوچون اپلیکیشن‌دن چیْخیلیر…</string>
 
     <!-- Preference for add_ons -->
     <string name="preferences_addons">تاخیلان‌لار</string>
@@ -641,7 +641,7 @@
     <!-- Hint displayed on input field for custom collection user ID-->
     <string name="customize_addon_collection_user_hint">مجموعه صاحیبی (قوللانیجیْ آیدی‌سی)</string>
     <!-- Toast shown after confirming the custom add-on collection configuration -->
-    <string name="toast_customize_addon_collection_done">تاخیْلان مجموعه‌‌سی ایصلاح اوْلدوُ. دگیشمه‌لری یئرینه سالماق اوچون اپلیکیشن‌دن چیْخیلیر...</string>
+    <string name="toast_customize_addon_collection_done">تاخیْلان مجموعه‌‌سی ایصلاح اوْلدوُ. دگیشمه‌لری یئرینه سالماق اوچون اپلیکیشن‌دن چیْخیلیر…</string>
 
     <!-- Customize Home -->
     <!-- Header text for jumping back into the recent tab in customize the home screen -->
@@ -662,6 +662,9 @@
     <!-- Title for the opening wallpaper settings screen -->
     <string name="customize_wallpapers">دال پرده‌لر</string>
 
+    <!-- Title for the customize home screen section with sponsored shortcuts. -->
+    <string name="customize_toggle_contile">اسپانسرلی شوْرتکات‌لار</string>
+
     <!-- Wallpapers -->
     <!-- Content description for various wallpapers. The first parameter is the name of the wallpaper -->
     <string name="wallpapers_item_name_content_description">دال پرده: %1$s</string>
@@ -686,6 +689,37 @@
     <!-- Description text for the artist series wallpapers with learn more link. The first parameter is the learn more string defined in wallpaper_learn_more. "Independent voices" is the name of the wallpaper collection -->
     <string name="wallpaper_artist_series_description_with_learn_more">باغیْمسیز سس‌لر مجموعه‌سی. %s</string>
 
+    <!-- Description text for the artist series wallpapers. "Independent voices" is the name of the wallpaper collection -->
+    <string name="wallpaper_artist_series_description">باغیْمسیز سس‌لر مجموعه‌سی.</string>
+    <!-- Wallpaper onboarding dialog header text. -->
+    <string name="wallpapers_onboarding_dialog_title_text">بیر رنگ سپمه‌سی ایمتیحان ائله‌یین</string>
+    <!-- Wallpaper onboarding dialog body text. -->
+    <string name="wallpapers_onboarding_dialog_body_text">سیزینله دانیشان بیر دال پرده سئچین.</string>
+    <!-- Wallpaper onboarding dialog learn more button text. The button navigates to the wallpaper settings screen. -->
+    <string name="wallpapers_onboarding_dialog_explore_more_button_text">داها چوْخ دال پرده‌لری آراشدیْرین</string>
+
+    <!-- Add-ons general availability nimbus message-->
+    <!-- Title of the Nimbus message for add-ons general availability-->
+    <string name="addon_ga_message_title" tools:ignore="UnusedResources">ایندی یئنی تاخیْلان‌لار وار</string>
+    <!-- Body of the Nimbus message for add-ons general availability. 'Firefox' intentionally hardcoded here-->
+    <string name="addon_ga_message_body" tools:ignore="UnusedResources">فایرفاکسیْ اؤزوُنوز ائتمک ایمکانیْ وئرن 100 دن چوْخ یئنی اوُزانتیا باخیْن.</string>
+    <!-- Button text of the Nimbus message for add-ons general availability. -->
+    <string name="addon_ga_message_button" tools:ignore="UnusedResources">تاخیلان‌لاریْ آراشدیْر</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">تاخیلان‌لار گئچیجی اوْلاراق گوُجدن سالیْنمیش.</string>
+
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">بیر و یا نئچه تاخیْلانین ایشی دایاندیریلدیْ، بوُدا سیستمیزی ثابیتسیز ائله‌دی. %1$s تاخیلانی(لاریْ) یئنی‌دن باشلاتماغا باشاریْسیز اوْلدو. \n\n تاخیلانلار ایندیکی اوتورومونوزدا یئنی‌دن ایشه سالیْنمیاجاق. \n\n تاخیلانی(لار)ین سیلینمه‌سی و یا ایشدن سالینماسیْ بو موُشکولو حل ائلیه بیلر.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">تاخیلان‌لاریْ یئنی‌دن باشلاتماغا چالیْشین</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">تاخیلان‌لاریْ گوُجسوز ائتمه‌گه ایدامه وئرین</string>
+
+    <!-- Account Preferences -->
+    <!-- Preference for managing your account via accounts.firefox.com -->
+    <string name="preferences_manage_account">حساب مودیریتی</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">ایندی دؤنگل‌لندیر</string>
     <!-- Preference for syncing history -->
@@ -707,7 +741,7 @@
     <!-- Text shown when user enters empty device name -->
     <string name="empty_device_name_error">جهاز آدیْ بوْش اوْلمالیدیر</string>
     <!-- Label indicating that sync is in progress -->
-    <string name="sync_syncing_in_progress">دؤنگل‌لنیر...</string>
+    <string name="sync_syncing_in_progress">دؤنگل‌لنیر…</string>
     <!-- Label summary indicating that sync failed. The first parameter is the date stamp showing last time it succeeded -->
     <string name="sync_failed_summary">دؤنگل خطا وئردی. سوْن باشاریْ: %s</string>
 
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 819e7f7a9..053b30d78 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -2141,6 +2141,9 @@
     <string name="other_default_search_engine_suggestion_header">%s pretraga</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Promijenite svoj zadani pretraživač</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Postavi automatsko otvaranje linkova web stranica, e-maila i poruka u Firefoxu.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 2c2948d36..3a89ca170 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -2171,6 +2171,9 @@
     <string name="other_default_search_engine_suggestion_header">Sykje mei %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Jo standertbrowser wikselje</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Keppelingen fan websites, e-mail en berjochten automatysk yn Firefox iepenje.</string>
 
     <!-- Content description for close button in collection placeholder. -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e7ee8061b..a7bbe317c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -98,7 +98,7 @@
 
     <!-- Total cookie protection "contextual feature recommendation" (CFR) -->
     <!-- Text for the message displayed in the contextual feature recommendation popup promoting the total cookie protection feature. -->
-    <string name="tcp_cfr_message">La funzione per la protezione della privacy più potente che abbiamo mai realizzato isola gli elementi traccianti tra i siti.</string>
+    <string name="tcp_cfr_message">La funzione per la protezione della privacy più potente che abbiamo mai realizzato: isola gli elementi che ti tracciano attraverso siti diversi.</string>
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">Ulteriori informazioni sulla Protezione totale per i cookie</string>
 
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 247d17f85..8e192a27d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2223,6 +2223,9 @@
     <string name="other_default_search_engine_suggestion_header">%s · 搜索</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">切换默认浏览器</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">将网站、电子邮件及聊天工具中的链接设为在 Firefox 中自动打开。</string>
 
     <!-- Content description for close button in collection placeholder. -->

From f13948c9e69958391e9cd7eb29444290c4d74f4f Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Wed, 24 Jan 2024 16:09:04 -0500
Subject: [PATCH 179/222] Bug 1876385 - Update AndroidX Benchmark to version
 1.2.3

---
 .../fenixdependencies/src/main/java/FenixDependenciesPlugin.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
index 5916113c3..39ed6cf1d 100644
--- a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+++ b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
@@ -19,7 +19,7 @@ object FenixVersions {
     const val fastlane = "2.1.1"
 
     const val androidx_activity = "1.7.2"
-    const val androidx_benchmark = "1.2.2"
+    const val androidx_benchmark = "1.2.3"
     const val androidx_profileinstaller = "1.3.1"
     const val androidx_legacy = "1.0.0"
     const val androidx_lifecycle = "2.6.1"

From 465789fe62af23d73156b25a31668249f066a2d1 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Fri, 16 Feb 2024 00:03:28 +0000
Subject: [PATCH 180/222] Import translations from android-l10n

---
 app/src/main/res/values-azb/strings.xml | 138 ++++++++++++++++++++++++
 1 file changed, 138 insertions(+)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index 596ba4638..8bf0f3303 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -720,8 +720,12 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">حساب مودیریتی</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">رمزینیزی دگیشدیرین، دیتا یئغمایی ایداره ائدین ویا حسابینیزی سیلین.</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">ایندی دؤنگل‌لندیر</string>
+    <!-- Preference category for sync -->
+    <string name="preferences_sync_category">نه‌یین دؤنگل ائدیله‌جه‌گینی سئچین</string>
     <!-- Preference for syncing history -->
     <string name="preferences_sync_history">گئچمیش</string>
     <!-- Preference for syncing bookmarks -->
@@ -753,6 +757,52 @@
     <!-- Label summary showing never synced -->
     <string name="sync_never_synced_summary">سوْن دؤنگل: هئچ</string>
 
+    <!-- Text for displaying the default device name.
+        The first parameter is the application name, the second is the device manufacturer name
+        and the third is the device model. -->
+    <string name="default_device_name_2">%1$s - %2$s %3$s</string>
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">اعتباری کارتلار</string>
+
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">اؤدمه آپاری‌ْلاری</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">آدرس‌لر</string>
+
+    <!-- Send Tab -->
+    <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
+    <string name="fxa_received_tab_channel_name">آلیْنان تاغ‌لار</string>
+    <!-- Description of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
+    <string name="fxa_received_tab_channel_description">آیریْ فایرفاکس جهازلاریندان آلینان تاغلارا اوچون بیلدیریش‌لر</string>
+    <!--  The body for these is the URL of the tab received  -->
+    <string name="fxa_tab_received_notification_name">تاغ آلیندیْ</string>
+
+    <!-- %s is the device name -->
+    <string name="fxa_tab_received_from_notification_name">%s-دن آلینان تاغ</string>
+
+    <!-- Advanced Preferences -->
+    <!-- Preference for tracking protection exceptions -->
+    <string name="preferences_tracking_protection_exceptions">آیریْ توُتمالار</string>
+    <!-- Button in Exceptions Preference to turn on tracking protection for all sites (remove all exceptions) -->
+    <string name="preferences_tracking_protection_exceptions_turn_on_for_all">بوتون سایتلار اوچون آچیْن</string>
+    <!-- Text displayed when there are no exceptions -->
+    <string name="exceptions_empty_message_description">آیری‌ْ توتمالار سئچیلمیش سایتلار اوچون ایزلنمه قوْروماسینیْ ایشدن سالماغا ایمکان وئریر.</string>
+    <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
+    <string name="exceptions_empty_message_learn_more_link">آرتیق بیلین</string>
+
+    <!-- Preference switch for usage and technical data collection -->
+    <string name="preference_usage_data">ایشه آلما و فنی دیتالار</string>
+    <!-- Preference switch for marketing data collection -->
+    <string name="preferences_marketing_data">بازارلاما دیتاسیْ</string>
+    <!-- Title for studies preferences -->
+    <string name="preference_experiments_2">آراشدیرمالار</string>
+
+    <!-- Turn On Sync Preferences -->
+    <!-- Header of the Sync and save your data preference view -->
+    <string name="preferences_sync_2">دیتالارینیزیْ دؤنگل ائدین و ساخلایین</string>
+    <!-- Preference for removing FxA account -->
+    <string name="preferences_sync_remove_account">حساب قالدیْر</string>
+
     <!-- Toolbar Preferences -->
     <!-- Preference for using top toolbar -->
     <string name="preference_top_toolbar">اوست</string>
@@ -781,6 +831,10 @@
     <string name="library_bookmarks">بوُکمارک‌لار</string>
 
 
+    <!-- Option in library to open Desktop Bookmarks root page -->
+    <string name="library_desktop_bookmarks_root">دستکتاپ بوکمارک‌لاریْ</string>
+    <!-- Option in library to open Desktop Bookmarks "menu" page -->
+    <string name="library_desktop_bookmarks_menu">بوکمارک منوسو</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">گئچمیش</string>
     <!-- Option in Library to open a new tab -->
@@ -790,22 +844,106 @@
     <!-- Content description (not visible, for screen readers etc.): "Close button for library settings" -->
     <string name="content_description_close_button">باغلا</string>
 
+    <!-- Dialog button text for confirming open all tabs -->
+    <string name="open_all_warning_confirm">تاغ‌لاریْ آچ</string>
+    <!-- Dialog button text for canceling open all tabs -->
+    <string name="open_all_warning_cancel">لغو</string>
+
+    <!-- Text to show users they have one page in the history group section of the History fragment.
+    %d is a placeholder for the number of pages in the group. -->
+    <string name="history_search_group_site_1">%d صفحه</string>
+    <!-- Text to show users they have multiple pages in the history group section of the History fragment.
+    %d is a placeholder for the number of pages in the group. -->
+    <string name="history_search_group_sites_1">%d صفحه‌</string>
+
+    <!-- Option in library for Recently Closed Tabs -->
+    <string name="library_recently_closed_tabs">سوْن باغلانان تاغ‌لار</string>
+    <!-- Option in library to open Recently Closed Tabs page -->
+    <string name="recently_closed_show_full_history">بوتون گئچمیشی گؤستر</string>
+    <!-- Text to show users they have multiple tabs saved in the Recently Closed Tabs section of history.
+    %d is a placeholder for the number of tabs selected. -->
+    <string name="recently_closed_tabs">%d تاغ</string>
+    <!-- Text to show users they have one tab saved in the Recently Closed Tabs section of history.
+    %d is a placeholder for the number of tabs selected. -->
+    <string name="recently_closed_tab">%d تاغ</string>
+    <!-- Recently closed tabs screen message when there are no recently closed tabs -->
+    <string name="recently_closed_empty_message">بو  یاخین زاماندا باغلانان تاغ یوخ</string>
+
     <!-- Tab Management -->
     <!-- Title of preference for tabs management -->
     <string name="preferences_tabs">تاغ‌لار</string>
+    <!-- Title of preference that allows a user to specify the tab view -->
+    <string name="preferences_tab_view">تاغ گؤروُنوشو</string>
     <!-- Option for a list tab view -->
     <string name="tab_view_list">لیست</string>
+    <!-- Option for a grid tab view -->
+    <string name="tab_view_grid">شبکه‌لی</string>
+    <!-- Title of preference that allows a user to auto close tabs after a specified amount of time -->
+    <string name="preferences_close_tabs">تاغ‌لاریْ باغلا</string>
     <!-- Option for auto closing tabs that will never auto close tabs, always allows user to manually close tabs -->
     <string name="close_tabs_manually">هئچ زامان</string>
 
+    <!-- Option for auto closing tabs that will auto close tabs after one day -->
+    <string name="close_tabs_after_one_day">بیر گوندن سوْنرا</string>
+    <!-- Option for auto closing tabs that will auto close tabs after one week -->
+    <string name="close_tabs_after_one_week">بیر هفته‌دن سوْنرا</string>
+    <!-- Option for auto closing tabs that will auto close tabs after one month -->
+    <string name="close_tabs_after_one_month">بیر آیدان سوْنرا</string>
+    <!-- Title of preference that allows a user to specify the auto-close settings for open tabs -->
+    <string name="preference_auto_close_tabs" tools:ignore="UnusedResources">آچیق تاغلاریْ اوْتوماتیک باغلا</string>
+
     <!-- Option for always opening the homepage when re-opening the app -->
     <string name="opening_screen_homepage">آنایارپاق</string>
 
+    <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
+    <string name="close_tabs_manually_summary">ال‌ ایله باغلاییْن</string>
+
+    <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
+    <string name="close_tabs_after_one_day_summary">بیر گۆندن سوْنرا باغلایین</string>
+
     <!-- Studies -->
     <!-- Title of the remove studies button -->
     <string name="studies_remove">قالدیر</string>
 
 
+    <!-- Context description text for the button to delete a single history item -->
+    <string name="history_delete_item">سیل</string>
+    <!-- History multi select title in app bar
+    The first parameter is the number of bookmarks selected -->
+    <string name="history_multi_select_title">%1$d سئچیلیدی</string>
+    <!-- Text for the header that groups the history for today -->
+    <string name="history_today">بوگون</string>
+    <!-- Text for the header that groups the history for yesterday -->
+    <string name="history_yesterday">دوُنن</string>
+    <!-- Text for the header that groups the history the past 7 days -->
+    <string name="history_7_days">سوْن 7 گون</string>
+    <!-- Text for the header that groups the history the past 30 days -->
+    <string name="history_30_days">سوْن 30 گون</string>
+
+
+    <!-- Text for the header that groups the history older than the last month -->
+    <string name="history_older">داها قدیمی</string>
+    <!-- Text shown when no history exists -->
+    <string name="history_empty_message">گئچمیش یوخدور</string>
+
+    <!-- Downloads -->
+    <!-- Text for the snackbar to confirm that multiple downloads items have been removed -->
+    <string name="download_delete_multiple_items_snackbar_1">یئندیرمه‌لر فالدیریلدیْ</string>
+    <!-- Text for the snackbar to confirm that a single download item has been removed. The first parameter is the name of the download item. -->
+    <string name="download_delete_single_item_snackbar">%1$s قالدیریلدیْ</string>
+    <!-- Text shown when no download exists -->
+    <string name="download_empty_message_1">هئچ یئندیریلمیش فایل یوخدور</string>
+    <!-- History multi select title in app bar
+    The first parameter is the number of downloads selected -->
+    <string name="download_multi_select_title">%1$d سئچیلیدی</string>
+    <!-- Text for the button to remove a single download item -->
+    <string name="download_delete_item_1">قالدیر</string>
+
+
+    <!-- Crashes -->
+    <!-- Title text displayed on the tab crash page. This first parameter is the name of the application (For example: Fenix) -->
+    <string name="tab_crash_title_2">باغیشلایین، %1$s بو صفحه‌نی دولدورا بیلمه‌دی.</string>
+
     <!-- Text for the cancel button on delete bookmark dialog -->
     <string name="bookmark_delete_negative">لغو</string>
     <!-- Bookmark overflow menu edit button -->

From 25ddb717bf308a8121b5db71d25f6e011af55c3c Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Wed, 14 Feb 2024 13:29:42 +0200
Subject: [PATCH 181/222] Bug 1815651 - Fix verifyAutofillToggleTest UI test

---
 app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt
index 3dcdd96cd..394c449eb 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt
@@ -510,9 +510,13 @@ class LoginsTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(loginPage.toUri()) {
+            waitForPageToLoad()
             setPageObjectText(itemWithResId("username"), "mozilla")
+            waitForAppWindowToBeUpdated()
             setPageObjectText(itemWithResId("password"), "firefox")
+            waitForAppWindowToBeUpdated()
             clickPageObject(itemWithResId("submit"))
+            waitForPageToLoad()
             verifySaveLoginPromptIsDisplayed()
             clickPageObject(itemWithText("Save"))
         }.openTabDrawer {
@@ -521,6 +525,8 @@ class LoginsTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(loginPage.toUri()) {
+            waitForPageToLoad()
+            clickPageObject(itemWithResId("togglePassword"))
             verifyPrefilledLoginCredentials("mozilla", "firefox", true)
         }.openTabDrawer {
             closeTab()

From 270d99a9ed2477fd7655c5e95303ac122be68203 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 16 Feb 2024 12:09:11 +0200
Subject: [PATCH 182/222] Bug 1880620 - Add logs to
 SettingsSubMenuAddonsManagerAddonDetailedMenuRobot

---
 ...tingsSubMenuAddonsManagerAddonDetailedMenuRobot.kt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerAddonDetailedMenuRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerAddonDetailedMenuRobot.kt
index 799f3a991..43aceae29 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerAddonDetailedMenuRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerAddonDetailedMenuRobot.kt
@@ -5,6 +5,7 @@
 
 package org.mozilla.fenix.ui.robots
 
+import android.util.Log
 import android.view.View
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -17,6 +18,7 @@ import org.hamcrest.CoreMatchers.allOf
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.AppAndSystemHelper.registerAndCleanupIdlingResources
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.ViewVisibilityIdlingResource
 import org.mozilla.fenix.helpers.click
 
@@ -28,8 +30,9 @@ class SettingsSubMenuAddonsManagerAddonDetailedMenuRobot {
 
     class Transition {
         fun goBack(interact: SettingsSubMenuAddonsManagerRobot.() -> Unit): SettingsSubMenuAddonsManagerRobot.Transition {
-            fun goBackButton() = onView(allOf(withContentDescription("Navigate up")))
-            goBackButton().click()
+            Log.i(TAG, "goBack: Trying to click the navigate up button")
+            onView(allOf(withContentDescription("Navigate up"))).click()
+            Log.i(TAG, "goBack: Clicked the navigate up button")
 
             SettingsSubMenuAddonsManagerRobot().interact()
             return SettingsSubMenuAddonsManagerRobot.Transition()
@@ -42,8 +45,12 @@ class SettingsSubMenuAddonsManagerAddonDetailedMenuRobot {
                     View.VISIBLE,
                 ),
             ) {
+                Log.i(TAG, "removeAddon: Trying to verify that the remove add-on button is visible")
                 removeAddonButton().check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+                Log.i(TAG, "removeAddon: Verified that the remove add-on button is visible")
+                Log.i(TAG, "removeAddon: Trying to click the remove add-on button")
                 removeAddonButton().click()
+                Log.i(TAG, "removeAddon: Clicked the remove add-on button")
             }
 
             SettingsSubMenuAddonsManagerRobot().interact()

From 9012bd162455b01b7d2a91a96049027e415c85cc Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 16 Feb 2024 12:19:12 +0200
Subject: [PATCH 183/222] Bug 1880620 - Remove redundant assertion functions
 from SettingsSubMenuAddonsManagerRobot

---
 .../SettingsSubMenuAddonsManagerRobot.kt      | 113 ++++++++----------
 1 file changed, 47 insertions(+), 66 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
index 784705138..9b41d345f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
@@ -139,7 +139,13 @@ class SettingsSubMenuAddonsManagerRobot {
 
     fun verifyAddonIsInstalled(addonName: String) {
         scrollToElementByText(addonName)
-        assertAddonIsInstalled(addonName)
+        onView(
+            allOf(
+                withId(R.id.add_button),
+                isDescendantOfA(withId(R.id.add_on_item)),
+                hasSibling(hasDescendant(withText(addonName))),
+            ),
+        ).check(matches(withEffectiveVisibility(Visibility.INVISIBLE)))
     }
 
     fun verifyEnabledTitleDisplayed() {
@@ -149,8 +155,46 @@ class SettingsSubMenuAddonsManagerRobot {
 
     fun cancelInstallAddon() = cancelInstall()
     fun acceptPermissionToInstallAddon() = allowPermissionToInstall()
-    fun verifyAddonsItems() = assertAddonsItems()
-    fun verifyAddonCanBeInstalled(addonName: String) = assertAddonCanBeInstalled(addonName)
+    fun verifyAddonsItems() {
+        onView(allOf(withId(R.id.title), withText("Recommended")))
+            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+
+        onView(
+            allOf(
+                isAssignableFrom(RelativeLayout::class.java),
+                withId(R.id.add_on_item),
+                hasDescendant(allOf(withId(R.id.add_on_icon), isCompletelyDisplayed())),
+                hasDescendant(
+                    allOf(
+                        withId(R.id.details_container),
+                        hasDescendant(withText("uBlock Origin")),
+                        hasDescendant(withText("Finally, an efficient wide-spectrum content blocker. Easy on CPU and memory.")),
+                        hasDescendant(withId(R.id.rating)),
+                        hasDescendant(withId(R.id.review_count)),
+                    ),
+                ),
+                hasDescendant(withId(R.id.add_button)),
+            ),
+        ).check(matches(isCompletelyDisplayed()))
+    }
+    fun verifyAddonCanBeInstalled(addonName: String) {
+        scrollToElementByText(addonName)
+        mDevice.waitNotNull(Until.findObject(By.text(addonName)), waitingTime)
+
+        onView(
+            allOf(
+                withId(R.id.add_button),
+                hasSibling(
+                    hasDescendant(
+                        allOf(
+                            withId(R.id.add_on_name),
+                            withText(addonName),
+                        ),
+                    ),
+                ),
+            ),
+        ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    }
 
     fun selectAllowInPrivateBrowsing() {
         assertUIObjectExists(itemWithText("Allow in private browsing"), waitingTime = waitingTimeLong)
@@ -210,16 +254,6 @@ class SettingsSubMenuAddonsManagerRobot {
             ),
         )
 
-    private fun assertAddonIsInstalled(addonName: String) {
-        onView(
-            allOf(
-                withId(R.id.add_button),
-                isDescendantOfA(withId(R.id.add_on_item)),
-                hasSibling(hasDescendant(withText(addonName))),
-            ),
-        ).check(matches(withEffectiveVisibility(Visibility.INVISIBLE)))
-    }
-
     private fun cancelInstall() {
         onView(allOf(withId(R.id.deny_button), withText("Cancel")))
             .check(matches(isCompletelyDisplayed()))
@@ -233,59 +267,6 @@ class SettingsSubMenuAddonsManagerRobot {
             .check(matches(isCompletelyDisplayed()))
             .perform(click())
     }
-
-    private fun assertAddonsItems() {
-        assertRecommendedTitleDisplayed()
-        assertAddons()
-    }
-
-    private fun assertRecommendedTitleDisplayed() {
-        onView(allOf(withId(R.id.title), withText("Recommended")))
-            .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-    }
-
-    private fun assertAddons() {
-        assertAddonUblock()
-    }
-
-    private fun assertAddonUblock() {
-        onView(
-            allOf(
-                isAssignableFrom(RelativeLayout::class.java),
-                withId(R.id.add_on_item),
-                hasDescendant(allOf(withId(R.id.add_on_icon), isCompletelyDisplayed())),
-                hasDescendant(
-                    allOf(
-                        withId(R.id.details_container),
-                        hasDescendant(withText("uBlock Origin")),
-                        hasDescendant(withText("Finally, an efficient wide-spectrum content blocker. Easy on CPU and memory.")),
-                        hasDescendant(withId(R.id.rating)),
-                        hasDescendant(withId(R.id.review_count)),
-                    ),
-                ),
-                hasDescendant(withId(R.id.add_button)),
-            ),
-        ).check(matches(isCompletelyDisplayed()))
-    }
-
-    private fun assertAddonCanBeInstalled(addonName: String) {
-        scrollToElementByText(addonName)
-        mDevice.waitNotNull(Until.findObject(By.text(addonName)), waitingTime)
-
-        onView(
-            allOf(
-                withId(R.id.add_button),
-                hasSibling(
-                    hasDescendant(
-                        allOf(
-                            withId(R.id.add_on_name),
-                            withText(addonName),
-                        ),
-                    ),
-                ),
-            ),
-        ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-    }
 }
 
 fun addonsMenu(interact: SettingsSubMenuAddonsManagerRobot.() -> Unit): SettingsSubMenuAddonsManagerRobot.Transition {

From a494c9808d49c7ee5b3eccee5369b538ba2dd6ff Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 16 Feb 2024 13:01:39 +0200
Subject: [PATCH 184/222] Bug 1880620 - Add logs to
 SettingsSubMenuAddonsManagerRobot

---
 .../SettingsSubMenuAddonsManagerRobot.kt      | 96 +++++++++++++------
 1 file changed, 66 insertions(+), 30 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
index 9b41d345f..95ea5f4c4 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
@@ -55,12 +55,15 @@ class SettingsSubMenuAddonsManagerRobot {
     fun verifyAddonsListIsDisplayed(shouldBeDisplayed: Boolean) =
         assertUIObjectExists(addonsList(), exists = shouldBeDisplayed)
 
-    fun verifyAddonDownloadOverlay() =
+    fun verifyAddonDownloadOverlay() {
+        Log.i(TAG, "verifyAddonDownloadOverlay: Trying to verify that the \"Downloading and verifying add-on\" prompt is displayed")
         onView(withText(R.string.mozac_add_on_install_progress_caption)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyAddonDownloadOverlay: Verified that the \"Downloading and verifying add-on\" prompt is displayed")
+    }
 
     fun verifyAddonPermissionPrompt(addonName: String) {
         mDevice.waitNotNull(Until.findObject(By.text("Add $addonName?")), waitingTime)
-
+        Log.i(TAG, "verifyAddonPermissionPrompt: Trying to verify that the add-ons permission prompt items are displayed")
         onView(
             allOf(
                 withText("Add $addonName?"),
@@ -71,11 +74,14 @@ class SettingsSubMenuAddonsManagerRobot {
         )
             .inRoot(isDialog())
             .check(matches(isDisplayed()))
+        Log.i(TAG, "verifyAddonPermissionPrompt: Verified that the add-ons permission prompt items are displayed")
     }
 
     fun clickInstallAddon(addonName: String) {
-        Log.i(TAG, "clickInstallAddon: Looking for $addonName install button")
+        Log.i(TAG, "clickInstallAddon: Waiting for $waitingTime ms for add-ons list to exist")
         addonsList().waitForExists(waitingTime)
+        Log.i(TAG, "clickInstallAddon: Waited for $waitingTime ms for add-ons list to exist")
+        Log.i(TAG, "clickInstallAddon: Trying to scroll into view the install $addonName button")
         addonsList().scrollIntoView(
             mDevice.findObject(
                 UiSelector()
@@ -83,6 +89,8 @@ class SettingsSubMenuAddonsManagerRobot {
                     .childSelector(UiSelector().text(addonName)),
             ),
         )
+        Log.i(TAG, "clickInstallAddon: Scrolled into view the install $addonName button")
+        Log.i(TAG, "clickInstallAddon: Trying to ensure the full visibility of the the install $addonName button")
         addonsList().ensureFullyVisible(
             mDevice.findObject(
                 UiSelector()
@@ -90,22 +98,24 @@ class SettingsSubMenuAddonsManagerRobot {
                     .childSelector(UiSelector().text(addonName)),
             ),
         )
-        Log.i(TAG, "clickInstallAddon: Found $addonName install button")
+        Log.i(TAG, "clickInstallAddon: Ensured the full visibility of the the install $addonName button")
+        Log.i(TAG, "clickInstallAddon: Trying to click the install $addonName button")
         installButtonForAddon(addonName).click()
-        Log.i(TAG, "clickInstallAddon: Clicked Install $addonName button")
+        Log.i(TAG, "clickInstallAddon: Clicked the install $addonName button")
     }
 
     fun verifyAddonInstallCompleted(addonName: String, activityTestRule: HomeActivityIntentTestRule) {
         for (i in 1..RETRY_COUNT) {
+            Log.i(TAG, "verifyAddonInstallCompleted: Started try #$i")
             try {
                 assertUIObjectExists(itemWithText("OK"), waitingTime = waitingTimeLong)
 
                 break
             } catch (e: AssertionError) {
+                Log.i(TAG, "verifyAddonInstallCompleted: AssertionError caught, executing fallback methods")
                 if (i == RETRY_COUNT) {
                     throw e
                 } else {
-                    Log.i(TAG, "verifyAddonInstallCompleted: $addonName failed to install on try #$i")
                     restartApp(activityTestRule)
                     homeScreen {
                     }.openThreeDotMenu {
@@ -121,6 +131,7 @@ class SettingsSubMenuAddonsManagerRobot {
     }
 
     fun verifyAddonInstallCompletedPrompt(addonName: String) {
+        Log.i(TAG, "verifyAddonInstallCompletedPrompt: Trying to verify that completed add-on install prompt items are visible")
         onView(
             allOf(
                 withText("OK"),
@@ -131,14 +142,18 @@ class SettingsSubMenuAddonsManagerRobot {
             ),
         )
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyAddonInstallCompletedPrompt: Verified that completed add-on install prompt items are visible")
     }
 
     fun closeAddonInstallCompletePrompt() {
+        Log.i(TAG, "closeAddonInstallCompletePrompt: Trying to click the \"OK\" button from the completed add-on install prompt")
         onView(withText("OK")).click()
+        Log.i(TAG, "closeAddonInstallCompletePrompt: Clicked the \"OK\" button from the completed add-on install prompt")
     }
 
     fun verifyAddonIsInstalled(addonName: String) {
         scrollToElementByText(addonName)
+        Log.i(TAG, "verifyAddonIsInstalled: Trying to verify that the $addonName add-on was installed")
         onView(
             allOf(
                 withId(R.id.add_button),
@@ -146,19 +161,24 @@ class SettingsSubMenuAddonsManagerRobot {
                 hasSibling(hasDescendant(withText(addonName))),
             ),
         ).check(matches(withEffectiveVisibility(Visibility.INVISIBLE)))
+        Log.i(TAG, "verifyAddonIsInstalled: Verified that the $addonName add-on was installed")
     }
 
     fun verifyEnabledTitleDisplayed() {
+        Log.i(TAG, "verifyEnabledTitleDisplayed: Trying to verify that the \"Enabled\" heading is displayed")
         onView(withText("Enabled"))
             .check(matches(isCompletelyDisplayed()))
+        Log.i(TAG, "verifyEnabledTitleDisplayed: Verified that the \"Enabled\" heading is displayed")
     }
 
     fun cancelInstallAddon() = cancelInstall()
     fun acceptPermissionToInstallAddon() = allowPermissionToInstall()
     fun verifyAddonsItems() {
+        Log.i(TAG, "verifyAddonsItems: Trying to verify that the \"Recommended\" heading is visible")
         onView(allOf(withId(R.id.title), withText("Recommended")))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-
+        Log.i(TAG, "verifyAddonsItems: Verified that the \"Recommended\" heading is visible")
+        Log.i(TAG, "verifyAddonsItems: Trying to verify that all uBlock Origin items are completely displayed")
         onView(
             allOf(
                 isAssignableFrom(RelativeLayout::class.java),
@@ -176,11 +196,12 @@ class SettingsSubMenuAddonsManagerRobot {
                 hasDescendant(withId(R.id.add_button)),
             ),
         ).check(matches(isCompletelyDisplayed()))
+        Log.i(TAG, "verifyAddonsItems: Verified that all uBlock Origin items are completely displayed")
     }
     fun verifyAddonCanBeInstalled(addonName: String) {
         scrollToElementByText(addonName)
         mDevice.waitNotNull(Until.findObject(By.text(addonName)), waitingTime)
-
+        Log.i(TAG, "verifyAddonCanBeInstalled: Trying to verify that the install $addonName button is visible")
         onView(
             allOf(
                 withId(R.id.add_button),
@@ -194,11 +215,14 @@ class SettingsSubMenuAddonsManagerRobot {
                 ),
             ),
         ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+        Log.i(TAG, "verifyAddonCanBeInstalled: Verified that the install $addonName button is visible")
     }
 
     fun selectAllowInPrivateBrowsing() {
         assertUIObjectExists(itemWithText("Allow in private browsing"), waitingTime = waitingTimeLong)
+        Log.i(TAG, "selectAllowInPrivateBrowsing: Trying to click the \"Allow in private browsing\" check box")
         onView(withId(R.id.allow_in_private_browsing)).click()
+        Log.i(TAG, "selectAllowInPrivateBrowsing: Clicked the \"Allow in private browsing\" check box")
     }
 
     fun installAddon(addonName: String, activityTestRule: HomeActivityIntentTestRule) {
@@ -214,8 +238,9 @@ class SettingsSubMenuAddonsManagerRobot {
 
     class Transition {
         fun goBack(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
-            fun goBackButton() = onView(allOf(withContentDescription("Navigate up")))
-            goBackButton().click()
+            Log.i(TAG, "goBack: Trying to click navigate up toolbar button")
+            onView(allOf(withContentDescription("Navigate up"))).click()
+            Log.i(TAG, "goBack: Clicked the navigate up toolbar button")
 
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
@@ -226,19 +251,12 @@ class SettingsSubMenuAddonsManagerRobot {
             interact: SettingsSubMenuAddonsManagerAddonDetailedMenuRobot.() -> Unit,
         ): SettingsSubMenuAddonsManagerAddonDetailedMenuRobot.Transition {
             scrollToElementByText(addonName)
-
-            onView(
-                allOf(
-                    withId(R.id.add_on_item),
-                    hasDescendant(
-                        allOf(
-                            withId(R.id.add_on_name),
-                            withText(addonName),
-                        ),
-                    ),
-                ),
-            ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-                .perform(click())
+            Log.i(TAG, "openDetailedMenuForAddon: Trying to verify that the $addonName add-on is visible")
+            addonItem(addonName).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+            Log.i(TAG, "openDetailedMenuForAddon: Verified that the $addonName add-on is visible")
+            Log.i(TAG, "openDetailedMenuForAddon: Trying to click the $addonName add-on")
+            addonItem(addonName).perform(click())
+            Log.i(TAG, "openDetailedMenuForAddon: Clicked the $addonName add-on")
 
             SettingsSubMenuAddonsManagerAddonDetailedMenuRobot().interact()
             return SettingsSubMenuAddonsManagerAddonDetailedMenuRobot.Transition()
@@ -255,17 +273,22 @@ class SettingsSubMenuAddonsManagerRobot {
         )
 
     private fun cancelInstall() {
-        onView(allOf(withId(R.id.deny_button), withText("Cancel")))
-            .check(matches(isCompletelyDisplayed()))
-            .perform(click())
+        Log.i(TAG, "cancelInstall: Trying to verify that the \"Cancel\" button is completely displayed")
+        onView(allOf(withId(R.id.deny_button), withText("Cancel"))).check(matches(isCompletelyDisplayed()))
+        Log.i(TAG, "cancelInstall: Verified that the \"Cancel\" button is completely displayed")
+        Log.i(TAG, "cancelInstall: Trying to click the \"Cancel\" button")
+        onView(allOf(withId(R.id.deny_button), withText("Cancel"))).perform(click())
+        Log.i(TAG, "cancelInstall: Clicked the \"Cancel\" button")
     }
 
     private fun allowPermissionToInstall() {
         mDevice.waitNotNull(Until.findObject(By.text("Add")), waitingTime)
-
-        onView(allOf(withId(R.id.allow_button), withText("Add")))
-            .check(matches(isCompletelyDisplayed()))
-            .perform(click())
+        Log.i(TAG, "allowPermissionToInstall: Trying to verify that the \"Add\" button is completely displayed")
+        onView(allOf(withId(R.id.allow_button), withText("Add"))).check(matches(isCompletelyDisplayed()))
+        Log.i(TAG, "allowPermissionToInstall: Verified that the \"Add\" button is completely displayed")
+        Log.i(TAG, "allowPermissionToInstall: Trying to click the \"Add\" button")
+        onView(allOf(withId(R.id.allow_button), withText("Add"))).perform(click())
+        Log.i(TAG, "allowPermissionToInstall: Clicked the \"Add\" button")
     }
 }
 
@@ -274,5 +297,18 @@ fun addonsMenu(interact: SettingsSubMenuAddonsManagerRobot.() -> Unit): Settings
     return SettingsSubMenuAddonsManagerRobot.Transition()
 }
 
+private fun addonItem(addonName: String) =
+    onView(
+        allOf(
+            withId(R.id.add_on_item),
+            hasDescendant(
+                allOf(
+                    withId(R.id.add_on_name),
+                    withText(addonName),
+                ),
+            ),
+        ),
+    )
+
 private fun addonsList() =
     UiScrollable(UiSelector().resourceId("$packageName:id/add_ons_list")).setAsVerticalList()

From 91d6264e6be46d43c6de851c9b6c6892e935d715 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Sat, 17 Feb 2024 00:03:19 +0000
Subject: [PATCH 185/222] Import translations from android-l10n

---
 app/src/main/res/values-azb/strings.xml | 31 +++++++++++++++++++++++++
 app/src/main/res/values-hu/strings.xml  |  3 +++
 2 files changed, 34 insertions(+)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index 8bf0f3303..033094275 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -792,17 +792,30 @@
 
     <!-- Preference switch for usage and technical data collection -->
     <string name="preference_usage_data">ایشه آلما و فنی دیتالار</string>
+    <!-- Preference description for usage and technical data collection -->
+    <string name="preferences_usage_data_description">%1$s داها یاخچیْ ائتمک اوچون موُروچونوز حاقیندا ایشله‌ییش،ایشه آلما، دوْنانیم و اؤزللشدیرمه دیتالارینی موزیلا ایله پایلاشیر.</string>
     <!-- Preference switch for marketing data collection -->
     <string name="preferences_marketing_data">بازارلاما دیتاسیْ</string>
+    <!-- Preference description for marketing data collection -->
+    <string name="preferences_marketing_data_description2">اساس ایشه آلما بیلگی‌لرینی موبایل بازارلاما ایش اوْرتاغیمیز Adjust ایله پایلاشیر.</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">آراشدیرمالار</string>
 
+    <!-- Summary for studies preferences -->
+    <string name="preference_experiments_summary_2">موزیلایا آراشدیرمالار قوْشماغینا و ایجرا ائتمه‌سینه ایجازه وئریر.</string>
+
     <!-- Turn On Sync Preferences -->
     <!-- Header of the Sync and save your data preference view -->
     <string name="preferences_sync_2">دیتالارینیزیْ دؤنگل ائدین و ساخلایین</string>
+    <!-- Preference for reconnecting to FxA sync -->
+    <string name="preferences_sync_sign_in_to_reconnect">یئنی‌دن باغلانماق اوچون گیریش ائدین</string>
     <!-- Preference for removing FxA account -->
     <string name="preferences_sync_remove_account">حساب قالدیْر</string>
 
+    <!-- Pairing Feature strings -->
+    <!-- Instructions on how to access pairing -->
+    <string name="pair_instructions_2"><![CDATA[<b>firefox.com/pair</b> آدرسینه گؤرونن QR کوْدونو اسکن ائله‌یین]]></string>
+
     <!-- Toolbar Preferences -->
     <!-- Preference for using top toolbar -->
     <string name="preference_top_toolbar">اوست</string>
@@ -817,6 +830,9 @@
     <!-- Preference for using using dark or light theme automatically set by battery -->
     <string name="preference_auto_battery_theme">باتری ساخلیان طرفیندن تنظیم‌لنیر</string>
 
+    <!-- Preference for using following device theme -->
+    <string name="preference_follow_device_theme">جهاز تمینی نظره آل</string>
+
     <!-- Gestures Preferences-->
     <!-- Preferences for using pull to refresh in a webpage -->
     <string name="preference_gestures_website_pull_to_refresh">رفرش اوچون چک</string>
@@ -824,6 +840,11 @@
     <string name="preference_gestures_dynamic_toolbar">آلت‌لر چوبوغونو گیزلتمک اوچون اسکرول ائله‌</string>
 
 
+    <!-- Preference for switching tabs by swiping horizontally on the toolbar -->
+    <string name="preference_gestures_swipe_toolbar_switch_tabs">تاغ‌لاریْ دگیشدیرمک اوچون ادوات چوُبوغونو یانالار طرف چکین</string>
+    <!-- Preference for showing the opened tabs by swiping up on the toolbar-->
+    <string name="preference_gestures_swipe_toolbar_show_tabs">تاغ‌لاریْ آچماق اوچون ادوات چوُبوغونو یوخاریا چکین</string>
+
     <!-- Library -->
     <!-- Option in Library to open Downloads page -->
     <string name="library_downloads">یئندیرنلر</string>
@@ -835,6 +856,10 @@
     <string name="library_desktop_bookmarks_root">دستکتاپ بوکمارک‌لاریْ</string>
     <!-- Option in library to open Desktop Bookmarks "menu" page -->
     <string name="library_desktop_bookmarks_menu">بوکمارک منوسو</string>
+    <!-- Option in library to open Desktop Bookmarks "toolbar" page -->
+    <string name="library_desktop_bookmarks_toolbar">بوکمارک‌لار ادوات چوبوغو</string>
+    <!-- Option in library to open Desktop Bookmarks "unfiled" page -->
+    <string name="library_desktop_bookmarks_unfiled">باشقا بوکمارک‌لار</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">گئچمیش</string>
     <!-- Option in Library to open a new tab -->
@@ -844,6 +869,12 @@
     <!-- Content description (not visible, for screen readers etc.): "Close button for library settings" -->
     <string name="content_description_close_button">باغلا</string>
 
+    <!-- Title to show in alert when a lot of tabs are to be opened
+    %d is a placeholder for the number of tabs that will be opened -->
+    <string name="open_all_warning_title">%d آچیلسین؟</string>
+    <!-- Message to warn users that a large number of tabs will be opened
+    %s will be replaced by app name. -->
+    <string name="open_all_warning_message">چوْخلو تاغ‌لاریْن آچیلماسیْ صفحه‌لر دوْلورکن %s سوُرعتینی یاواشلاتا بیلر. ایدامه وئرمه‌گه آرخایینسیز؟</string>
     <!-- Dialog button text for confirming open all tabs -->
     <string name="open_all_warning_confirm">تاغ‌لاریْ آچ</string>
     <!-- Dialog button text for canceling open all tabs -->
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 3ffd638ea..fad21e3e8 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -2184,6 +2184,9 @@
     <string name="other_default_search_engine_suggestion_header">%s keresés</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Az alapértelmezett böngésző módosítása</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Állítsa be a webhelyek, e-mailek és üzenetek hivatkozásait, hogy azok automatikusan a Firefoxban nyíljanak meg.</string>
 
     <!-- Content description for close button in collection placeholder. -->

From fe19a93902f49a473e621d910fa6612114c00ccd Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Sun, 18 Feb 2024 00:03:49 +0000
Subject: [PATCH 186/222] Import translations from android-l10n

---
 app/src/main/res/values-pt-rPT/strings.xml |  2 +-
 app/src/main/res/values-sq/strings.xml     | 19 ++++++++++++++-----
 app/src/main/res/values-tg/strings.xml     |  2 ++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 1885805a7..374c48d06 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -2439,7 +2439,7 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Tradução em curso</string>
     <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
-    <string name="translations_bottom_sheet_default_dropdown_selection">Escolha um idioma</string>
+    <string name="translations_bottom_sheet_default_dropdown_selection">Escolher um idioma</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Ocorreu um problema com a tradução. Por favor, tente novamente.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index ea099419b..84f717932 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -242,6 +242,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Përshtatni faqe hyrëse</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Skena e kreut</string>
@@ -249,6 +250,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Fshi historik shfletimesh</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Përktheje faqen</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Gjuha e përzgjedhur</string>
@@ -1875,7 +1879,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur nga hyrja në to kartat tuaja kreditit të ruajturar, nëse pajisjen tuaj e ka dikush tjetër.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_2" tools:ignore="UnusedResources">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur prej hyrjes në to hollësitë e ruajtura për kartat tuaja, nëse pajisjen tuaj e ka dikush tjetër.</string>
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur prej hyrjes në to hollësitë e ruajtura për metodat tuaja të pagesave, nëse pajisjen tuaj e ka dikush tjetër.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Ujdiseni tani</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -2035,12 +2039,12 @@
     <string name="login_options_menu_2" tools:ignore="UnusedResources">Mundësi fjalëkalimesh</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Fusha e përpunueshme e teksteve për adresën web të kredencialeve të hyrjes.</string>
-    <!--  The editable text field for a password's website address. -->
-    <string name="saved_login_hostname_description_2" tools:ignore="UnusedResources">Fusha e përpunueshme e teksteve për adresën web të fjalëkalimit.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Fusha e përpunueshme e teksteve për adresën e sajtit.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Fusha e përpunueshme e teksteve për emrin e përdoruesit të kredencialeve të hyrjes.</string>
-    <!--  The editable text field for a password's username. -->
-    <string name="saved_login_username_description_2" tools:ignore="UnusedResources">Fusha e përpunueshme e teksteve për emrin e përdoruesit të fjalëkalimit.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Fusha e përpunueshme e teksteve për emrin e përdoruesit.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Fusha e përpunueshme e teksteve për fjalëkalimin e kredencialeve të hyrjes.</string>
     <!--  The editable text field for a login's password. -->
@@ -2165,6 +2169,9 @@
     <string name="other_default_search_engine_suggestion_header">Kërkim me %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Ndërroni shfletuesin tuaj parazgjedhje</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Caktoni lidhje prej sajtesh, email-esh dhe mesazhezh për hapje të automatizuar në Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2423,6 +2430,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Përkthim Në Kryerje e Sipër</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Zgjidhni një gjuhë</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Pati një problem me përkthimin. Ju lutemi, riprovoni.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-tg/strings.xml b/app/src/main/res/values-tg/strings.xml
index 4ae0da3cf..72a7668f9 100644
--- a/app/src/main/res/values-tg/strings.xml
+++ b/app/src/main/res/values-tg/strings.xml
@@ -1773,6 +1773,8 @@
     <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Ниҳонвожаҳои нигоҳдоштаро муҳофизат намоед</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Барои муҳофизат кардани воридшавиҳо ва ниҳонвожаҳои худ аз дастрасии озод, агар касе дигар аз дастгоҳи шумо истифода барад, шаклвораи қулфи экран, рамзи PIN ё ниҳонвожаеро барои дастгоҳи худ танзим намоед.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Барои муҳофизат кардани ниҳонвожаҳои нигоҳдошташудаи худ аз дастрасии озод, агар касе дигар аз дастгоҳи шумо истифода барад, шаклвораи қулфи экран, рамзи PIN ё ниҳонвожаеро барои дастгоҳи худ танзим намоед.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Дертар</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->

From 0b7e74a9c165829294c89ce0b6f070885f753606 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Mon, 19 Feb 2024 00:03:26 +0000
Subject: [PATCH 187/222] Import translations from android-l10n

---
 app/src/main/res/values-es-rES/strings.xml | 134 ++++++++++++++-------
 app/src/main/res/values-oc/strings.xml     |   3 +
 2 files changed, 96 insertions(+), 41 deletions(-)

diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 05599fb39..5f00a5e88 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -247,6 +247,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalizar la página de inicio</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Pantalla de inicio</string>
@@ -254,6 +255,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Eliminar historial de navegación</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Traducir página</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Idioma seleccionado</string>
@@ -265,8 +269,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Escanear</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Buscador</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Ajustes del buscador</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -322,14 +324,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Las notificaciones te ayudan a hacer más con %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Las notificaciones te ayudan a hacer más con %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sincroniza tus pestañas entre dispositivos, administra descargas, obtén consejos sobre cómo aprovechar al máximo la protección de privacidad de %s y más.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sincroniza tus pestañas entre dispositivos, administra descargas, obtén consejos sobre cómo aprovechar al máximo la protección de privacidad de %s y más.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Continuar</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Continuar</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ahora no</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ahora no</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -448,21 +450,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modo solo HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducción de avisos de cookies</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Bloqueador de avisos de cookies</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Bloqueador de avisos de cookies en navegación privada</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducir los avisos de cookies</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Desactivado</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Activado</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s intenta rechazar automáticamente las solicitudes de cookies en los avisos de cookies.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Desactivada para este sitio</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -480,35 +472,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Sitio actualmente no compatible</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Activar la reducción de aviso de cookies para %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">¿Activar el bloqueo de aviso de cookies para %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Desactivar la reducción de aviso de cookies para %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">¿Desactivar el bloqueo de aviso de cookies para %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s no puede rechazar automáticamente los avisos de cookies en este sitio. Puede enviar una solicitud para admitir este sitio en el futuro.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s borrará las cookies de este sitio y recargará la página. Borrar todas las cookies puede cerrar tu sesión o vaciar los carritos de compras.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Tras desactivarlo, %1$s borrará las cookies y recargará la página. Esto puede desconectarte del sitio o vaciar tu carrito de compra.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s intenta rechazar automáticamente las solicitudes de cookies en sitios compatibles.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Al activarlo %1$s intentará rechazar automáticamente los avisos de cookies en este sitio.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Permitir que %1$s rechace los avisos de cookies?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s puede rechazar automáticamente muchas solicitudes de cookies.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ahora no</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Verás menos solicitudes de cookies</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Permitir</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s acaba de rechazar las cookies por ti</string>
@@ -725,6 +698,8 @@
     <string name="preferences_sync_bookmarks">Marcadores</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Inicios de sesión</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Contraseñas</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Pestañas abiertas</string>
     <!-- Preference for signing out -->
@@ -751,6 +726,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Tarjetas de crédito</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Direcciones</string>
 
@@ -1306,8 +1283,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Descartar</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">No se puede imprimir</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">No se puede imprimir esta página</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Imprimir</string>
@@ -1720,8 +1695,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Inicios de sesión y contraseñas</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Contraseñas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Guardar inicios de sesión y contraseñas</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Guardar contraseñas</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Preguntar antes de guardar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1740,26 +1719,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Añadir cuenta</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Añadir contraseña</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Inicios de sesión sincronizados</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizar contraseñas</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sincronizar inicios de sesión entre dispositivos</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronizar contraseñas entre dispositivos</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Inicios de sesión guardados</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Contraseñas guardadas</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Los inicios de sesión que guardes o sincronices con %s se mostrarán aquí.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Las contraseñas que guardes o sincronices con %s aparecerán aquí. Todas las contraseñas que guardes quedan cifradas.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Saber más sobre Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Descubre más sobre Sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Excepciones</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Los inicios de sesión y contraseñas no guardados aparecerán aquí.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s no guardará contraseñas para los sitios que se listen aquí.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">No se guardarán los inicios de sesión y contraseñas para estos sitios.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s no guardará las contraseñas para estos sitios.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eliminar todas las excepciones</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Buscar inicios de sesión</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Buscar contraseñas</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sitio</string>
     <!-- The header for the username for a login -->
@@ -1788,10 +1786,16 @@
     <string name="saved_login_hide_password">Ocultar contraseña</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Desbloquear para ver tus inicios de sesión guardados</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desbloquea para ver tus contraseñas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Asegurar tus usuarios y contraseñas</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Asegura tus contraseñas guardadas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Configura un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus usuarios y contraseñas guardados si alguien más tiene tu dispositivo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Establece un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus contraseñas guardadas y evitar que sean accedidas por otras personas en caso de que alguien más tenga tu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Más tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1812,6 +1816,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordenar menú de inicio de sesión</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menú ordenar contraseñas</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Autocompletado</string>
@@ -1819,11 +1826,17 @@
     <string name="preferences_addresses">Direcciones</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Tarjetas de crédito</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Guardar y autocompletar tarjetas</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Guardar y completar métodos de pago</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Los datos están cifrados</string>
 
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s cifra todos los métodos de pago que guardes</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar tarjetas entre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1831,17 +1844,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Añadir tarjeta de crédito</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Añadir tarjeta</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Administrar tarjetas guardadas</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Administrar tarjetas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Añadir dirección</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Administrar direcciones</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Guardar y autocompletar direcciones</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Guardar y completar direcciones</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Incluir información como números, correos electrónicos y direcciones de envío</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Incluye números de teléfono y direcciones de correo electrónico</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Añadir tarjeta</string>
     <!-- Title of the "Edit card" screen -->
@@ -1862,6 +1884,8 @@
     <string name="credit_cards_delete_card_button">Eliminar tarjeta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">¿Seguro que quieres eliminar esta tarjeta de crédito?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">¿Eliminar tarjeta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Eliminar</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1877,14 +1901,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Por favor, escriba un número válido de tarjeta de crédito</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Introduce un número de tarjeta válido</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Por favor, rellena este campo</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Añadir un nombre</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloquear para ver tus tarjetas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Asegurar tus tarjetas de crédito</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Protege tus métodos de pago guardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configura un patrón de bloqueo, PIN o contraseña para proteger el acceso a tus tarjetas guardadas si alguien más accede a tu dispositivo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Establece un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus métodos de pago guardados y evitar que sean accedidos por otras personas en caso de que alguien más tenga tu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1894,6 +1926,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Desbloquear para usar la información de la tarjeta de crédito almacenada</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desbloquea para utilizar métodos de pago guardados</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Añadir dirección</string>
     <!-- Title of the "Edit address" screen -->
@@ -1931,6 +1965,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">¿Seguro que quieres eliminar esta dirección?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">¿Eliminar esta dirección?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Eliminar</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2030,26 +2066,44 @@
     <string name="login_menu_edit_button">Editar</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">¿Seguro que quieres eliminar este inicio de sesión?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">¿Estás seguro de que quieres eliminar esta contraseña?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Eliminar</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancelar</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Opciones de inicio de sesión</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opciones de contraseña</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">El campo de texto editable para la dirección web del inicio de sesión.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">El campo de texto editable para la dirección del sitio web.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">El campo de texto editable para el nombre de usuario del inicio de sesión.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">El campo de texto editable para la contraseña del inicio de sesión.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">El campo de texto editable para la contraseña.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Guardar cambios para el inicio de sesión.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Guardar cambios.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Editar</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Editar contraseña</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Añadir nueva cuenta</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Añadir contraseña</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Se necesita contraseña</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Introduce una contraseña</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Se requiere nombre de usuario</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2149,7 +2203,7 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Buscar con %s</string>
 
-    <!-- Default browser experiment -->
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Configura enlaces de sitios web, correos electrónicos y mensajes para que se abran automáticamente en Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2223,8 +2277,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[Los <b>puntos destacados</b> provienen de reseñas de %s de los últimos 80 días que creemos que son fiables.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Saber más sobre %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">cómo %s de Mozilla determina la calidad de las reseñas</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">cómo determina %s la calidad de las reseñas</string>
     <!-- Text for title of settings section. -->
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 25873903b..923a215e3 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -2210,6 +2210,9 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <string name="other_default_search_engine_suggestion_header">Recèrca %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Cambiatz vòstre navegador per defaut</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Causir de dobrir los sites web, los corrièls e messatges automaticament dins Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->

From 5721ca96a45401bece0adfd83ed9ac7e581c3647 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 02:09:24 +0000
Subject: [PATCH 188/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-es-rAR/strings.xml |   2 +-
 app/src/main/res/values-es/strings.xml     | 134 ++++++++++++++-------
 app/src/main/res/values-sv-rSE/strings.xml |   2 +-
 app/src/main/res/values-vi/strings.xml     |   2 +-
 4 files changed, 96 insertions(+), 44 deletions(-)

diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 36b024d21..68be82b68 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -505,7 +505,7 @@
     <!-- Title shown in the error page for when trying to access a http website while https only mode is enabled. -->
     <string name="errorpage_httpsonly_title">Sitio seguro no disponible</string>
     <!-- Message shown in the error page for when trying to access a http website while https only mode is enabled. The message has two paragraphs. This is the first. -->
-    <string name="errorpage_httpsonly_message_title">Lo más probable es que el sitio web simplemente no sea compatible con HTTPs.</string>
+    <string name="errorpage_httpsonly_message_title">Lo más probable es que el sitio web simplemente no sea compatible con HTTPS.</string>
     <!-- Message shown in the error page for when trying to access a http website while https only mode is enabled. The message has two paragraphs. This is the second. -->
     <string name="errorpage_httpsonly_message_summary">Sin embargo, también es posible que un atacante esté involucrado. Si continúa al sitio web, no debe ingresar ninguna información sensible. Si continúa, el modo solo HTTPS se desactivará temporalmente para el sitio.</string>
     <!-- Preference for accessibility -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 05599fb39..5f00a5e88 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -247,6 +247,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalizar la página de inicio</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Pantalla de inicio</string>
@@ -254,6 +255,9 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Eliminar historial de navegación</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Traducir página</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Idioma seleccionado</string>
@@ -265,8 +269,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Escanear</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Buscador</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Ajustes del buscador</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -322,14 +324,14 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Las notificaciones te ayudan a hacer más con %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Las notificaciones te ayudan a hacer más con %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sincroniza tus pestañas entre dispositivos, administra descargas, obtén consejos sobre cómo aprovechar al máximo la protección de privacidad de %s y más.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sincroniza tus pestañas entre dispositivos, administra descargas, obtén consejos sobre cómo aprovechar al máximo la protección de privacidad de %s y más.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Continuar</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Continuar</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ahora no</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ahora no</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
@@ -448,21 +450,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modo solo HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducción de avisos de cookies</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Bloqueador de avisos de cookies</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Bloqueador de avisos de cookies en navegación privada</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducir los avisos de cookies</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Desactivado</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Activado</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s intenta rechazar automáticamente las solicitudes de cookies en los avisos de cookies.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Desactivada para este sitio</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -480,35 +472,16 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Sitio actualmente no compatible</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Activar la reducción de aviso de cookies para %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">¿Activar el bloqueo de aviso de cookies para %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Desactivar la reducción de aviso de cookies para %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">¿Desactivar el bloqueo de aviso de cookies para %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s no puede rechazar automáticamente los avisos de cookies en este sitio. Puede enviar una solicitud para admitir este sitio en el futuro.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s borrará las cookies de este sitio y recargará la página. Borrar todas las cookies puede cerrar tu sesión o vaciar los carritos de compras.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Tras desactivarlo, %1$s borrará las cookies y recargará la página. Esto puede desconectarte del sitio o vaciar tu carrito de compra.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s intenta rechazar automáticamente las solicitudes de cookies en sitios compatibles.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Al activarlo %1$s intentará rechazar automáticamente los avisos de cookies en este sitio.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Permitir que %1$s rechace los avisos de cookies?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s puede rechazar automáticamente muchas solicitudes de cookies.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ahora no</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Verás menos solicitudes de cookies</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Permitir</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s acaba de rechazar las cookies por ti</string>
@@ -725,6 +698,8 @@
     <string name="preferences_sync_bookmarks">Marcadores</string>
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Inicios de sesión</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Contraseñas</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Pestañas abiertas</string>
     <!-- Preference for signing out -->
@@ -751,6 +726,8 @@
 
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Tarjetas de crédito</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Direcciones</string>
 
@@ -1306,8 +1283,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Descartar</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">No se puede imprimir</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">No se puede imprimir esta página</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Imprimir</string>
@@ -1720,8 +1695,12 @@
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Inicios de sesión y contraseñas</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Contraseñas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
     <string name="preferences_passwords_save_logins">Guardar inicios de sesión y contraseñas</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Guardar contraseñas</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Preguntar antes de guardar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1740,26 +1719,45 @@
     <!-- Preference option for adding a login -->
     <string name="preferences_logins_add_login">Añadir cuenta</string>
 
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Añadir contraseña</string>
+
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Inicios de sesión sincronizados</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizar contraseñas</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">Sincronizar inicios de sesión entre dispositivos</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronizar contraseñas entre dispositivos</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Inicios de sesión guardados</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Contraseñas guardadas</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text">Los inicios de sesión que guardes o sincronices con %s se mostrarán aquí.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Las contraseñas que guardes o sincronices con %s aparecerán aquí. Todas las contraseñas que guardes quedan cifradas.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Saber más sobre Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Descubre más sobre Sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Excepciones</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Los inicios de sesión y contraseñas no guardados aparecerán aquí.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s no guardará contraseñas para los sitios que se listen aquí.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">No se guardarán los inicios de sesión y contraseñas para estos sitios.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s no guardará las contraseñas para estos sitios.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eliminar todas las excepciones</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Buscar inicios de sesión</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Buscar contraseñas</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sitio</string>
     <!-- The header for the username for a login -->
@@ -1788,10 +1786,16 @@
     <string name="saved_login_hide_password">Ocultar contraseña</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Desbloquear para ver tus inicios de sesión guardados</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desbloquea para ver tus contraseñas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Asegurar tus usuarios y contraseñas</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Asegura tus contraseñas guardadas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Configura un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus usuarios y contraseñas guardados si alguien más tiene tu dispositivo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Establece un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus contraseñas guardadas y evitar que sean accedidas por otras personas en caso de que alguien más tenga tu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Más tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1812,6 +1816,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordenar menú de inicio de sesión</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menú ordenar contraseñas</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Autocompletado</string>
@@ -1819,11 +1826,17 @@
     <string name="preferences_addresses">Direcciones</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Tarjetas de crédito</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Guardar y autocompletar tarjetas</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Guardar y completar métodos de pago</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Los datos están cifrados</string>
 
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s cifra todos los métodos de pago que guardes</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar tarjetas entre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1831,17 +1844,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Añadir tarjeta de crédito</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Añadir tarjeta</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Administrar tarjetas guardadas</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Administrar tarjetas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Añadir dirección</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Administrar direcciones</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Guardar y autocompletar direcciones</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Guardar y completar direcciones</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Incluir información como números, correos electrónicos y direcciones de envío</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Incluye números de teléfono y direcciones de correo electrónico</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Añadir tarjeta</string>
     <!-- Title of the "Edit card" screen -->
@@ -1862,6 +1884,8 @@
     <string name="credit_cards_delete_card_button">Eliminar tarjeta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">¿Seguro que quieres eliminar esta tarjeta de crédito?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">¿Eliminar tarjeta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Eliminar</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1877,14 +1901,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Por favor, escriba un número válido de tarjeta de crédito</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Introduce un número de tarjeta válido</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Por favor, rellena este campo</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Añadir un nombre</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloquear para ver tus tarjetas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Asegurar tus tarjetas de crédito</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Protege tus métodos de pago guardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Configura un patrón de bloqueo, PIN o contraseña para proteger el acceso a tus tarjetas guardadas si alguien más accede a tu dispositivo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Establece un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus métodos de pago guardados y evitar que sean accedidos por otras personas en caso de que alguien más tenga tu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1894,6 +1926,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Desbloquear para usar la información de la tarjeta de crédito almacenada</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desbloquea para utilizar métodos de pago guardados</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Añadir dirección</string>
     <!-- Title of the "Edit address" screen -->
@@ -1931,6 +1965,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">¿Seguro que quieres eliminar esta dirección?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">¿Eliminar esta dirección?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Eliminar</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2030,26 +2066,44 @@
     <string name="login_menu_edit_button">Editar</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">¿Seguro que quieres eliminar este inicio de sesión?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">¿Estás seguro de que quieres eliminar esta contraseña?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Eliminar</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancelar</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Opciones de inicio de sesión</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opciones de contraseña</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">El campo de texto editable para la dirección web del inicio de sesión.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">El campo de texto editable para la dirección del sitio web.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">El campo de texto editable para el nombre de usuario del inicio de sesión.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">El campo de texto editable para la contraseña del inicio de sesión.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">El campo de texto editable para la contraseña.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Guardar cambios para el inicio de sesión.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Guardar cambios.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Editar</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Editar contraseña</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Añadir nueva cuenta</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Añadir contraseña</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Se necesita contraseña</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Introduce una contraseña</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Se requiere nombre de usuario</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2149,7 +2203,7 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Buscar con %s</string>
 
-    <!-- Default browser experiment -->
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Configura enlaces de sitios web, correos electrónicos y mensajes para que se abran automáticamente en Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2223,8 +2277,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[Los <b>puntos destacados</b> provienen de reseñas de %s de los últimos 80 días que creemos que son fiables.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Saber más sobre %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">cómo %s de Mozilla determina la calidad de las reseñas</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">cómo determina %s la calidad de las reseñas</string>
     <!-- Text for title of settings section. -->
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index b4c270ba6..f718c9bed 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -505,7 +505,7 @@
     <!-- Title shown in the error page for when trying to access a http website while https only mode is enabled. -->
     <string name="errorpage_httpsonly_title">Säker webbplats är inte tillgänglig</string>
     <!-- Message shown in the error page for when trying to access a http website while https only mode is enabled. The message has two paragraphs. This is the first. -->
-    <string name="errorpage_httpsonly_message_title">Troligtvis stöder webbplatsen helt enkelt inte HTTPs.</string>
+    <string name="errorpage_httpsonly_message_title">Troligtvis stöder webbplatsen helt enkelt inte HTTPS.</string>
     <!-- Message shown in the error page for when trying to access a http website while https only mode is enabled. The message has two paragraphs. This is the second. -->
     <string name="errorpage_httpsonly_message_summary">Men det är också möjligt att en angripare är inblandad. Om du fortsätter till webbplatsen ska du inte ange någon känslig information. Om du fortsätter kommer endast HTTPS-läget att stängas av tillfälligt för webbplatsen.</string>
     <!-- Preference for accessibility -->
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 356737044..1b7a232b0 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -498,7 +498,7 @@
     <!-- Title shown in the error page for when trying to access a http website while https only mode is enabled. -->
     <string name="errorpage_httpsonly_title">Trang web an toàn không khả dụng</string>
     <!-- Message shown in the error page for when trying to access a http website while https only mode is enabled. The message has two paragraphs. This is the first. -->
-    <string name="errorpage_httpsonly_message_title">Rất có thể, trang web chỉ đơn giản là không hỗ trợ HTTPs.</string>
+    <string name="errorpage_httpsonly_message_title">Rất có thể, trang web chỉ đơn giản là không hỗ trợ HTTPS.</string>
     <!-- Message shown in the error page for when trying to access a http website while https only mode is enabled. The message has two paragraphs. This is the second. -->
     <string name="errorpage_httpsonly_message_summary">Tuy nhiên, cũng có thể có kẻ tấn công tham gia. Nếu bạn tiếp tục vào trang web, bạn không nên nhập bất kỳ thông tin nhạy cảm nào. Nếu bạn tiếp tục, chế độ chỉ HTTPS sẽ tạm thời bị tắt cho trang web.</string>
     <!-- Preference for accessibility -->

From 6ae3c5ff4da063a5d61a8393c44d48ed2e84a91c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 02:10:06 +0000
Subject: [PATCH 189/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-en-rGB/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 31dfb31b8..7f37c4523 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -496,7 +496,7 @@
     <!-- Title shown in the error page for when trying to access a http website while https only mode is enabled. -->
     <string name="errorpage_httpsonly_title">Secure site not available</string>
     <!-- Message shown in the error page for when trying to access a http website while https only mode is enabled. The message has two paragraphs. This is the first. -->
-    <string name="errorpage_httpsonly_message_title">Most likely, the web site simply does not support HTTPs.</string>
+    <string name="errorpage_httpsonly_message_title">Most likely, the web site simply does not support HTTPS.</string>
     <!-- Message shown in the error page for when trying to access a http website while https only mode is enabled. The message has two paragraphs. This is the second. -->
     <string name="errorpage_httpsonly_message_summary">However, it’s also possible that an attacker is involved. If you continue to the web site, you should not enter any sensitive info. If you continue, HTTPS-Only mode will be turned off temporarily for the site.</string>
     <!-- Preference for accessibility -->

From e3ff678b695a9d38e673abb855633a57d4e799a2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 00:33:54 +0000
Subject: [PATCH 190/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-br/strings.xml     |  4 +++-
 app/src/main/res/values-nb-rNO/strings.xml |  2 +-
 app/src/main/res/values-uk/strings.xml     | 14 +++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index f9fc661f1..59e397fc1 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -2055,7 +2055,7 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Klask %s</string>
 
-    <!-- Default browser experiment -->
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Digeriñ liammoù al lec’hiennoù, posteloù ha kemennadennoù e Firefox en un doare emgefreek.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2249,6 +2249,8 @@
 
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">O treiñ</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Dibab ur yezh</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Ur gudenn zo bet gant an droidigezh. Klaskit en-dro.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 86347ea1a..aef3dd0fc 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -721,7 +721,7 @@
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards">Betalingskort</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Betalingsmetoder</string>
+    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Betalingsmåter</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresser</string>
 
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index b9f1506f0..8ce5dea5f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -603,7 +603,7 @@
     <!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
     <string name="preferences_customize_amo_collection">Власна збірка додатків</string>
     <!-- Button caption to confirm the add-on collection configuration -->
-    <string name="customize_addon_collection_ok">Гаразд</string>
+    <string name="customize_addon_collection_ok">OK</string>
     <!-- Button caption to abort the add-on collection configuration -->
     <string name="customize_addon_collection_cancel">Скасувати</string>
     <!-- Hint displayed on input field for custom collection name -->
@@ -926,7 +926,7 @@
     <!-- Dialog message shown after removing a study -->
     <string name="studies_restart_app">Програма припинить застосовувати зміни</string>
     <!-- Dialog button to confirm the removing a study. -->
-    <string name="studies_restart_dialog_ok">Гаразд</string>
+    <string name="studies_restart_dialog_ok">OK</string>
     <!-- Dialog button text for canceling removing a study. -->
     <string name="studies_restart_dialog_cancel">Скасувати</string>
 
@@ -1135,13 +1135,13 @@
     <!-- Button label for clearing all the information of site permissions-->
     <string name="clear_permissions">Очистити дозволи</string>
     <!-- Text for the OK button on Clear permissions dialog -->
-    <string name="clear_permissions_positive">Гаразд</string>
+    <string name="clear_permissions_positive">OK</string>
     <!-- Text for the cancel button on Clear permissions dialog -->
     <string name="clear_permissions_negative">Скасувати</string>
     <!-- Button label for clearing a site permission-->
     <string name="clear_permission">Очистити дозвіл</string>
     <!-- Text for the OK button on Clear permission dialog -->
-    <string name="clear_permission_positive">Гаразд</string>
+    <string name="clear_permission_positive">OK</string>
     <!-- Text for the cancel button on Clear permission dialog -->
     <string name="clear_permission_negative">Скасувати</string>
     <!-- Button label for clearing all the information on all sites-->
@@ -1249,7 +1249,7 @@
     <string name="create_collection_view">Переглянути</string>
 
     <!-- Text for the OK button from collection dialogs -->
-    <string name="create_collection_positive">Гаразд</string>
+    <string name="create_collection_positive">OK</string>
     <!-- Text for the cancel button from collection dialogs -->
     <string name="create_collection_negative">Скасувати</string>
 
@@ -1385,7 +1385,7 @@
     <!-- QR code scanner prompt dialog error message shown when a hostname does not contain http or https. -->
     <string name="qr_scanner_dialog_invalid">Вебадреса недійсна.</string>
     <!-- QR code scanner prompt dialog positive option when there is an error -->
-    <string name="qr_scanner_dialog_invalid_ok">Гаразд</string>
+    <string name="qr_scanner_dialog_invalid_ok">OK</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Ви дійсно хочете видалити %1$s?</string>
     <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
@@ -2140,7 +2140,7 @@
     <!-- Hint for renaming title of a shortcut -->
     <string name="shortcut_name_hint">Назва ярлика</string>
     <!-- Button caption to confirm the renaming of the top site. -->
-    <string name="top_sites_rename_dialog_ok">Гаразд</string>
+    <string name="top_sites_rename_dialog_ok">OK</string>
     <!-- Dialog button text for canceling the rename top site prompt. -->
     <string name="top_sites_rename_dialog_cancel">Скасувати</string>
 

From a352ab24b81f551cf0d39168dfe3cf83b8bff193 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 02:09:37 +0000
Subject: [PATCH 191/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-azb/strings.xml | 261 ++++++++++++++++++++++++
 app/src/main/res/values-sl/strings.xml  |   3 +
 app/src/main/res/values-tr/strings.xml  |   2 +-
 3 files changed, 265 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index 033094275..39348b26c 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -923,20 +923,137 @@
     <!-- Title of preference that allows a user to specify the auto-close settings for open tabs -->
     <string name="preference_auto_close_tabs" tools:ignore="UnusedResources">آچیق تاغلاریْ اوْتوماتیک باغلا</string>
 
+    <!-- Opening screen -->
+    <!-- Title of a preference that allows a user to choose what screen to show after opening the app -->
+    <string name="preferences_opening_screen">آچیلیش اکرانی</string>
     <!-- Option for always opening the homepage when re-opening the app -->
     <string name="opening_screen_homepage">آنایارپاق</string>
 
+    <!-- Option for always opening the user's last-open tab when re-opening the app -->
+    <string name="opening_screen_last_tab">سوْن تاغ</string>
+    <!-- Option for always opening the homepage when re-opening the app after four hours of inactivity -->
+    <string name="opening_screen_after_four_hours_of_inactivity">دؤرد ساعاتلیق حرکتسیزلیکدن سونرا آچیلان اصلی صفحه</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">ال‌ ایله باغلاییْن</string>
 
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
     <string name="close_tabs_after_one_day_summary">بیر گۆندن سوْنرا باغلایین</string>
 
+    <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one week-->
+    <string name="close_tabs_after_one_week_summary">بیر هفته سونرا باغلا</string>
+    <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one month-->
+    <string name="close_tabs_after_one_month_summary">بیر آی سونرا باغلا</string>
+    <!-- Summary for homepage preference indicating always opening the homepage when re-opening the app -->
+    <string name="opening_screen_homepage_summary">آنایارپاق‌دا آچ</string>
+    <!-- Summary for homepage preference indicating always opening the last-open tab when re-opening the app -->
+    <string name="opening_screen_last_tab_summary">سون تاغدا آچ</string>
+    <!-- Summary for homepage preference indicating opening the homepage when re-opening the app after four hours of inactivity -->
+    <string name="opening_screen_after_four_hours_of_inactivity_summary">دؤرد ساعاتدان سونرا آنایارپاق‌دا آچ</string>
+
+    <!-- Inactive tabs -->
+    <!-- Category header of a preference that allows a user to enable or disable the inactive tabs feature -->
+    <string name="preferences_inactive_tabs">کؤهنه تاغلاری ایشده اولمایان تاغا آپار</string>
+    <!-- Title of inactive tabs preference -->
+    <string name="preferences_inactive_tabs_title">ایکی هفته‌ده باخمادیغینیز تاغلار ایشده اولمایان بؤلومه آپاریلیر.</string>
+
     <!-- Studies -->
     <!-- Title of the remove studies button -->
     <string name="studies_remove">قالدیر</string>
 
 
+    <!-- Title of the active section on the studies list -->
+    <string name="studies_active">ایشده</string>
+
+    <!-- Description for studies, it indicates why Firefox use studies. The first parameter is the name of the application. -->
+    <string name="studies_description_2">%1$s ایمکانی وار هردن بیر آراشدیرمالاری نصب ائلیه و چالیشدیرا.</string>
+    <!-- Learn more link for studies, links to an article for more information about studies. -->
+    <string name="studies_learn_more">آرتیق بیلین</string>
+
+    <!-- Dialog message shown after removing a study -->
+    <string name="studies_restart_app">دگیشمه‌لری یئرینه سالماق اوچون اپلیکیشن‌دن چیخاجاق</string>
+    <!-- Dialog button to confirm the removing a study. -->
+    <string name="studies_restart_dialog_ok">تامام</string>
+    <!-- Dialog button text for canceling removing a study. -->
+    <string name="studies_restart_dialog_cancel">لغو</string>
+    <!-- Toast shown after turning on/off studies preferences -->
+    <string name="studies_toast_quit_application" tools:ignore="UnusedResources">دگیشمه‌لری یئرینه سالماق اوچون اپلیکیشن‌دن چیْخیلیر…</string>
+
+    <!-- Sessions -->
+    <!-- Title for the list of tabs -->
+    <string name="tab_header_label">آچیْق تاغ‌لار</string>
+    <!-- Title for the list of tabs in the current private session -->
+    <string name="tabs_header_private_tabs_title">گیزلی تاغ‌لار</string>
+    <!-- Title for the list of tabs in the synced tabs -->
+    <string name="tabs_header_synced_tabs_title">دؤنگل‌لنمیش تاغ‌لار</string>
+    <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
+    <string name="add_tab">تاغ آرتیر</string>
+    <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
+    <string name="add_private_tab">گیزلی تاغ آرتیر</string>
+    <!-- Text for the new tab button to indicate adding a new private tab in the tab -->
+    <string name="tab_drawer_fab_content">گیزلی</string>
+    <!-- Text for the new tab button to indicate syncing command on the synced tabs page -->
+    <string name="tab_drawer_fab_sync">دؤنگل</string>
+    <!-- Text shown in the menu for sharing all tabs -->
+    <string name="tab_tray_menu_item_share">بوتون تاغ‌لاری پایلاش</string>
+    <!-- Text shown in the menu to view recently closed tabs -->
+    <string name="tab_tray_menu_recently_closed">سوْن باغلانان تاغ‌لار</string>
+    <!-- Text shown in the tabs tray inactive tabs section -->
+    <string name="tab_tray_inactive_recently_closed" tools:ignore="UnusedResources">سون باغلانان‌لار</string>
+    <!-- Text shown in the menu to view account settings -->
+    <string name="tab_tray_menu_account_settings">حساب تنظیم‌لری</string>
+    <!-- Text shown in the menu to view tab settings -->
+    <string name="tab_tray_menu_tab_settings">تاغ تنظیم‌لری</string>
+    <!-- Text shown in the menu for closing all tabs -->
+    <string name="tab_tray_menu_item_close">بوتون تاغ‌لاریْ باغلا</string>
+    <!-- Text shown in the multiselect menu for bookmarking selected tabs. -->
+    <string name="tab_tray_multiselect_menu_item_bookmark">بوکمارک</string>
+    <!-- Text shown in the multiselect menu for closing selected tabs. -->
+    <string name="tab_tray_multiselect_menu_item_close">باغلا</string>
+
+    <!-- Content description for tabs tray multiselect share button -->
+    <string name="tab_tray_multiselect_share_content_description">سئچیلمیش تاغ‌لاری پایلاش</string>
+    <!-- Content description for tabs tray multiselect menu -->
+    <string name="tab_tray_multiselect_menu_content_description">سئچیلن تاغ‌لار منوسو</string>
+    <!-- Content description (not visible, for screen readers etc.): Removes tab from collection button. Removes the selected tab from collection when pressed -->
+    <string name="remove_tab_from_collection">تاغی مجموعه‌دن چیخار</string>
+    <!-- Text for button to enter multiselect mode in tabs tray -->
+    <string name="tabs_tray_select_tabs">تاغ‌لاری سئچین</string>
+    <!-- Content description (not visible, for screen readers etc.): Close tab button. Closes the current session when pressed -->
+    <string name="close_tab">تاغی باغلا</string>
+    <!-- Content description (not visible, for screen readers etc.): Close tab <title> button. First parameter is tab title  -->
+    <string name="close_tab_title">%s تاغی باغلا</string>
+    <!-- Content description (not visible, for screen readers etc.): Opens the open tabs menu when pressed -->
+    <string name="open_tabs_menu">آچیق تاغ‌لار منوسونو آچ</string>
+    <!-- Open tabs menu item to save tabs to collection -->
+    <string name="tabs_menu_save_to_collection1">تاغ‌لاریْ مجموعه‌ده ساخلاییْن</string>
+    <!-- Text for the menu button to delete a collection -->
+    <string name="collection_delete">مجموعه‌نی سیل</string>
+
+    <!-- Text for the menu button to rename a collection -->
+    <string name="collection_rename">مجموعه‌نی یئنی‌دن آدلاندیْر</string>
+    <!-- Text for the button to open tabs of the selected collection -->
+    <string name="collection_open_tabs">تاغ‌لاریْ آچ</string>
+    <!-- Hint for adding name of a collection -->
+    <string name="collection_name_hint">مجموعه آدیْ</string>
+    <!-- Text for the menu button to rename a top site -->
+    <string name="rename_top_site">یئنی‌دن آدلاندیْر</string>
+    <!-- Text for the menu button to remove a top site -->
+    <string name="remove_top_site">قالدیر</string>
+    <!-- Text for the menu button to delete a top site from history -->
+    <string name="delete_from_history">گئچمیش‌دن سیل</string>
+
+    <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
+    <string name="pwa_site_controls_title_private">%1$s (گیزلی حالت)</string>
+
+    <!-- History -->
+    <!-- Text for the button to search all history -->
+    <string name="history_search_1">آختاریش شرطلرینی گیر</string>
+    <!-- Text for the button to clear all history -->
+    <string name="history_delete_all">گئچمیشی سیل</string>
+    <!-- Text for the snackbar to confirm that multiple browsing history items has been deleted -->
+    <string name="history_delete_multiple_items_snackbar">گئچمیش سیلیندی</string>
+    <!-- Text for the snackbar to confirm that a single browsing history item has been deleted. The first parameter is the shortened URL of the deleted history item. -->
+    <string name="history_delete_single_item_snackbar">%1$s سیلیندی</string>
     <!-- Context description text for the button to delete a single history item -->
     <string name="history_delete_item">سیل</string>
     <!-- History multi select title in app bar
@@ -975,11 +1092,155 @@
     <!-- Title text displayed on the tab crash page. This first parameter is the name of the application (For example: Fenix) -->
     <string name="tab_crash_title_2">باغیشلایین، %1$s بو صفحه‌نی دولدورا بیلمه‌دی.</string>
 
+    <!-- Send crash report checkbox text on the tab crash page -->
+    <string name="tab_crash_send_report">سیْنماق راپورتونو موْزیلایا گؤندر</string>
+    <!-- Close tab button text on the tab crash page -->
+    <string name="tab_crash_close">تاغی باغلا</string>
+    <!-- Restore tab button text on the tab crash page -->
+    <string name="tab_crash_restore">تاغی گئنه آل</string>
+
+    <!-- Bookmarks -->
+    <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
+    <string name="bookmark_delete_folder_confirmation_dialog">بو قوْولوغو سیلمک ایسته‌دیگینیزه آرخایینسیز؟</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s سئچیلن موریدلری سیله‌جک.</string>
     <!-- Text for the cancel button on delete bookmark dialog -->
     <string name="bookmark_delete_negative">لغو</string>
+    <!-- Screen title for adding a bookmarks folder -->
+    <string name="bookmark_add_folder">قوْولوق اکله</string>
+    <!-- Snackbar title shown after a bookmark has been created. -->
+    <string name="bookmark_saved_snackbar">بوکمارک ساخلاندی!</string>
+    <!-- Snackbar edit button shown after a bookmark has been created. -->
+    <string name="edit_bookmark_snackbar_action">دوزه‌لیش</string>
     <!-- Bookmark overflow menu edit button -->
     <string name="bookmark_menu_edit_button">دوزه‌لیش</string>
 
+    <!-- Bookmark overflow menu copy button -->
+    <string name="bookmark_menu_copy_button">کوْپی</string>
+    <!-- Bookmark overflow menu share button -->
+    <string name="bookmark_menu_share_button">پایلاش</string>
+
+    <!-- Bookmark overflow menu open in new tab button -->
+    <string name="bookmark_menu_open_in_new_tab_button">یئنی تاغدا آچ</string>
+    <!-- Bookmark overflow menu open in private tab button -->
+    <string name="bookmark_menu_open_in_private_tab_button">گیزلی تاغدا آچ</string>
+    <!-- Bookmark overflow menu open all in tabs button -->
+    <string name="bookmark_menu_open_all_in_tabs_button">هامیْسینی یئنی تاغ‌لاردا آچ</string>
+    <!-- Bookmark overflow menu open all in private tabs button -->
+    <string name="bookmark_menu_open_all_in_private_tabs_button">هامیْسینی گیزلی تاغ‌لاردا آچ</string>
+    <!-- Bookmark overflow menu delete button -->
+    <string name="bookmark_menu_delete_button">سیل</string>
+    <!--Bookmark overflow menu save button -->
+    <string name="bookmark_menu_save_button">ساخلا</string>
+    <!-- Bookmark multi select title in app bar
+     The first parameter is the number of bookmarks selected -->
+    <string name="bookmarks_multi_select_title">%1$d سئچیلیدی</string>
+    <!-- Bookmark editing screen title -->
+    <string name="edit_bookmark_fragment_title">بوکمارک دوز‌ه‌لیشی</string>
+    <!-- Bookmark folder editing screen title -->
+    <string name="edit_bookmark_folder_fragment_title">قوْولوق دوزه‌لیشی</string>
+    <!-- Bookmark sign in button message -->
+    <string name="bookmark_sign_in_button">دؤنگل ائدیلن بوکمارک‌لاری گؤرمک اوچون اوْتوروُم آچین</string>
+    <!-- Bookmark URL editing field label -->
+    <string name="bookmark_url_label">URL</string>
+    <!-- Bookmark FOLDER editing field label -->
+    <string name="bookmark_folder_label">قوْولوق</string>
+    <!-- Bookmark NAME editing field label -->
+    <string name="bookmark_name_label">آد</string>
+    <!-- Bookmark add folder screen title -->
+    <string name="bookmark_add_folder_fragment_label">قوْولوق اکله</string>
+    <!-- Bookmark select folder screen title -->
+    <string name="bookmark_select_folder_fragment_label">قوْولوق سئچ</string>
+
+    <!-- Bookmark editing error missing title -->
+    <string name="bookmark_empty_title_error">بیر عنوان وئرمه‌لیسیز</string>
+    <!-- Bookmark editing error missing or improper URL -->
+    <string name="bookmark_invalid_url_error">گئچرسیز URL</string>
+    <!-- Bookmark screen message for empty bookmarks folder -->
+    <string name="bookmarks_empty_message">هئچ بوکمارک بوردا یوخ</string>
+    <!-- Bookmark snackbar message on deletion
+     The first parameter is the host part of the URL of the bookmark deleted, if any -->
+    <string name="bookmark_deletion_snackbar_message">%1$s سیلیندی</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_2">بوکمارک‌لار سیلیندی</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">سئچیلن قوْولوق سیلینیر</string>
+    <!-- Bookmark undo button for deletion snackbar action -->
+    <string name="bookmark_undo_deletion">لغو</string>
+
+    <!-- Text for the button to search all bookmarks -->
+    <string name="bookmark_search">آختاریش شرطلرینی گیر</string>
+
+    <!-- Site Permissions -->
+    <!-- Button label that take the user to the Android App setting -->
+    <string name="phone_feature_go_to_settings">تنظیم‌لره گئدین</string>
+    <!-- Content description (not visible, for screen readers etc.): Quick settings sheet
+        to give users access to site specific information / settings. For example:
+        Secure settings status and a button to modify site permissions -->
+    <string name="quick_settings_sheet">یئیین تنظیم‌لر صفحه‌سی</string>
+    <!-- Label that indicates that this option it the recommended one -->
+    <string name="phone_feature_recommended">توصیه اولموش</string>
+    <!-- Button label for clearing all the information of site permissions-->
+    <string name="clear_permissions">ایجازه‌لری پوز</string>
+    <!-- Text for the OK button on Clear permissions dialog -->
+    <string name="clear_permissions_positive">تامام</string>
+    <!-- Text for the cancel button on Clear permissions dialog -->
+    <string name="clear_permissions_negative">لغو</string>
+    <!-- Button label for clearing a site permission-->
+    <string name="clear_permission">ایجازه‌‌نی پوْز</string>
+
+    <!-- Text for the OK button on Clear permission dialog -->
+    <string name="clear_permission_positive">تامام</string>
+    <!-- Text for the cancel button on Clear permission dialog -->
+    <string name="clear_permission_negative">لغو</string>
+    <!-- Button label for clearing all the information on all sites-->
+    <string name="clear_permissions_on_all_sites">بوتون سایتلارداکی ایجازه‌لری پوْز</string>
+    <!-- Preference for altering video and audio autoplay for all websites -->
+    <string name="preference_browser_feature_autoplay">اؤزاؤزونه چالما</string>
+
+    <!-- Preference for altering the camera access for all websites -->
+    <string name="preference_phone_feature_camera">کامرا</string>
+    <!-- Preference for altering the microphone access for all websites -->
+    <string name="preference_phone_feature_microphone">میکروفون</string>
+    <!-- Preference for altering the location access for all websites -->
+    <string name="preference_phone_feature_location">قونوم</string>
+    <!-- Preference for altering the notification access for all websites -->
+    <string name="preference_phone_feature_notification">بیلدیریش‌</string>
+    <!-- Preference for altering the persistent storage access for all websites -->
+    <string name="preference_phone_feature_persistent_storage">قالیجی ساخلاما</string>
+    <!-- Preference for altering the storage access setting for all websites -->
+    <string name="preference_phone_feature_cross_origin_storage_access">سایتلار آراسی کوکی‌لر</string>
+    <!-- Preference for altering the EME access for all websites -->
+    <string name="preference_phone_feature_media_key_system_access">DRM ایله کونترول اولونان موحتوا</string>
+
+    <!-- Label that indicates that a permission must be asked always -->
+    <string name="preference_option_phone_feature_ask_to_allow">ایجازه ایسته‌یین</string>
+    <!-- Label that indicates that a permission must be blocked -->
+    <string name="preference_option_phone_feature_blocked">مسدود اوْلوندو</string>
+    <!-- Label that indicates that a permission must be allowed -->
+    <string name="preference_option_phone_feature_allowed">ایجازه وئریلدی</string>
+    <!--Label that indicates a permission is by the Android OS-->
+    <string name="phone_feature_blocked_by_android">اندروید طرفیندن مسدود اوْلوندو</string>
+    <!-- Preference for showing a list of websites that the default configurations won't apply to them -->
+    <string name="preference_exceptions">آیریْ توُتمالار</string>
+
+    <!-- Summary of tracking protection preference if tracking protection is set to off -->
+    <string name="tracking_protection_off">باغلیْ</string>
+    <!-- Summary of tracking protection preference if tracking protection is set to standard -->
+    <string name="tracking_protection_standard">استاندارد</string>
+    <!-- Summary of tracking protection preference if tracking protection is set to strict -->
+    <string name="tracking_protection_strict">بَرک</string>
+    <!-- Summary of tracking protection preference if tracking protection is set to custom -->
+    <string name="tracking_protection_custom">اؤزل</string>
+
+    <!-- Label for global setting that indicates that all video and audio autoplay is allowed -->
+    <string name="preference_option_autoplay_allowed2">سس و ویدئویا ایجازه وئر</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">سس و ویدئویا ایجازه وئر</string>
+
+    <!-- Label to describe what collections are to a new user without any collections -->
+    <string name="no_collections_description2">سیزین اوچون اؤنملی اولان شئی‌لری یئغین. \n داها سوْنرا یئیین گیریش اوچون اوْخشار آختاریش‌لاریْ، سایتلاریْ و تاغ‌لاریْ قروُپلاشدیرین.</string>
+
     <!-- Translations feature-->
 
     </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 91d638d45..4abd63817 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -2170,6 +2170,9 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Iskalnik %s</string>
 
+    <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Zamenjajte privzeti brskalnik</string>
     <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Nastavite, naj se povezave s spletnih strani, e-pošte in sporočil samodejno odpirajo v Firefoxu.</string>
 
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c273ae92e..115191558 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -714,7 +714,7 @@
     <!-- Label summary the date we last synced. The first parameter is date stamp showing last time synced -->
     <string name="sync_last_synced_summary">Son eşitleme: %s</string>
     <!-- Label summary showing never synced -->
-    <string name="sync_never_synced_summary">Son eşitleme: hiç</string>
+    <string name="sync_never_synced_summary">Son eşitleme: yok</string>
 
     <!-- Text for displaying the default device name.
         The first parameter is the application name, the second is the device manufacturer name

From d1a884963c5cbb31377c83d8babc3236065862bc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 24 Feb 2024 02:08:03 +0000
Subject: [PATCH 192/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-azb/strings.xml | 68 +++++++++++++++++++++++++
 app/src/main/res/values-el/strings.xml  |  2 +-
 app/src/main/res/values-th/strings.xml  | 45 ++++++++++++++++
 app/src/main/res/values-tr/strings.xml  |  4 +-
 4 files changed, 116 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index 39348b26c..d317cc475 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -1238,9 +1238,77 @@
     <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
     <string name="quick_setting_option_autoplay_allowed">سس و ویدئویا ایجازه وئر</string>
 
+    <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
+    <string name="preference_option_autoplay_allowed_wifi_only2">یالنیز موبایل سلولاردا سس و ویدئونو بلوْکلا</string>
+    <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
+    <string name="preference_option_autoplay_allowed_wifi_subtext">سس و ویدئو وایفای‌ اوستونده چالیناجاق</string>
+    <!-- Label for global setting that indicates that video autoplay is allowed, but audio autoplay is blocked -->
+    <string name="preference_option_autoplay_block_audio2">یالنیز سس مسدودو</string>
+    <!-- Label for site specific setting that indicates that video autoplay is allowed, but audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_block_audio">یالنیز سس مسدودو</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
+    <string name="preference_option_autoplay_blocked3">سس و ویدئویو مسدود ائله</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">سس و ویدئویو مسدود ائله</string>
+    <!-- Summary of delete browsing data on quit preference if it is set to on -->
+    <string name="delete_browsing_data_quit_on">آچیق</string>
+    <!-- Summary of delete browsing data on quit preference if it is set to off -->
+    <string name="delete_browsing_data_quit_off">باغلیْ</string>
+    <!-- Summary of studies preference if it is set to on -->
+    <string name="studies_on">آچیق</string>
+    <!-- Summary of studies data on quit preference if it is set to off -->
+    <string name="studies_off">باغلیْ</string>
+
+    <!-- Collections -->
+    <!-- Collections header on home fragment -->
+    <string name="collections_header">مجموعه‌لر</string>
+    <!-- Content description (not visible, for screen readers etc.): Opens the collection menu when pressed -->
+    <string name="collection_menu_button_content_description">مجموعه‌لر منوسو</string>
     <!-- Label to describe what collections are to a new user without any collections -->
     <string name="no_collections_description2">سیزین اوچون اؤنملی اولان شئی‌لری یئغین. \n داها سوْنرا یئیین گیریش اوچون اوْخشار آختاریش‌لاریْ، سایتلاریْ و تاغ‌لاریْ قروُپلاشدیرین.</string>
 
+    <!-- Title for the "select tabs" step of the collection creator -->
+    <string name="create_collection_select_tabs">تاغ‌لاری سئچین</string>
+    <!-- Title for the "select collection" step of the collection creator -->
+    <string name="create_collection_select_collection">مجموعه سئچین</string>
+    <!-- Title for the "name collection" step of the collection creator -->
+    <string name="create_collection_name_collection">مجموعه‌ آدی</string>
+    <!-- Button to add new collection for the "select collection" step of the collection creator -->
+    <string name="create_collection_add_new_collection">یئنی مجموعه اکله</string>
+
+    <!-- Button to select all tabs in the "select tabs" step of the collection creator -->
+    <string name="create_collection_select_all">هامیسینی سئچ</string>
+    <!-- Button to deselect all tabs in the "select tabs" step of the collection creator -->
+    <string name="create_collection_deselect_all">هامیسینی سئچمه</string>
+    <!-- Text to prompt users to select the tabs to save in the "select tabs" step of the collection creator -->
+    <string name="create_collection_save_to_collection_empty">ساخلاناجاق تاغ‌لاری سئچ</string>
+    <!-- Text to show users how many tabs they have selected in the "select tabs" step of the collection creator.
+     %d is a placeholder for the number of tabs selected. -->
+    <string name="create_collection_save_to_collection_tabs_selected">%d تاغ سئچیلدی</string>
+    <!-- Text to show users they have one tab selected in the "select tabs" step of the collection creator.
+    %d is a placeholder for the number of tabs selected. -->
+    <string name="create_collection_save_to_collection_tab_selected">%d تاغ سئچیلدی</string>
+    <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
+    <string name="create_collection_tabs_saved">تاغ‌لار ساخلاندیْ!</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">مجموعه ساخلاندیْ!</string>
+
+    <!-- Text shown in snackbar when one tab has been saved in a collection -->
+    <string name="create_collection_tab_saved">تاغ ساخلاندیْ!</string>
+    <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
+    <string name="create_collection_close">باغلا</string>
+    <!-- Button to save currently selected tabs in the "select tabs" step of the collection creator-->
+    <string name="create_collection_save">ساخلا</string>
+    <!-- Snackbar action to view the collection the user just created or updated -->
+    <string name="create_collection_view">گؤستر</string>
+    <!-- Text for the OK button from collection dialogs -->
+    <string name="create_collection_positive">تامام</string>
+    <!-- Text for the cancel button from collection dialogs -->
+    <string name="create_collection_negative">لغو</string>
+
+    <!-- Default name for a new collection in "name new collection" step of the collection creator. %d is a placeholder for the number of collections-->
+    <string name="create_collection_default_name">%d مجموعه‌سی</string>
+
     <!-- Translations feature-->
 
     </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index f99fb52bd..4de3758d7 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1562,7 +1562,7 @@
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
     <string name="preference_enhanced_tracking_protection_custom_cookies_5">Απομόνωση cookie μεταξύ ιστοτόπων</string>
     <!-- Preference for Global Privacy Control for the custom privacy settings for Global Privacy Control. '&amp;' is replaced with the ampersand symbol: &-->
-    <string name="preference_enhanced_tracking_protection_custom_global_privacy_control">Αποστολή αιτήματος μη πώλησης και κοινοποίησης των δεδομένων μου στους ιστοτόπους</string>
+    <string name="preference_enhanced_tracking_protection_custom_global_privacy_control">Αποστολή αιτήματος μη πώλησης και κοινοποίησης δεδομένων στους ιστοτόπους</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content">Περιεχόμενο καταγραφής</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 152ab7fc3..f37d2d2b5 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -250,6 +250,9 @@
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">ล้างประวัติการเรียกดู</string>
 
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">แปลหน้า</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">ภาษาที่เลือก</string>
@@ -1714,8 +1717,12 @@
     <string name="preferences_passwords_exceptions">ข้อยกเว้น</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">การเข้าสู่ระบบและรหัสผ่านที่ไม่ได้บันทึกจะถูกแสดงที่นี่</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s จะไม่บันทึกรหัสผ่านสำหรับไซต์ที่แสดงอยู่ที่นี่</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">การเข้าสู่ระบบและรหัสผ่านจะไม่ถูกบันทึกสำหรับไซต์เหล่านี้</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s จะไม่บันทึกรหัสผ่านสำหรับไซต์เหล่านี้</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">ลบข้อยกเว้นทั้งหมด</string>
     <!-- Hint for search box in logins list -->
@@ -1754,8 +1761,12 @@
     <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">ปลดล็อกเพื่อดูรหัสผ่านที่บันทึกไว้ของคุณ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">รักษาความปลอดภัยการเข้าสู่ระบบและรหัสผ่านของคุณ</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">รักษาความปลอดภัยให้กับรหัสผ่านที่บันทึกไว้ของคุณ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">ตั้งค่ารูปแบบการล็อกอุปกรณ์, PIN, หรือรหัสผ่านเพื่อปกป้องไม่ให้ใครเข้าถึงการเข้าสู่ระบบและรหัสผ่านที่บันทึกไว้ของคุณหากคนอื่นมีอุปกรณ์ของคุณ</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">ตั้งค่ารูปแบบการล็อกอุปกรณ์, PIN, หรือรหัสผ่านเพื่อปกป้องไม่ให้ใครเข้าถึงรหัสผ่านที่บันทึกไว้ของคุณหากคนอื่นมีอุปกรณ์ของคุณ</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">ภายหลัง</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1775,6 +1786,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">เรียงเมนูเข้าสู่ระบบ</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">เมนูเรียงลำดับรหัสผ่าน</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">การเติมอัตโนมัติ</string>
@@ -1790,6 +1804,8 @@
     <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">บันทึกและเติมวิธีการชำระเงิน</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">ข้อมูลถูกเข้ารหัส</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s จะเข้ารหัสลับวิธีการชำระเงินทั้งหมดที่คุณบันทึกไว้</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">ซิงค์บัตรระหว่างอุปกรณ์</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1864,8 +1880,12 @@
     <string name="credit_cards_biometric_prompt_message">ปลดล็อกเพื่อดูบัตรเครดิตที่บันทึกไว้ของคุณ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">รักษาความปลอดภัยให้กับบัตรเครดิตของคุณ</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">รักษาความปลอดภัยให้กับวิธีการชำระเงินที่บันทึกไว้ของคุณ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">ตั้งค่ารูปแบบการล็อกอุปกรณ์, PIN, หรือรหัสผ่านเพื่อปกป้องไม่ให้ใครเข้าถึงบัตรเครดิตที่บันทึกไว้ของคุณหากคนอื่นมีอุปกรณ์ของคุณ</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">ตั้งค่ารูปแบบการล็อกอุปกรณ์, PIN, หรือรหัสผ่านเพื่อปกป้องไม่ให้ใครเข้าถึงวิธีการชำระเงินที่บันทึกไว้ของคุณหากคนอื่นมีอุปกรณ์ของคุณ</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">ตั้งค่าตอนนี้</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1875,6 +1895,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">ปลดล็อกเพื่อใช้ข้อมูลบัตรเครดิตที่เก็บไว้</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">ปลดล็อกเพื่อใช้วิธีการชำระเงินที่บันทึกไว้</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">เพิ่มที่อยู่</string>
     <!-- Title of the "Edit address" screen -->
@@ -1912,6 +1934,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">คุณแน่ใจหรือไม่ว่าต้องการลบที่อยู่นี้?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">ลบที่อยู่นี้หรือไม่?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">ลบ</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2010,18 +2034,28 @@
     <string name="login_menu_edit_button">แก้ไข</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">คุณแน่ใจหรือไม่ที่ต้องการจะลบการเข้าสู่ระบบนี้?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">คุณแน่ใจหรือไม่ว่าต้องการลบรหัสผ่านนี้?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">ลบ</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">ยกเลิก</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">ตัวเลือกการเข้าสู่ระบบ</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">ตัวเลือกรหัสผ่าน</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">ช่องข้อความที่แก้ไขได้สำหรับที่อยู่เว็บของการเข้าสู่ระบบ</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">ช่องข้อความที่แก้ไขได้สำหรับที่อยู่เว็บไซต์</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">ช่องข้อความที่แก้ไขได้สำหรับชื่อผู้ใช้ของการเข้าสู่ระบบ</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">ช่องข้อความที่แก้ไขได้สำหรับชื่อผู้ใช้</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">ช่องข้อความที่แก้ไขได้สำหรับรหัสผ่านของการเข้าสู่ระบบ</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">ช่องข้อความที่แก้ไขได้สำหรับรหัสผ่าน</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">บันทึกการเปลี่ยนแปลงเพื่อเข้าสู่ระบบ</string>
     <!--  The button description to save changes to an edited password. -->
@@ -2040,6 +2074,8 @@
     <string name="saved_login_password_required_2" tools:ignore="UnusedResources">ใส่รหัสผ่าน</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">ต้องการชื่อผู้ใช้</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">ป้อนชื่อผู้ใช้</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">ต้องการชื่อโฮสต์</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2140,6 +2176,9 @@
     <string name="other_default_search_engine_suggestion_header">ค้นหาด้วย %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">เปลี่ยนเบราว์เซอร์เริ่มต้นของคุณ</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">ตั้งลิงก์จากเว็บไซต์ อีเมล และข้อความให้เปิดโดยอัตโนมัติใน Firefox</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2395,6 +2434,8 @@
     <string name="translations_bottom_sheet_translating_in_progress">กำลังแปล</string>
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">อยู่ระหว่างการแปล</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">เลือกภาษา</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">เกิดปัญหาในการแปล โปรดลองอีกครั้ง</string>
 
@@ -2416,6 +2457,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">ไม่ต้องแปล %1$s เลย</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">ไม่ต้องแปลไซต์นี้เลย</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">แทนที่การตั้งค่าอื่นๆ ทั้งหมด</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">แทนที่การเสนอให้แปล</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">การตั้งค่าการแปล</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 115191558..747d55275 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -2258,7 +2258,7 @@
     <!-- Text for title of settings section. -->
     <string name="review_quality_check_settings_title">Ayarlar</string>
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
-    <string name="review_quality_check_settings_recommended_products">Değerlendirme denetleyicisinde reklamları göster</string>
+    <string name="review_quality_check_settings_recommended_products">Değerlendirme kontrolcüsünde reklamları göster</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
     <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Ara sıra ilgili ürünlerin reklamlarını görebilirsiniz. Yalnızca güvenilir değerlendirmeleri olan ürünlerin reklamlarını kabul ediyoruz. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
@@ -2284,7 +2284,7 @@
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title">Ürün mevcut değil</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
-    <string name="review_quality_check_product_availability_warning_body">Bu ürünün yeniden stoğa girdiğini görürseniz bize bildirin, biz de değerlendirmeleri kontrol etmeye çalışalım.</string>
+    <string name="review_quality_check_product_availability_warning_body">Bu ürünün yeniden stoka girdiğini görürseniz bize bildirin, biz de değerlendirmeleri kontrol etmeye çalışalım.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Ürünün stokta olduğunu bildir</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->

From 8d292368ae7b514b85f12da674680c80f64d4e7e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 02:11:47 +0000
Subject: [PATCH 193/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-azb/strings.xml    | 44 ++++++++++++++++++++++
 app/src/main/res/values-es-rES/strings.xml | 13 +++++++
 app/src/main/res/values-hu/strings.xml     |  4 +-
 3 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-azb/strings.xml b/app/src/main/res/values-azb/strings.xml
index d317cc475..eaf9def6d 100644
--- a/app/src/main/res/values-azb/strings.xml
+++ b/app/src/main/res/values-azb/strings.xml
@@ -1309,6 +1309,50 @@
     <!-- Default name for a new collection in "name new collection" step of the collection creator. %d is a placeholder for the number of collections-->
     <string name="create_collection_default_name">%d مجموعه‌سی</string>
 
+    <!-- Share -->
+    <!-- Share screen header -->
+    <string name="share_header_2">پایلاش</string>
+    <!-- Content description (not visible, for screen readers etc.):
+        "Share" button. Opens the share menu when pressed. -->
+    <string name="share_button_content_description">پایلاش</string>
+    <!-- Text for the Save to PDF feature in the share menu -->
+    <string name="share_save_to_pdf">PDF اولاراق ساخلا</string>
+    <!-- Text for error message when generating a PDF file Text. -->
+    <string name="unable_to_save_to_pdf_error">PDF یارادیلانمادیْ</string>
+    <!-- Text for standard error snackbar dismiss button. -->
+    <string name="standard_snackbar_error_dismiss">باغلا</string>
+    <!-- Text for error message when printing a page and it fails. -->
+    <string name="unable_to_print_page_error">بو صفحه‌ پرینت اوْلانمیر</string>
+    <!-- Text for the print feature in the share and browser menu -->
+    <string name="menu_print">پرینت</string>
+    <!-- Sub-header in the dialog to share a link to another sync device -->
+    <string name="share_device_subheader">جهازا گؤندر</string>
+     <!-- Sub-header in the dialog to share a link to an app from the full list -->
+    <string name="share_link_all_apps_subheader">بوتون عمل‌لر</string>
+     <!-- Sub-header in the dialog to share a link to an app from the most-recent sorted list -->
+    <string name="share_link_recent_apps_subheader">یاخین‌دا ایشله‌دیلمیش</string>
+    <!-- Text for the copy link action in the share screen. -->
+    <string name="share_copy_link_to_clipboard">کلیپ‌بوردا کوْپی ائله</string>
+    <!-- Toast shown after copying link to clipboard -->
+    <string name="toast_copy_link_to_clipboard">کلیپ‌بوْردا کوْپی اوْلوندو</string>
+    <!-- An option from the share dialog to sign into sync -->
+    <string name="sync_sign_in">دؤنگله گیریش</string>
+     <!-- An option from the three dot menu to sync and save data -->
+    <string name="sync_menu_sync_and_save_data">دیتا دؤنگلی و ساخلاماسی</string>
+    <!-- An option from the share dialog to send link to all other sync devices -->
+    <string name="sync_send_to_all">بوتون جهازلارا گؤندر</string>
+    <!-- An option from the share dialog to reconnect to sync -->
+    <string name="sync_reconnect">دونگلی کَس</string>
+    <!-- Text displayed when sync is offline and cannot be accessed -->
+    <string name="sync_offline">آفلاین</string>
+    <!-- An option to connect additional devices -->
+    <string name="sync_connect_device">باشقا جهازا باغلا</string>
+
+    <!-- The dialog text shown when additional devices are not available -->
+    <string name="sync_connect_device_dialog">بیر تاغ گؤندرمک اوچون آزی بیر باشقا جهازدا فایرفاکسا داخیل اوْلون.</string>
+    <!-- Confirmation dialog button -->
+    <string name="sync_confirmation_button">آنلادیم</string>
+
     <!-- Translations feature-->
 
     </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 5f00a5e88..e9888675a 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -2106,8 +2106,12 @@
     <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Introduce una contraseña</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Se requiere nombre de usuario</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Introduce un nombre de usuario</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Se requiere nombre de servidor</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Introduce una dirección web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Búsqueda por voz</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2203,6 +2207,9 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Buscar con %s</string>
 
+    <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Cambia tu navegador predeterminado</string>
     <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Configura enlaces de sitios web, correos electrónicos y mensajes para que se abran automáticamente en Firefox.</string>
 
@@ -2460,6 +2467,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Traducción en curso</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Selecciona un idioma</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Ha surgido un problema al traducir. Por favor inténtalo de nuevo.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2480,6 +2489,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">No traducir nunca %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">No traducir nunca este sitio</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Anula todas las demás configuraciones</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Anula las ofertas de traducción</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Ajustes de traducción</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index fad21e3e8..38ba20bd6 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -799,9 +799,9 @@
     <string name="preference_gestures_dynamic_toolbar">Görgetés az eszköztár elrejtéséhez</string>
 
     <!-- Preference for switching tabs by swiping horizontally on the toolbar -->
-    <string name="preference_gestures_swipe_toolbar_switch_tabs">Eszköztár oldalra seprése a lapok közti váltáshoz</string>
+    <string name="preference_gestures_swipe_toolbar_switch_tabs">Eszköztár oldalra csúsztatása a lapok közti váltáshoz</string>
     <!-- Preference for showing the opened tabs by swiping up on the toolbar-->
-    <string name="preference_gestures_swipe_toolbar_show_tabs">Eszköztár felfelé seprése a lapok megnyitásához</string>
+    <string name="preference_gestures_swipe_toolbar_show_tabs">Eszköztár felfelé csúsztatása a lapok megnyitásához</string>
 
     <!-- Library -->
     <!-- Option in Library to open Downloads page -->

From d3032bdc82ede1c87b20417adc9e650bbd3c610f Mon Sep 17 00:00:00 2001
From: "oana.horvath" <ohorvath@mozilla.com>
Date: Mon, 26 Feb 2024 12:54:14 +0200
Subject: [PATCH 194/222] Bug 1882035 - Disable non-sponsored suggestions UI
 tests in FirefoxSuggestTest

(cherry picked from commit e7ec19745b69e4ed606e6c4590f3d8eb7a1c37ce)
---
 .../java/org/mozilla/fenix/ui/FirefoxSuggestTest.kt           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/FirefoxSuggestTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/FirefoxSuggestTest.kt
index 1f8b929fc..ae384d063 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/FirefoxSuggestTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/FirefoxSuggestTest.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.ui
 
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
@@ -192,6 +193,7 @@ class FirefoxSuggestTest {
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2348374
     // Known bug that might affect this UI test: https://bugzilla.mozilla.org/show_bug.cgi?id=1813587
+    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1882035")
     @SmokeTest
     @Test
     fun verifyFirefoxSuggestNonSponsoredSearchResultsTest() {
@@ -219,6 +221,7 @@ class FirefoxSuggestTest {
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2348375
     // Known bug that might affect this UI test: https://bugzilla.mozilla.org/show_bug.cgi?id=1813587
+    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1882035")
     @Test
     fun verifyFirefoxSuggestNonSponsoredSearchResultsWithPartialKeywordTest() {
         runWithCondition(TestHelper.appContext.settings().enableFxSuggest) {
@@ -239,6 +242,7 @@ class FirefoxSuggestTest {
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2348376
     // Known bug that might affect this UI test: https://bugzilla.mozilla.org/show_bug.cgi?id=1813587
+    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1882035")
     @Test
     fun openFirefoxSuggestNonSponsoredSearchResultsTest() {
         runWithCondition(TestHelper.appContext.settings().enableFxSuggest) {

From a0ffdd56b35dd4e39128c909e5fd861804d3fd77 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 02:09:19 +0000
Subject: [PATCH 195/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-es/strings.xml     |  13 ++
 app/src/main/res/values-nb-rNO/strings.xml | 203 ++++++++++++++++++++-
 2 files changed, 215 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5f00a5e88..e9888675a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2106,8 +2106,12 @@
     <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Introduce una contraseña</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Se requiere nombre de usuario</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Introduce un nombre de usuario</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Se requiere nombre de servidor</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Introduce una dirección web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Búsqueda por voz</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2203,6 +2207,9 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Buscar con %s</string>
 
+    <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Cambia tu navegador predeterminado</string>
     <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Configura enlaces de sitios web, correos electrónicos y mensajes para que se abran automáticamente en Firefox.</string>
 
@@ -2460,6 +2467,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Traducción en curso</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Selecciona un idioma</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Ha surgido un problema al traducir. Por favor inténtalo de nuevo.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2480,6 +2489,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">No traducir nunca %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">No traducir nunca este sitio</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Anula todas las demás configuraciones</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Anula las ofertas de traducción</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Ajustes de traducción</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index aef3dd0fc..bd4b73655 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -1769,6 +1769,8 @@
     <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Sikre dine lagrede passord</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Konfigurer en PIN-kode, et passord eller et låsemønster for å forhindre at andre mennesker får tilgang de lagrede innloggingene og passordene dine, hvis de har adgang til din enhet.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Konfigurer en PIN-kode, et passord eller et låsemønster for å beskytte dine lagrede passord om noen andre skulle få tak i enheten din.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Senere</string>
 
@@ -1790,6 +1792,9 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sorter innlogginger-meny</string>
 
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Sorter passord-menyen</string>
+
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
     <string name="preferences_autofill">Autofyll</string>
@@ -1797,10 +1802,16 @@
     <string name="preferences_addresses">Adresser</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Betalingskort</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Betalingsmåter</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards">Lagre og fyll ut kort automatisk</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Lagre og fyll inn betalingsmåter</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data er kryptert</string>
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s krypterer alle betalingsmåter du lagrer</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synkroniser kort på tvers av enheter</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
@@ -1808,17 +1819,26 @@
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Legg til betalingskort</string>
 
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Legg til kort</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Behandle lagrede kort</string>
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Behandle kort</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Legg til adresse</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Behandle adresser</string>
     <!-- Preference for saving and autofilling addresses -->
     <string name="preferences_addresses_save_and_autofill_addresses">Lagre og autoutfyll adresser</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Lagre og fyll ut adresser</string>
     <!-- Preference summary for saving and autofilling address data -->
     <string name="preferences_addresses_save_and_autofill_addresses_summary">Inkluderer informasjon som telefonnummer, e-post og leveringsadresser</string>
 
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Inkluderer telefonnumre og e-postadresser</string>
+
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Legg til kort</string>
     <!-- Title of the "Edit card" screen -->
@@ -1839,6 +1859,8 @@
     <string name="credit_cards_delete_card_button">Slett kort</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_confirmation">Er du sikker på at du vil slette dette bankkortet?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Slett kort?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Slett</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1853,14 +1875,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Oppgi et gyldig betalingskortnummer</string>
 
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Skriv inn et gyldig kortnummer</string>
     <!-- Error message for credit card name on card validation -->
     <string name="credit_cards_name_on_card_validation_error_message">Fyll ut dette feltet</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Legg til et navn</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Lås opp for å se dine lagrede betalingskort</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_title">Sikre dine betalingskort</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Sikre dine lagrede betalingsmåter</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message">Konfigurer en PIN-kode, et passord eller et låsemønster for å beskytte de lagrede betalingskortene dine om noen andre skulle få tak i enheten din.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Konfigurer en PIN-kode, et passord eller et låsemønster for å beskytte dine lagrede betalingsmåter om noen andre skulle få tak i enheten din.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Konfigurer nå</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1871,6 +1901,8 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message">Lås opp for å bruke lagret betalingskortinformasjon</string>
 
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Lås opp for å bruke lagrede betalingsmåter</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Legg til adresse</string>
     <!-- Title of the "Edit address" screen -->
@@ -1908,6 +1940,8 @@
 
     <!-- The title for the "Delete address" confirmation dialog -->
     <string name="addressess_confirm_dialog_message">Er du sikker på at du vil slette denne adressen?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Slette denne adressen?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Slett</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2008,30 +2042,52 @@
     <string name="login_menu_edit_button">Rediger</string>
     <!-- Message in delete confirmation dialog for logins -->
     <string name="login_deletion_confirmation">Er du sikker på at du ønsker å slette denne innloggingen?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Er du sikker på at du ønsker å slette dette passordet?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Slett</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Avbryt</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Innloggingsalternativer</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Passordalternativer</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Det redigerbare tekstfeltet for innloggingens nettadresse.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Det redigerbare tekstfeltet for nettstedsadressen.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description">Det redigerbare tekstfeltet for innloggingens brukernavn.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Det redigerbare tekstfeltet for brukernavnet.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">Det redigerbare tekstfeltet for innloggingens passord.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Det redigerbare tekstfeltet for passordet.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Lagre endringer for innlogging.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Lagre endringer.</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Rediger</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2" tools:ignore="UnusedResources">Rediger passord</string>
     <!--  The page title for adding new login. -->
     <string name="add_login">Legg til ny innlogging</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2" tools:ignore="UnusedResources">Legg til passord</string>
     <!--  The error message in add/edit login view when password field is blank. -->
     <string name="saved_login_password_required">Passord kreves</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Skriv inn et passord</string>
     <!--  The error message in add login view when username field is blank. -->
     <string name="saved_login_username_required">Brukernavn påkrevd</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Skriv inn et brukernavn</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Servernavn påkrevd</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Skriv inn en nettadresse</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Stemmesøk</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2126,6 +2182,9 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">%s-søk</string>
 
+    <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Endre standard nettleser</string>
     <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Angi at lenker fra nettsteder, e-postmeldinger og meldinger skal åpnes automatisk i Firefox.</string>
 
@@ -2352,8 +2411,86 @@
     <!-- Content description for headings announced by accessibility service. The first parameter is the text of the heading. Talkback will announce the first parameter and then speak the word "Heading" indicating to the user that this text is a heading for a section. -->
     <string name="a11y_heading">%s, Overskrift</string>
 
+    <!-- Title for dialog displayed when trying to access links present in a text. -->
+    <string name="a11y_links_title">Lenker</string>
+    <!-- Additional content description for text bodies that contain urls. -->
+    <string name="a11y_links_available">Lenker tilgjengelig</string>
+
     <!-- Translations feature-->
 
+    <!-- Translation request dialog -->
+    <!-- Title for the translation dialog that allows a user to translate the webpage. -->
+    <string name="translations_bottom_sheet_title">Oversett denne siden?</string>
+    <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translations_bottom_sheet_title_first_time">Prøv private oversettelser i %1$s</string>
+    <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
+    <string name="translations_bottom_sheet_info_message">Av hensyn til personvernet ditt forlater aldri oversettelser enheten din. Nye språk og forbedringer kommer snart! %1$s</string>
+    <!-- Text that links to additional information about the Firefox translations feature. -->
+    <string name="translations_bottom_sheet_info_message_learn_more">Les mer</string>
+    <!-- Label for the dropdown to select which language to translate from on the translations dialog. Usually the translate from language selected will be the same as the page language. -->
+    <string name="translations_bottom_sheet_translate_from">Oversett fra</string>
+    <!-- Label for the dropdown to select which language to translate to on the translations dialog. Usually the translate to language selected will be the user's preferred language. -->
+    <string name="translations_bottom_sheet_translate_to">Oversett til</string>
+    <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
+    <string name="translations_bottom_sheet_negative_button">Ikke nå</string>
+    <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
+    <string name="translations_bottom_sheet_negative_button_error">Ferdig</string>
+    <!-- Button text on the translations dialog to begin a translation of the website. -->
+    <string name="translations_bottom_sheet_positive_button">Oversett</string>
+    <!-- Button text on the translations dialog when a translation error appears. -->
+    <string name="translations_bottom_sheet_positive_button_error">Prøv igjen</string>
+    <!-- Inactive button text on the translations dialog that indicates a translation is currently in progress. This button will be accompanied by a loading icon. -->
+    <string name="translations_bottom_sheet_translating_in_progress">Oversetter</string>
+    <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
+    <string name="translations_bottom_sheet_translating_in_progress_content_description">Oversettelse pågår</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Velg et språk</string>
+    <!-- The title of the warning card informs the user that a translation could not be completed. -->
+    <string name="translation_error_could_not_translate_warning_text">Det oppstod et problem med å oversette. Prøv på nytt.</string>
+    <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
+    <string name="translation_error_could_not_load_languages_warning_text">Kunne ikke laste inn språk. Sjekk Internett-tilkoblingen din og prøv igjen.</string>
+    <!-- The title of the warning card informs the user that a language is not supported. The first parameter is the name of the language that is not supported. -->
+    <string name="translation_error_language_not_supported_warning_text">Beklager, vi støtter ikke %1$s ennå.</string>
+    <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
+    <string name="translation_error_language_not_supported_learn_more">Les mer</string>
+
+    <!-- Translations options dialog -->
+    <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
+    <string name="translation_option_bottom_sheet_title">Oversettelsesinnstillinger</string>
+    <!-- Toggle switch label that allows a user to set the setting if they would like the browser to always offer or suggest translations when available. -->
+    <string name="translation_option_bottom_sheet_always_translate">Tilby alltid å oversette</string>
+    <!-- Toggle switch label that allows a user to set if they would like a given language to automatically translate or not. The first parameter is the language name, for example, "Spanish". -->
+    <string name="translation_option_bottom_sheet_always_translate_in_language">Oversett alltid %1$s</string>
+    <!-- Toggle switch label that allows a user to set if they would like to never be offered a translation of the given language. The first parameter is the language name, for example, "Spanish". -->
+    <string name="translation_option_bottom_sheet_never_translate_in_language">Oversett aldri %1$s</string>
+    <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
+    <string name="translation_option_bottom_sheet_never_translate_site">Oversett aldri dette nettstedet</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Overstyrer alle andre innstillinger</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Overstyrer tilbud om å oversette</string>
+    <!-- Button text for the button that will take the user to the translation settings dialog. -->
+    <string name="translation_option_bottom_sheet_translation_settings">Oversettelsesinnstillinger</string>
+    <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translation_option_bottom_sheet_about_translations">Om oversettelser i %1$s</string>
+
+    <!-- Translation settings dialog -->
+    <!-- Title of the translation settings dialog that allows a user to set their preferred translation settings. -->
+    <string name="translation_settings_toolbar_title">Oversettelser</string>
+    <!-- Toggle switch label that indicates that the browser should signal or indicate when a translation is possible for any page. -->
+    <string name="translation_settings_offer_to_translate">Tilby å oversette når det er mulig</string>
+
+    <!-- Toggle switch label that indicates that downloading files required for translating is permitted when using data saver mode in Android. -->
+    <string name="translation_settings_always_download">Last alltid ned språk i datasparingsmodus</string>
+    <!-- Section header text that begins the section of a list of different options the user may select to adjust their translation preferences. -->
+    <string name="translation_settings_translation_preference">Innstillinger for oversetting</string>
+    <!-- Button text for the button that will take the user to the automatic translations settings dialog. On the automatic translations settings dialog, the user can set if translations should occur automatically for a given language. -->
+    <string name="translation_settings_automatic_translation">Automatisk oversettelse</string>
+    <!-- Button text for the button that will take the user to the never translate these sites dialog. On the never translate these sites dialog, the user can set if translations should never occur on certain websites. -->
+    <string name="translation_settings_automatic_never_translate_sites">Oversett aldri disse nettstedene</string>
+    <!-- Button text for the button that will take the user to the download languages dialog. On the download languages dialog, the user can manage which languages they would like to download for translations. -->
+    <string name="translation_settings_download_language">Last ned språk</string>
+
     <!-- Automatic translation preference screen -->
     <!-- Title of the automatic translation preference screen that will appear on the toolbar.-->
     <string name="automatic_translation_toolbar_title_preference">Automatisk oversettelse</string>
@@ -2402,6 +2539,10 @@
     <string name="download_languages_available_languages_preference">Tilgjengelige språk</string>
     <!-- Text that will appear beside a core or pivot language package name to show that the language is necessary for the translation feature to function. -->
     <string name="download_languages_default_system_language_require_preference">nødvendig</string>
+    <!-- A text for download language preference item.
+    The first parameter is the language name, for example, "Spanish".
+    The second parameter is the language file size, for example, "(3.91 KB)" or, if the language package name is a pivot language, "(required)". -->
+    <string name="download_languages_language_item_preference">%1$s (%2$s)</string>
     <!-- The subhead of the download language preference screen will appear above the items that were not downloaded. -->
     <string name="download_language_header_preference">Last ned språk</string>
     <!-- All languages list item. When the user presses this item, they can download or delete all languages. -->
@@ -2415,4 +2556,64 @@
     <!-- Content description (not visible, for screen readers etc.): For a language list item that is selected. -->
     <string name="download_languages_item_content_description_selected_state">Valgt</string>
 
-    </resources>
+    <!-- Title for the dialog used by the translations feature to confirm deleting a language.
+    The dialog will be presented when the user requests deletion of a language.
+    The first parameter is the name of the language, for example, "Spanish" and the second parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_file_dialog_title">Slette %1$s (%2$s)?</string>
+    <!-- Additional information for the dialog used by the translations feature to confirm deleting a language. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="delete_language_file_dialog_message">Hvis du sletter dette språket, vil %1$s laste ned deler av språk til hurtigbufferen din mens du oversetter.</string>
+    <!-- Title for the dialog used by the translations feature to confirm deleting all languages file.
+    The dialog will be presented when the user requests deletion of all languages file.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_all_languages_file_dialog_title">Slette alle språk (%1$s)?</string>
+    <!-- Additional information for the dialog used by the translations feature to confirm deleting all languages file. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="delete_language_all_languages_file_dialog_message">Hvis du sletter alle språk, vil %1$s laste ned deler av språk til hurtigbufferen din mens du oversetter.</string>
+    <!-- Button text on the dialog used by the translations feature to confirm deleting a language. -->
+    <string name="delete_language_file_dialog_positive_button_text">Slett</string>
+    <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
+    <string name="delete_language_file_dialog_negative_button_text">Avbryt</string>
+
+    <!-- Title for the data saving mode warning dialog used by the translations feature.
+    This dialog will be presented when the user attempts to download a language or perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file.-->
+    <string name="download_language_file_dialog_title">Laste ned mens du er i datasparingsmodus (%1$s)?</string>
+    <!-- Additional information for the data saving mode warning dialog used by the translations feature. This text explains the reason a download is required for a translation. -->
+    <string name="download_language_file_dialog_message_all_languages">Vi laster ned delvise språk til hurtigbufferen din for å holde oversettelser private.</string>
+    <!-- Checkbox label text on the data saving mode warning dialog used by the translations feature. This checkbox allows users to ignore the data usage warnings. -->
+    <string name="download_language_file_dialog_checkbox_text">Last alltid ned i datasparingsmodus</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
+    <string name="download_language_file_dialog_positive_button_text">Last ned</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file and perform a translation. -->
+    <string name="download_language_file_dialog_positive_button_text_all_languages">Last ned og oversett</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
+    <string name="download_language_file_dialog_negative_button_text">Avbryt</string>
+
+    <!-- Debug drawer -->
+    <!-- The user-facing title of the Debug Drawer feature. -->
+    <string name="debug_drawer_title">Feilsøkingsverktøy</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate back within the debug drawer. -->
+    <string name="debug_drawer_back_button_content_description">Naviger tilbake</string>
+    <!-- The title of the Tab Tools feature in the Debug Drawer. -->
+    <string name="debug_drawer_tab_tools_title">Faneverktøy</string>
+    <!-- The title of the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_title">Antall faner</string>
+    <!-- The active tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_normal">Aktiv</string>
+    <!-- The inactive tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_inactive">Inaktiv</string>
+    <!-- The private tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_private">Privat</string>
+    <!-- The total tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_total">Totalt</string>
+    <!-- The title of the tab creation tool section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_title">Verktøy for å lage faner</string>
+    <!-- The label of the text field in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_text_field_label">Antall faner som skal opprettes</string>
+    <!-- The button text to add tabs to the active tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_active">Legg til aktive faner</string>
+    <!-- The button text to add tabs to the inactive tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_inactive">Legg til inaktive faner</string>
+    <!-- The button text to add tabs to the private tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_private">Legg til private faner</string>
+</resources>

From ae910fca1729569a26ef64fb271d68d813275e3e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 02:10:07 +0000
Subject: [PATCH 196/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-nn-rNO/strings.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index ce0c47f0c..1cbbecca6 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -2009,6 +2009,8 @@
     <string name="dialog_delete_negative">Avbryt</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Innloggingsalternativ</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2" tools:ignore="UnusedResources">Passordalternativ</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Det redigerbare tekstfeltet for innloggings-nettadressa.</string>
     <!--  The editable text field for a login's username. -->
@@ -2136,7 +2138,7 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Søk med %s</string>
 
-    <!-- Default browser experiment -->
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Vel at lenker frå nettstadar, e-postmeldingar og meldingar skal opnast automatisk i Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2506,6 +2508,9 @@
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
     <string name="download_language_file_dialog_negative_button_text">Avbryt</string>
 
+    <!-- Debug drawer -->
+    <!-- The user-facing title of the Debug Drawer feature. -->
+    <string name="debug_drawer_title">Feilsøkingsverktøy</string>
     <!-- Content description (not visible, for screen readers etc.): Navigate back within the debug drawer. -->
     <string name="debug_drawer_back_button_content_description">Naviger tilbake</string>
     <!-- The title of the Tab Tools feature in the Debug Drawer. -->
@@ -2520,6 +2525,12 @@
     <string name="debug_drawer_tab_tools_tab_count_private">Privat</string>
     <!-- The total tab count category in the tab count section in Tab Tools. -->
     <string name="debug_drawer_tab_tools_tab_count_total">Totalt</string>
+    <!-- The title of the tab creation tool section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_title">Verktøy for å lage faner</string>
+    <!-- The button text to add tabs to the active tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_active">Legg til i aktive faner</string>
+    <!-- The button text to add tabs to the inactive tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_inactive">Legg til i inaktive faner</string>
     <!-- The button text to add tabs to the private tab group in the tab creation tool. -->
     <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_private">Legg til i private faner</string>
 </resources>

From a3fa513475c8114da36062e032ff085a1334b75e Mon Sep 17 00:00:00 2001
From: Tif Tran <ttran@mozilla.com>
Date: Wed, 21 Feb 2024 17:51:16 -0800
Subject: [PATCH 197/222] Bug 1880004 - Add Sponsored Mobile Provider

(cherry picked from commit b2af2209148b16f10c573db882d27021a68b8712)
---
 app/nimbus.fml.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/nimbus.fml.yaml b/app/nimbus.fml.yaml
index 7b1a0157a..239f0afa9 100644
--- a/app/nimbus.fml.yaml
+++ b/app/nimbus.fml.yaml
@@ -30,6 +30,7 @@ import:
         - value:
             available-suggestion-types: {
               "amp": true,
+              "ampMobile": false,
               "wikipedia": true,
             }
 

From 0f3886613037b4db343615346c9a7a311be868ce Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 2 Mar 2024 02:08:19 +0000
Subject: [PATCH 198/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-bg/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-br/strings.xml     | 179 +++++++++--------
 app/src/main/res/values-bs/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-cy/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-da/strings.xml     | 187 +++++++++---------
 app/src/main/res/values-de/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-dsb/strings.xml    | 218 ++++++++++++---------
 app/src/main/res/values-el/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-en-rGB/strings.xml | 218 ++++++++++++---------
 app/src/main/res/values-es-rAR/strings.xml | 214 +++++++++++---------
 app/src/main/res/values-es-rCL/strings.xml | 218 ++++++++++++---------
 app/src/main/res/values-fi/strings.xml     | 206 ++++++++++---------
 app/src/main/res/values-fr/strings.xml     | 205 ++++++++++---------
 app/src/main/res/values-hsb/strings.xml    | 218 ++++++++++++---------
 app/src/main/res/values-hu/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-is/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-it/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-kk/strings.xml     | 197 ++++++++++---------
 app/src/main/res/values-ko/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-nb-rNO/strings.xml | 218 ++++++++++++---------
 app/src/main/res/values-pt-rBR/strings.xml | 218 ++++++++++++---------
 app/src/main/res/values-pt-rPT/strings.xml | 218 ++++++++++++---------
 app/src/main/res/values-ru/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-sv-rSE/strings.xml | 218 ++++++++++++---------
 app/src/main/res/values-tr/strings.xml     | 203 ++++++++++---------
 app/src/main/res/values-vi/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-zh-rTW/strings.xml | 218 ++++++++++++---------
 27 files changed, 3177 insertions(+), 2574 deletions(-)

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 90068f68d..3be6566bc 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -257,6 +257,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Превеждане на страницатa</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Страницата е преведена от %1$s на %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Избран език</string>
@@ -334,12 +339,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">бележка за поверителността на Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Научете повече в нашата политика за поверителност</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Обичаме да ви пазим в безопасност</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Разберете защо милиони обичат Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Безопасно сърфиране с повече възможности за избор</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Нашият браузър с нестопанска цел помага да спрете компаниите да ви следват тайно в мрежата.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Повече от 100 милиона души защитават поверителността си, като избират браузър, поддържан от организация с нестопанска цел.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Познати тракери? Автоматично блокиране. Разширения? Опитайте всички 700. PDF файлове? Вграденият четец ги прави лесни за управление.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Нашият четец,  разработван от организация  с нестопанска цел ви помага да не бъдете следени тайно в мрежата.\n\nНаучете повече в нашето съобщение за поверителност.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -692,9 +707,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Отметки</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Регистрации</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Регистрации</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Пароли</string>
+    <string name="preferences_sync_logins_2">Пароли</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Отворени раздели</string>
     <!-- Preference for signing out -->
@@ -719,9 +734,9 @@
     <string name="default_device_name_2">%1$s на %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Банкови карти</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Банкови карти</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Начини на плащане</string>
+    <string name="preferences_sync_credit_cards_2">Начини на плащане</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Адреси</string>
 
@@ -1675,13 +1690,13 @@
     <string name="add_to_homescreen_description_2">Можете лесно да добавите тази страница към началния екран, за да имате бърз достъп до нея, подобно на приложение.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Регистрации и пароли</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Регистрации и пароли</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Пароли</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Пароли</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Запазване на регистрации и пароли</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Запазване на регистрации и пароли</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Запазване на пароли</string>
+    <string name="preferences_passwords_save_logins_2">Запазване на пароли</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Питане за запазване</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1696,48 +1711,48 @@
     <!-- Description for the preference for autofilling logins from Fenix in other apps (e.g. autofilling the Twitter app) -->
     <string name="preferences_android_autofill_description">Попълват се потребителски имена и пароли в други приложения на устройството.</string>
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Добавяне на регистрация</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Добавяне на регистрация</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Добавяне на парола</string>
+    <string name="preferences_logins_add_login_2">Добавяне на парола</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Синхронизиране на регистрации</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Синхронизиране на пароли</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Синхронизиране на регистрации</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Синхронизиране на пароли</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Синхронизиране на регистрации между устройства</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Синхронизиране на регистрации между устройства</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Синхронизиране на пароли между устройства</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Синхронизиране на пароли между устройства</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Запазени регистрации</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Запазени регистрации</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Запазени пароли</string>
+    <string name="preferences_passwords_saved_logins_2">Запазени пароли</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Тук се показват нещата, които запазвате или синхронизирате във %s.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Тук се показват нещата, които запазвате или синхронизирате във %s.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Паролите, които запазите или синхронизирате с %s ще бъдат изброени тук. Всички запазени пароли са шифровани.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Паролите, които запазите или синхронизирате с %s ще бъдат изброени тук. Всички запазени пароли са шифровани.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Научете повече за Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Научете повече за Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Научете повече за синхронизирането</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Научете повече за синхронизирането</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Изключения</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Тук се показват регистрации и пароли, които не са запазени.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Тук се показват регистрации и пароли, които не са запазени.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s няма да запазва пароли за сайтове, изброени тук.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s няма да запазва пароли за сайтове, изброени тук.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Следните страници няма да запазват регистрации и пароли.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Следните страници няма да запазват регистрации и пароли.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s няма да запази пароли за тези сайтове.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s няма да запази пароли за тези сайтове.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Изтриване на всички</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Търсене на регистрация</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Търсене на регистрация</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Търсене на пароли</string>
+    <string name="preferences_passwords_saved_logins_search_2">Търсене на пароли</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Страница</string>
     <!-- The header for the username for a login -->
@@ -1766,17 +1781,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Скриване на парола</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Отключете, за да видите запазените регистрации</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Отключете, за да видите запазените регистрации</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Отключете, за да видите запазените пароли</string>
+    <string name="logins_biometric_prompt_message_2">Отключете, за да видите запазените пароли</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Защитете вашите данни за вход</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Защитете вашите данни за вход</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Защитете запазените пароли</string>
+    <string name="logins_warning_dialog_title_2">Защитете запазените пароли</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените регистрации и пароли, в случай че някой друг има достъп до него.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените регистрации и пароли, в случай че някой друг има достъп до него.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените пароли от достъп, ако някой друг има вашето устройство.</string>
+    <string name="logins_warning_dialog_message_2">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените пароли от достъп, ако някой друг има вашето устройство.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">По-късно</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1792,10 +1807,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Последно използване</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Меню за сортиране на регистрации</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Меню за сортиране на регистрации</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Меню за сортиране на пароли</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Меню за сортиране на пароли</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1803,44 +1818,44 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Адреси</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Банкови карти</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Банкови карти</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Начини на плащане</string>
+    <string name="preferences_credit_cards_2">Начини на плащане</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Запазване и автоматично попълване на карти</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Запазване и автоматично попълване на карти</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Запазване и попълване на начини на плащане</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Запазване и попълване на начини на плащане</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Данните са криптирани</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Данните са криптирани</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s шифрова всички запазени от вас начини на плащане</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s шифрова всички запазени от вас начини на плащане</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Синхронизиране на карти между устройства</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Синхронизиране на карти</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Добавяне на карта</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Добавяне на карта</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Добавяне на карта</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Добавяне на карта</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Управление на карти</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Управление на карти</string>
 
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Управление на карти</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Управление на карти</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Добавяне на адрес</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Управление на адреси</string>
 
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Запазване и попълване на адреси</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Запазване и попълване на адреси</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Запазване и попълване на адреси</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Запазване и попълване на адреси</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Включително номера, електронни адреси и адреси за доставка</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Включително номера, електронни адреси и адреси за доставка</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Включва телефонни номера и имейл адреси</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Включва телефонни номера и имейл адреси</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Добавяне на карта</string>
@@ -1861,9 +1876,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Изтриване на картата</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Сигурни ли сте, че искате да премахнете тази банкова карта?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Сигурни ли сте, че искате да премахнете тази банкова карта?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Изтриване на картата?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Изтриване на картата?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Премахване</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1875,23 +1890,23 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Запазени карти</string>
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Моля, въведете валиден номер на банкова карта</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Моля, въведете валиден номер на банкова карта</string>
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Въведете валиден номер на карта</string>
+    <string name="credit_cards_number_validation_error_message_2">Въведете валиден номер на карта</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Попълнете полето</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Попълнете полето</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Добавяне на име</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Добавяне на име</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Отключете, за да видите запазените карти</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Защитете банковите си карти</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Защитете банковите си карти</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Защитете запазените начини на плащане</string>
+    <string name="credit_cards_warning_dialog_title_2">Защитете запазените начини на плащане</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените банкови карти, в случай че някой друг има достъп до него.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените банкови карти, в случай че някой друг има достъп до него.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените методи на плащане от достъп, ако някой друг има вашето устройство.</string>
+    <string name="credit_cards_warning_dialog_message_3">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените методи на плащане от достъп, ако някой друг има вашето устройство.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Настройване</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1900,10 +1915,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Отключете устройството си</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Отключете, за да използвате запазената банкова карта</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Отключете, за да използвате запазената банкова карта</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Отключете, за да използвате запазените методи на плащане</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Отключете, за да използвате запазените методи на плащане</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Добавяне на адрес</string>
     <!-- Title of the "Edit address" screen -->
@@ -1911,12 +1926,14 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Управление на адреси</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Първо име</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Първо име</string>
 
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Презиме</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Презиме</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Фамилия</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Фамилия</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Име</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Адрес</string>
     <!-- The header for the city of an address -->
@@ -1941,9 +1958,9 @@
     <!-- The text for the "Delete address" button for deleting an address -->
     <string name="addressess_delete_address_button">Премахване на адреса</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Сигурни ли сте, че искате да премахнете този адрес?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Сигурни ли сте, че искате да премахнете този адрес?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Изтриване на този адрес?</string>
+    <string name="addressess_confirm_dialog_message_2">Изтриване на този адрес?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Премахване</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2043,49 +2060,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Редактиране</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Сигурни ли сте, че искате да изтриете тези данни за вход?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Сигурни ли сте, че искате да изтриете тези данни за вход?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Сигурни ли сте, че искате да изтриете тази парола?</string>
+    <string name="login_deletion_confirmation_2">Сигурни ли сте, че искате да изтриете тази парола?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Изтриване</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Отказ</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Настройки за вход</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Настройки за вход</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Опции за парола</string>
+    <string name="login_options_menu_2">Опции за парола</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Текстовото поле за редактиране на адреса на регистрация.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Текстовото поле за редактиране на адреса на регистрация.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Текстовото поле за редактиране на адреса на уебсайта.</string>
+    <string name="saved_login_hostname_description_3">Текстовото поле за редактиране на адреса на уебсайта.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Текстовото поле за редактиране на потребителското име на регистрация.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Текстовото поле за редактиране на потребителското име на регистрация.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Текстовото поле за редактиране на потребителското име.</string>
+    <string name="saved_login_username_description_3">Текстовото поле за редактиране на потребителското име.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Текстовото поле за редактиране на паролата на регистрация.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Текстовото поле за редактиране на паролата на регистрация.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Текстовото поле за редактиране на паролата.</string>
+    <string name="saved_login_password_description_2">Текстовото поле за редактиране на паролата.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Запазване на промените на регистрацията.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Запазване на промените на регистрацията.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Запазване на промените.</string>
+    <string name="save_changes_to_login_2">Запазване на промените.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Редактиране</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Редактиране</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Редактиране на паролата</string>
+    <string name="edit_2">Редактиране на паролата</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Добавете регистрация</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Добавете регистрация</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Добавяне на парола</string>
+    <string name="add_login_2">Добавяне на парола</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Паролата е задължителна</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Паролата е задължителна</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Въведете парола</string>
+    <string name="saved_login_password_required_2">Въведете парола</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Потребителското име е задължително</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Потребителското име е задължително</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Въведете потребителско име</string>
+    <string name="saved_login_username_required_2">Въведете потребителско име</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Името на хоста е задължително</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2195,7 +2212,7 @@
     <string name="radio_preference_info_content_description">Натиснете за подробности</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Придвижване нагоре</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Придвижване нагоре</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Затваряне</string>
@@ -2236,8 +2253,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Коригиран рейтинг</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Ненадеждните отзиви са премахнати</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Въз основа на надеждни отзиви</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Акценти от скорошни рецензии</string>
@@ -2294,10 +2309,6 @@
     <string name="review_quality_check_product_availability_warning_body">Ако видите, че продуктът е отново в наличност, докладвайте и ще работим върху проверка на отзивите.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Докладвайте продукта е наличен</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Проверяване на качеството на отзива</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Проверяване на качеството на отзива</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Проверка на качеството на рецензията (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2343,13 +2354,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Научете повече</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Избирайки „Да, пробвайте“ вие се съгласявате с  %1$s на Mozilla %2$s и %3$s</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Избирайки „Да, пробвайте“ вие се съгласявате с  %1$s на Mozilla %2$s и %3$s</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">С избирането на „Да, изпробвайте“ вие се съгласявате със следното от %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Избирайки „Да, изпробвайте“ вие се съгласявате с %2$s на %1$s и %4$s на %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Избирайки „Да, изпробвайте“ вие се съгласявате с %2$s на %1$s и %4$s на %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">декларация за поверителност</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">декларация за поверителност</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Политика на поверителност</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">политика на поверителност</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">условия за ползване</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2419,6 +2436,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">език. Превеждане на страницата?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Страницата е преведена от %1$s на %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Опитайте с поверителни преводи след %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2431,6 +2452,8 @@
     <string name="translations_bottom_sheet_translate_to">Превеждане на</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Не сега</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Показване на оригинала</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Готово</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2453,6 +2476,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Научете повече</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Превеждане…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Настройки на превода</string>
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 59e397fc1..f06ba7aef 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -67,6 +67,11 @@
     <!-- True Private Browsing Mode -->
     <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
     <string name="felt_privacy_desc_card_title">Na lezel roud ebet war an trevnad-mañ</string>
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle_2">Pa vez serret hoc’h holl ivinelloù prevez e vez dilamet ho toupinoù, ho roll istor hag ho roadennoù lec’hienn gant %1$s. %2$s</string>
     <!-- Clickable portion of the explanation for private browsing that links the user to our
         about privacy page.
         This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
@@ -313,7 +318,6 @@
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
     <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ket bremañ</string>
 
-    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Ho surentez a zo talvoudus deomp</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
@@ -610,6 +614,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Ardeiñ ar gont</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Cheñch ho ker-tremen, merañ dastumadeg ho roadennoù pe dilemel ho kont</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Goubredañ bremañ</string>
     <!-- Preference category for sync -->
@@ -619,9 +625,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Sinedoù</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Titouroù kennaskañ</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Titouroù kennaskañ</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Gerioù-tremen</string>
+    <string name="preferences_sync_logins_2">Gerioù-tremen</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Ivinelloù digor</string>
     <!-- Preference for signing out -->
@@ -648,9 +654,9 @@
     <string name="default_device_name_2">%1$s war %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Kartennoù kred</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kartennoù kred</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Doareoù paeañ</string>
+    <string name="preferences_sync_credit_cards_2">Doareoù paeañ</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Chomlecʼhioù</string>
 
@@ -1579,13 +1585,13 @@
     <string name="add_to_homescreen_description_2">Gallout a rit ouzhpennañ al lec’hienn-mañ da bennbajenn ho trevnad evit mont war-eeun ha merdeiñ primoc’h evel ma vefe un arload.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Titouroù kennaskañ</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Titouroù kennaskañ</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Gerioù-tremen</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Gerioù-tremen</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Enrollañ an titouroù kennaskañ</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Enrollañ an titouroù kennaskañ</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Enrollañ ar gerioù-tremen</string>
+    <string name="preferences_passwords_save_logins_2">Enrollañ ar gerioù-tremen</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Goulenn a-raok enrollañ</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1601,37 +1607,37 @@
     <!-- Description for the preference for autofilling logins from Fenix in other apps (e.g. autofilling the Twitter app) -->
     <string name="preferences_android_autofill_description">Leuniañ anvioù-implijer ha gerioù-tremen en arloadoù-all war ho trevnad.</string>
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Ouzhpennañ titouroù kennaskañ</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Ouzhpennañ titouroù kennaskañ</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Ouzhpennañ ur ger-tremen</string>
+    <string name="preferences_logins_add_login_2">Ouzhpennañ ur ger-tremen</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Goubredañ an titouroù kennaskañ</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Goubredañ ar gerioù-tremen</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Goubredañ an titouroù kennaskañ</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Goubredañ ar gerioù-tremen</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Goubredañ an titouroù kennaskañ dre an trevnadoù</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Goubredañ an titouroù kennaskañ dre an trevnadoù</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Titouroù kennaskañ enrollet</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Titouroù kennaskañ enrollet</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Gerioù-tremen enrollet</string>
+    <string name="preferences_passwords_saved_logins_2">Gerioù-tremen enrollet</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">An titouroù kennaskañ a enrollit pe c’houbredit e %s a vo diskouezet amañ.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">An titouroù kennaskañ a enrollit pe c’houbredit e %s a vo diskouezet amañ.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Gouzout hiroc’h diwar-benn Sync</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Gouzout hiroc’h diwar-benn Sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Nemedennoù</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">An titouroù kennaskañ n’int ket enrollet a vo diskouezet amañ.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">An titouroù kennaskañ n’int ket enrollet a vo diskouezet amañ.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Ne vo ket enrollet an titouroù kennaskañ evit al lec’hiennoù-mañ.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ne vo ket enrollet an titouroù kennaskañ evit al lec’hiennoù-mañ.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Dilemel an holl nemedennoù</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Klask titouroù kennaskañ</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Klask titouroù kennaskañ</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Klask er gerioù-tremen</string>
+    <string name="preferences_passwords_saved_logins_search_2">Klask er gerioù-tremen</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Lec’hienn</string>
     <!-- The header for the username for a login -->
@@ -1660,13 +1666,13 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Kuzhat ar ger-tremen</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Dibrennit evit gwelet ho titouroù kennaskañ enrollet</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Dibrennit evit gwelet ho titouroù kennaskañ enrollet</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Diogelit ho titouroù kennaskañ</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Diogelit ho titouroù kennaskañ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Diogelit ho kerioù-tremen enrollet</string>
+    <string name="logins_warning_dialog_title_2">Diogelit ho kerioù-tremen enrollet</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Arventennit ur patrom morailh, ur PIN pe ur ger-tremen evit gwareziñ ho titouroù kennaskañ enrollet da vezañ lennet gant unan bennak all.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Arventennit ur patrom morailh, ur PIN pe ur ger-tremen evit gwareziñ ho titouroù kennaskañ enrollet da vezañ lennet gant unan bennak all.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Diwezhatoc’h</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1682,7 +1688,7 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Arver diwezhañ</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Lañser rummañ an titouroù kennaskañ</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Lañser rummañ an titouroù kennaskañ</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1690,39 +1696,39 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Chomlec’hioù</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Kartennoù kred</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kartennoù kred</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Doareoù paeañ</string>
+    <string name="preferences_credit_cards_2">Doareoù paeañ</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Enrollañ ha leuniañ ar c’hartennoù en un doare emgefreek</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Enrollañ ha leuniañ ar c’hartennoù en un doare emgefreek</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Enrollañ ha leuniañ an doareoù paeañ</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Enrollañ ha leuniañ an doareoù paeañ</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Rineget eo ar roadennoù</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Rineget eo ar roadennoù</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Goubredañ ar c’hartennoù kred etre ho trevnadoù</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Goubredañ ar c\'hartennoù</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Ouzhpennañ ur gartenn gred</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Ouzhpennañ ur gartenn gred</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Ouzhpennañ ur gartenn</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Ouzhpennañ ur gartenn</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Merañ ar c’hartennoù enrollet</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Merañ ar c’hartennoù enrollet</string>
 
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Merañ ar c’hartennoù</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Merañ ar c’hartennoù</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Ouzhpennañ ur chomlec’h</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Merañ ar chomlec’hioù</string>
 
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Enrollañ ha leuniañ ar chomlec’hioù en un doare emgefreek</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Enrollañ ha leuniañ ar chomlec’hioù en un doare emgefreek</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Enrollañ ha leuniañ ar chomlec’hioù</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Enrollañ ha leuniañ ar chomlec’hioù</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Enkorfañ a ra titouroù evel niverennoù, posteloù ha chomlec’hioù</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Enkorfañ a ra titouroù evel niverennoù, posteloù ha chomlec’hioù</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Ouzhpennañ ur gartenn</string>
@@ -1744,9 +1750,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Dilemel ar gartenn</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Ha fellout a ra deocʼh dilemel ar gartenn gred-mañ?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Ha fellout a ra deocʼh dilemel ar gartenn gred-mañ?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Dilemel ar gartenn?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Dilemel ar gartenn?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Dilemel</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1759,23 +1765,23 @@
     <string name="credit_cards_saved_cards">Kartennoù enrollet</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Biziatait un niverenn kartenn gred talvoudek mar plij.</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Biziatait un niverenn kartenn gred talvoudek mar plij.</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Enankit un niverenn gartenn reizh</string>
+    <string name="credit_cards_number_validation_error_message_2">Enankit un niverenn gartenn reizh</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Mar plij, leugnit ar maez-mañ</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Mar plij, leugnit ar maez-mañ</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Ouzhpennañ un anv</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Ouzhpennañ un anv</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Dibrennit da welet ho kartennoù enrollet</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Diogelit ho kartennoù kred</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Diogelit ho kartennoù kred</string>
 
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Diogelit ho toareoù paeañ enrollet</string>
+    <string name="credit_cards_warning_dialog_title_2">Diogelit ho toareoù paeañ enrollet</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Arventennit ur patrom prennañ, ur PIN pe ur ger-tremen evit gwareziñ ho kartennoù kred enrollet ma vez ho trevnad gant unan bennak all.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Arventennit ur patrom prennañ, ur PIN pe ur ger-tremen evit gwareziñ ho kartennoù kred enrollet ma vez ho trevnad gant unan bennak all.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Arventennañ bremañ</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1784,7 +1790,7 @@
     <string name="credit_cards_biometric_prompt_message_pin">Dibrennit ho trevnad</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Dibrennit evit implijout titouroù kartenn gred enrollet</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Dibrennit evit implijout titouroù kartenn gred enrollet</string>
 
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Ouzhpennañ ur chomlec’h</string>
@@ -1793,11 +1799,11 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Merañ ar chomlec’hioù</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Añv bihan</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Añv bihan</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Anv kreiz</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Anv kreiz</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Anv familh</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Anv familh</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Chomlec’h</string>
     <!-- The header for the city of an address -->
@@ -1822,9 +1828,9 @@
     <string name="addressess_delete_address_button">Dilemel ar chomlec’h</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Ha sur oc’h e fell deoc’h dilemel ar chomlec’h-mañ?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ha sur oc’h e fell deoc’h dilemel ar chomlec’h-mañ?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Dilemel ar chomlec’h-mañ?</string>
+    <string name="addressess_confirm_dialog_message_2">Dilemel ar chomlec’h-mañ?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Dilemel</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1921,41 +1927,41 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Embann</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Sur oc’h e fell deoc’h dilemel an titour-kennaskañ-mañ?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Sur oc’h e fell deoc’h dilemel an titour-kennaskañ-mañ?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Sur ocʼh e fell deocʼh dilemel ar ger-tremen-mañ?</string>
+    <string name="login_deletion_confirmation_2">Sur ocʼh e fell deocʼh dilemel ar ger-tremen-mañ?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Dilemel</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Nullañ</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Dibarzhioù an titouroù kennaskañ</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Dibarzhioù an titouroù kennaskañ</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Ar vaezienn destenn kemmus evit chomlec’h web an titour kennaskañ.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ar vaezienn destenn kemmus evit chomlec’h web an titour kennaskañ.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Ar vaezienn destenn kemmus evit anv arveriad an titour kennaskañ.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ar vaezienn destenn kemmus evit anv arveriad an titour kennaskañ.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Ar vaezienn destenn kemmus evit ger-tremen an titour kennaskañ.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ar vaezienn destenn kemmus evit ger-tremen an titour kennaskañ.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Enrollañ ar c’hemmoù d’an titouroù kennaskañ.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Enrollañ ar c’hemmoù d’an titouroù kennaskañ.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Enrollañ ar cʼhemmoù.</string>
+    <string name="save_changes_to_login_2">Enrollañ ar cʼhemmoù.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Embann</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Embann</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Aozañ ar ger-tremen</string>
+    <string name="edit_2">Aozañ ar ger-tremen</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Ouzhpennañ titouroù kennaskañ nevez</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Ouzhpennañ titouroù kennaskañ nevez</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Ouzhpennañ ur ger-tremen</string>
+    <string name="add_login_2">Ouzhpennañ ur ger-tremen</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Ger-tremen azgoulennet</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Ger-tremen azgoulennet</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Enankit ur ger-tremen</string>
+    <string name="saved_login_password_required_2">Enankit ur ger-tremen</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Anv-implijer rekis</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Anv-implijer rekis</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Enankit un anv-implijer</string>
+    <string name="saved_login_username_required_2">Enankit un anv-implijer</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Anv an ostiz rekis</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2065,7 +2071,7 @@
     <string name="radio_preference_info_content_description">Klikit da gaout muioc’h a vunudoù</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Adpignat</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Adpignat</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Serriñ</string>
@@ -2103,8 +2109,6 @@
     <string name="review_quality_check_grade_d_f_description">Alioù disfizius</string>
     <!-- Text for title presenting the reliability of a product's reviews. -->
     <string name="review_quality_check_grade_title">Pegen fizius eo an alioù-se?</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Alioù disfizius dilamet</string>
     <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
     <string name="review_quality_check_explanation_title">Penaos e termenomp perzhded an alioù</string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
@@ -2123,6 +2127,8 @@
     <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Produioù all</string>
     <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Bruderezh gant %s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Ar gwirier alioù a zo lusket gant %s</string>
     <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s gant Mozilla</string>
     <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
@@ -2133,10 +2139,6 @@
     <string name="review_quality_check_no_reviews_warning_title">N\'eus ket a-walc’h a alioù c\'hoazh</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title">Dihegerz eo ar produ-mañ</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">O wiriañ perzhded an ali</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">O wiriañ perzhded an ali</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">O wiriañ kalite an alioù (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2162,7 +2164,7 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Gouzout hiroc’h</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">politikerezh a-fet buhez prevez</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">politikerezh a-fet buhez prevez</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Politikerezh a-fet buhez prevez</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2283,9 +2285,24 @@
     <!-- Title of the automatic translation preference screen that will appear on the toolbar.-->
     <string name="automatic_translation_toolbar_title_preference">Troidigezh emgefreek</string>
 
+    <!-- Automatic translation options preference screen -->
+    <!-- Preference option for offering to translate. Radio button title text.-->
+    <string name="automatic_translation_option_offer_to_translate_title_preference">Goulenn treiñ ar bajenn (dre ziouer)</string>
+    <!-- Preference option for offering to translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_offer_to_translate_summary_preference">%1$s a ginnigo deoc’h da dreiñ lec’hiennoù er yezh-mañ.</string>
+    <!-- Preference option for always translate. Radio button title text. -->
+    <string name="automatic_translation_option_always_translate_title_preference">Treiñ bepred</string>
+    <!-- Preference option for always translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_always_translate_summary_preference">%1$s a droio ar yezh-mañ ent emgefreek pa garg ar bajenn.</string>
     <!-- Preference option for never translate. Radio button title text.-->
     <string name="automatic_translation_option_never_translate_title_preference">Na dreiñ biken</string>
 
+    <!-- Preference option for never translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_never_translate_summary_preference">%1$s ne c’houlenno biken da dreiñ lec’hiennoù er yezh-mañ.</string>
+
+    <!-- Never translate site preference screen -->
+    <!-- Title of the never translate site preference screen that will appear on the toolbar.-->
+    <string name="never_translate_site_toolbar_title_preference">Na dreiñ biken al lec’hiennoù-mañ</string>
     <!-- Content description (not visible, for screen readers etc.): For a never-translated site list item that is selected.
              The first parameter is web site url (for example:"wikipedia.com") -->
     <string name="never_translate_site_item_list_content_description_preference">Lemel %1$s</string>
@@ -2302,6 +2319,8 @@
     <string name="download_languages_toolbar_title_preference">Pellgargañ yezhoù</string>
     <!-- Clickable text from the screen header that links to a website. -->
     <string name="download_languages_header_learn_more_preference">Gouzout hiroc’h</string>
+    <!-- The subhead of the download language preference screen will appear above the pivot language. -->
+    <string name="download_languages_available_languages_preference">Yezhoù hegerz</string>
     <!-- Text that will appear beside a core or pivot language package name to show that the language is necessary for the translation feature to function. -->
     <string name="download_languages_default_system_language_require_preference">rekis</string>
     <!-- A text for download language preference item.
@@ -2341,6 +2360,8 @@
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
     <string name="download_language_file_dialog_negative_button_text">Nullañ</string>
 
+    <!-- The title of the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_title">Niver a ivinelloù</string>
     <!-- The active tab count category in the tab count section in Tab Tools. -->
     <string name="debug_drawer_tab_tools_tab_count_normal">Oberiant</string>
     <!-- The inactive tab count category in the tab count section in Tab Tools. -->
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 053b30d78..20814e3e5 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -245,6 +245,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Prevedi stranicu</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Stranica je prevedena sa %1$s na %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Izabrani jezik</string>
@@ -318,12 +323,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox obavijest o privatnosti</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Saznajte više u našoj obavijesti o privatnosti</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Volimo da vas čuvamo</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Saznajte zašto milioni vole Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Sigurno pretraživanje s više izbora</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Naš neprofitni pretraživač pomaže u sprečavanju kompanija da vas potajno prate širom interneta.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Više od 100 miliona ljudi štiti svoju privatnost odabirom pretraživača koji podržava neprofitna organizacija.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Poznati tragači? Blokirani automatski. Ekstenzije? Isprobaj svih 700. PDF-ovi? Naš ugrađeni čitač čini ih laganim za upravljanje.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Naš neprofitni pretraživač pomaže spriječiti kompanije da vas potajno prate širom weba.\n\nSaznajte više u našem obavještenju o privatnosti.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -675,9 +690,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Zabilješke</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Prijave</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Prijave</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Lozinke</string>
+    <string name="preferences_sync_logins_2">Lozinke</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Otvori tabove</string>
     <!-- Preference for signing out -->
@@ -703,9 +718,9 @@
     <string name="default_device_name_2">%1$s na %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Kreditne kartice</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditne kartice</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Načini plaćanja</string>
+    <string name="preferences_sync_credit_cards_2">Načini plaćanja</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adrese</string>
 
@@ -1640,13 +1655,13 @@
     <string name="add_to_homescreen_description_2">Ovu web stranicu možete lahko dodati na Početni ekran uređaja za brz pristup istoj i da surfate brže s iskustvom sličnom aplikaciji.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Prijave i lozinke</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Prijave i lozinke</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Lozinke</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Lozinke</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Spašene prijave i lozinke</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Spašene prijave i lozinke</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Sačuvaj lozinke</string>
+    <string name="preferences_passwords_save_logins_2">Sačuvaj lozinke</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Pitaj za spašavanje</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1661,48 +1676,48 @@
     <!-- Description for the preference for autofilling logins from Fenix in other apps (e.g. autofilling the Twitter app) -->
     <string name="preferences_android_autofill_description">Unesite korisnička imena i lozinke u druge aplikacije na svom uređaju.</string>
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Dodaj prijavu</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Dodaj prijavu</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Dodaj lozinku</string>
+    <string name="preferences_logins_add_login_2">Dodaj lozinku</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sinkroniziraj prijave</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sinhronizuj lozinke</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sinkroniziraj prijave</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Sinhronizuj lozinke</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sinhronizirajte prijave na svim uređajima</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sinhronizirajte prijave na svim uređajima</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sinhronizuj lozinke na svim uređajima</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Sinhronizuj lozinke na svim uređajima</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Spašene prijave</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Spašene prijave</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Sačuvane lozinke</string>
+    <string name="preferences_passwords_saved_logins_2">Sačuvane lozinke</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Prijave koje spasite ili sinhronizujete sa %s će se prikazati ovdje.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Prijave koje spasite ili sinhronizujete sa %s će se prikazati ovdje.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Lozinke koje sačuvate ili sinhronizujete sa %s će biti navedene ovdje. Sve lozinke koje sačuvate su šifrovane.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Lozinke koje sačuvate ili sinhronizujete sa %s će biti navedene ovdje. Sve lozinke koje sačuvate su šifrovane.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Saznajte više o Syncu.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Saznajte više o Syncu.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Saznajte više o sinhronizaciji</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Saznajte više o sinhronizaciji</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Izuzeci</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Prijave i lozinke koje nisu spašene će biti prikazane ovdje.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Prijave i lozinke koje nisu spašene će biti prikazane ovdje.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s neće sačuvati lozinke za web stranice navedene ovdje.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s neće sačuvati lozinke za web stranice navedene ovdje.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Prijave i lozinke neće biti spašene za ove web stranice.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Prijave i lozinke neće biti spašene za ove web stranice.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s neće sačuvati lozinke za ove stranice.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s neće sačuvati lozinke za ove stranice.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Obriši sve izuzetke</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Pretraži prijave</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Pretraži prijave</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Traži lozinke</string>
+    <string name="preferences_passwords_saved_logins_search_2">Traži lozinke</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Stranica</string>
     <!-- The header for the username for a login -->
@@ -1731,17 +1746,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Sakrij lozinku</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Otključajte za pregled spašenih prijava</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Otključajte za pregled spašenih prijava</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Otključajte da vidite sačuvane lozinke</string>
+    <string name="logins_biometric_prompt_message_2">Otključajte da vidite sačuvane lozinke</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Osigurajte svoje prijave i lozinke</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Osigurajte svoje prijave i lozinke</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Osigurajte svoje sačuvane lozinke</string>
+    <string name="logins_warning_dialog_title_2">Osigurajte svoje sačuvane lozinke</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Podesite pattern za zaključavanje uređaja, PIN ili lozinku da zaštitite vaše spašene prijave i lozinke od pristupa druge osobe koja ima vaš uređaj.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Podesite pattern za zaključavanje uređaja, PIN ili lozinku da zaštitite vaše spašene prijave i lozinke od pristupa druge osobe koja ima vaš uređaj.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Postavite obrazac za zaključavanje uređaja, PIN ili lozinku da zaštitite svoje sačuvane lozinke od pristupa ako neko drugi ima vaš uređaj.</string>
+    <string name="logins_warning_dialog_message_2">Postavite obrazac za zaključavanje uređaja, PIN ili lozinku da zaštitite svoje sačuvane lozinke od pristupa ako neko drugi ima vaš uređaj.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Kasnije</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1758,10 +1773,10 @@
     <string name="saved_logins_sort_strategy_last_used">Zadnja upotreba</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sortiraj meni prijava</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Sortiraj meni prijava</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Meni za sortiranje lozinki</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Meni za sortiranje lozinki</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1769,43 +1784,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adrese</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Kreditne kartice</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditne kartice</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Načini plaćanja</string>
+    <string name="preferences_credit_cards_2">Načini plaćanja</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Sačuvajte i automatski popunjavajte kartice</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Sačuvajte i automatski popunjavajte kartice</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Sačuvaj i popuni načine plaćanja</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Sačuvaj i popuni načine plaćanja</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Podaci su šifrovani</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Podaci su šifrovani</string>
 
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s šifruje sve načine plaćanja koje sačuvate</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s šifruje sve načine plaćanja koje sačuvate</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sinhronizujte kartice na svim uređajima</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sinhronizuj kartice</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Dodaj kreditnu karticu</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Dodaj kreditnu karticu</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Dodaj karticu</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Dodaj karticu</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Upravljaj sačuvanim karticama</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Upravljaj sačuvanim karticama</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Upravljajte karticama</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Upravljajte karticama</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Dodaj adresu</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Upravljaj adresama</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Sačuvajte i automatski popunjavajte adrese</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Sačuvajte i automatski popunjavajte adrese</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Sačuvajte i popunite adrese</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Sačuvajte i popunite adrese</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Uključite informacije kao što su brojevi, e-mail i adrese za dostavu</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Uključite informacije kao što su brojevi, e-mail i adrese za dostavu</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Uključuje brojeve telefona i email adrese</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Uključuje brojeve telefona i email adrese</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Dodaj karticu</string>
@@ -1826,9 +1841,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Izbriši karticu</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Jeste li sigurni da želite izbrisati ovu kreditnu karticu?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Jeste li sigurni da želite izbrisati ovu kreditnu karticu?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Izbrisati karticu?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Izbrisati karticu?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Izbriši</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1840,23 +1855,23 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Sačuvane kartice</string>
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Unesite važeći broj kreditne kartice</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Unesite važeći broj kreditne kartice</string>
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Unesite važeći broj kartice</string>
+    <string name="credit_cards_number_validation_error_message_2">Unesite važeći broj kartice</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Molimo popunite ovo polje</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Molimo popunite ovo polje</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Dodaj ime</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Dodaj ime</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Otključajte da vidite svoje sačuvane kartice</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Osigurajte svoje kreditne kartice</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Osigurajte svoje kreditne kartice</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Osigurajte svoje sačuvane načine plaćanja</string>
+    <string name="credit_cards_warning_dialog_title_2">Osigurajte svoje sačuvane načine plaćanja</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Postavite obrazac za zaključavanje uređaja, PIN ili lozinku da zaštitite svoje sačuvane kreditne kartice od pristupa ako neko drugi ima vaš uređaj.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Postavite obrazac za zaključavanje uređaja, PIN ili lozinku da zaštitite svoje sačuvane kreditne kartice od pristupa ako neko drugi ima vaš uređaj.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Postavite obrazac za zaključavanje uređaja, PIN ili lozinku da zaštitite sačuvane načine plaćanja od pristupa ako neko drugi ima vaš uređaj.</string>
+    <string name="credit_cards_warning_dialog_message_3">Postavite obrazac za zaključavanje uređaja, PIN ili lozinku da zaštitite sačuvane načine plaćanja od pristupa ako neko drugi ima vaš uređaj.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Podesi odmah</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1864,10 +1879,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Otključajte svoj uređaj</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Otključajte za korištenje sačuvanih podataka o kreditnoj kartici</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Otključajte za korištenje sačuvanih podataka o kreditnoj kartici</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Otključajte da koristite sačuvane načine plaćanja</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Otključajte da koristite sačuvane načine plaćanja</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Dodaj adresu</string>
     <!-- Title of the "Edit address" screen -->
@@ -1875,11 +1890,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Upravljaj adresama</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Ime</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Ime</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Srednje ime</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Srednje ime</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Prezime</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Prezime</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Ime</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Adresa</string>
     <!-- The header for the city of an address -->
@@ -1903,9 +1920,9 @@
     <!-- The text for the "Delete address" button for deleting an address -->
     <string name="addressess_delete_address_button">Izbriši adresu</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Jeste li sigurni da želite izbrisati ovu adresu?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Jeste li sigurni da želite izbrisati ovu adresu?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Izbrisati ovu adresu?</string>
+    <string name="addressess_confirm_dialog_message_2">Izbrisati ovu adresu?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Izbriši</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2003,50 +2020,50 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Uredi</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Da li ste sigurni da želite obrisati ovu prijavu?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Da li ste sigurni da želite obrisati ovu prijavu?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Jeste li sigurni da želite izbrisati ovu lozinku?</string>
+    <string name="login_deletion_confirmation_2">Jeste li sigurni da želite izbrisati ovu lozinku?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Obriši</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Otkaži</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Opcije prijave</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Opcije prijave</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opcije lozinke</string>
+    <string name="login_options_menu_2">Opcije lozinke</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Izmjenjivo tekstualno polje za web adresu prijave.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Izmjenjivo tekstualno polje za web adresu prijave.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Tekstualno polje koje se može uređivati za adresu web stranice.</string>
+    <string name="saved_login_hostname_description_3">Tekstualno polje koje se može uređivati za adresu web stranice.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Izmjenjivo tekstualno polje za korisničko ime prijave.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Izmjenjivo tekstualno polje za korisničko ime prijave.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Tekstualno polje koje se može uređivati za korisničko ime.</string>
+    <string name="saved_login_username_description_3">Tekstualno polje koje se može uređivati za korisničko ime.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Izmjenjivo tekstualno polje za lozinku prijave.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Izmjenjivo tekstualno polje za lozinku prijave.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Tekstualno polje koje se može uređivati za lozinku.</string>
+    <string name="saved_login_password_description_2">Tekstualno polje koje se može uređivati za lozinku.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Spasite izmjene za prijavu.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Spasite izmjene za prijavu.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Sačuvaj promjene.</string>
+    <string name="save_changes_to_login_2">Sačuvaj promjene.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Uredi</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Uredi</string>
 
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Uredi lozinku</string>
+    <string name="edit_2">Uredi lozinku</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Dodaj novu prijavu</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Dodaj novu prijavu</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Dodaj lozinku</string>
+    <string name="add_login_2">Dodaj lozinku</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Potrebna lozinka</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Potrebna lozinka</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Unesite lozinku</string>
+    <string name="saved_login_password_required_2">Unesite lozinku</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Korisničko ime je obavezno</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Korisničko ime je obavezno</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Unesite korisničko ime</string>
+    <string name="saved_login_username_required_2">Unesite korisničko ime</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Ime hosta je obavezno</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2153,7 +2170,7 @@
     <string name="radio_preference_info_content_description">Kliknite za više detalja</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Idi prema gore</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Idi prema gore</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Zatvori</string>
@@ -2193,8 +2210,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Prilagođena ocjena</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Nepouzdane recenzije su uklonjene</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Na osnovu pouzdanih recenzija</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Izdvajamo iz nedavnih recenzija</string>
@@ -2254,10 +2269,6 @@
     <string name="review_quality_check_product_availability_warning_body">Ako vidite da je ovaj proizvod ponovo na zalihama, prijavite ga i mi ćemo raditi na provjeri recenzija.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Prijavite proizvod je na zalihama</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Provjera kvaliteta recenzije</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Provjera kvaliteta recenzije</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Provjera kvaliteta recenzije (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2303,13 +2314,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Saznajte više</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Odabirom “Da, probaj” prihvatate %1$s od strane Mozilla-ine %2$s i %3$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Odabirom “Da, probaj” prihvatate %1$s od strane Mozilla-ine %2$s i %3$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Odabirom “Da, probaj” prihvatate sljedeće od %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Odabirom “Da, probaj” prihvatate %2$s %1$s i %4$s %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Odabirom “Da, probaj” prihvatate %2$s %1$s i %4$s %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">politika privatnosti</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">politika privatnosti</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Politika privatnosti</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">obavještenje o privatnosti</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">uslovi korištenja</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2380,6 +2397,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Prevesti ovu stranicu?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Stranica je prevedena sa %1$s na %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Isprobajte privatne prijevode na %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2392,6 +2413,8 @@
     <string name="translations_bottom_sheet_translate_to">Prevedi na</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Ne sada</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Prikaži original</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Gotovo</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2414,6 +2437,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Saznajte više</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Prevođenje…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opcije prevođenja</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index c86dbcc71..31668142d 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -253,6 +253,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Cyfieithu\'r dudalen</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Tudalen wedi\'i chyfieithu o %1$s i %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Dewi iaith</string>
@@ -329,12 +334,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Hysbysiad preifatrwydd Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Darllenwch ein hysbysiad preifatrwydd</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Rydyn ni wrth ein bodd yn eich cadw chi’n ddiogel</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Darganfyddwch pam mae miliynau yn caru Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Pori diogel gyda mwy o ddewisiadau</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Mae ein porwr gan gorff dim-er-elw\'n atal cwmnïau rhag eich dilyn yn gyfrinachol o amgylch y we.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Mae mwy na 100 miliwn o bobl yn amddiffyn eu preifatrwydd trwy ddewis porwr a gefnogir gan ddielw.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Tracwyr hysbys? Wedi\'i rwystro\'n awtomatig. Estyniadau? Rhowch gynnig ar bob 700. PDF? Mae ein darllenydd adeiledig yn eu gwneud yn hawdd i\'w rheoli.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Mae ein porwr gan gorff dim-er-elw yn helpu i atal cwmnïau rhag eich dilyn yn gyfrinachol o amgylch y we.\n\nDarllenwch ragor yn ein hysbysiad preifatrwydd.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -691,9 +706,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Nodau Tudalen</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Mewngofnodion</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Mewngofnodion</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Cyfrineiriau</string>
+    <string name="preferences_sync_logins_2">Cyfrineiriau</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Tabiau agored</string>
     <!-- Preference for signing out -->
@@ -719,9 +734,9 @@
     <string name="default_device_name_2">%1$s o %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Cardiau credyd</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Cardiau credyd</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Dulliau talu</string>
+    <string name="preferences_sync_credit_cards_2">Dulliau talu</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Cyfeiriadau</string>
 
@@ -1659,13 +1674,13 @@
     <string name="add_to_homescreen_description_2">Gallwch ychwanegu’r wefan hon yn hawdd i sgrin Cartref eich ffôn i gael mynediad ar unwaith a phori’n gyflymach gyda phrofiad tebyg i ap.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Mewngofnodion a chyfrineiriau</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Mewngofnodion a chyfrineiriau</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Cyfrineiriau</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Cyfrineiriau</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Cadw mewngofnodion a chyfrineiriau</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Cadw mewngofnodion a chyfrineiriau</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Cadw cyfrineiriau</string>
+    <string name="preferences_passwords_save_logins_2">Cadw cyfrineiriau</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Gofyn i gadw</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1680,48 +1695,48 @@
     <string name="preferences_android_autofill_description">Llenwi enwau defnyddwyr a chyfrineiriau mewn apiau eraill ar eich dyfais.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Ychwanegu mewngofnod</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Ychwanegu mewngofnod</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Ychwanegu cyfrinair</string>
+    <string name="preferences_logins_add_login_2">Ychwanegu cyfrinair</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Cydweddu mewngofnodion</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Cydweddu cyfrineiriau</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Cydweddu mewngofnodion</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Cydweddu cyfrineiriau</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Cydweddu mewngofnodion ar draws dyfeisiau</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Cydweddu mewngofnodion ar draws dyfeisiau</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Cydweddu cyfrineiriau ar draws dyfeisiau</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Cydweddu cyfrineiriau ar draws dyfeisiau</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Mewngofnodion wedi’u cadw</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Mewngofnodion wedi’u cadw</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Cyfrineiriau wedi\'u cadw</string>
+    <string name="preferences_passwords_saved_logins_2">Cyfrineiriau wedi\'u cadw</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Bydd y mewngofnodi rydych yn eu cadw neu’n cydweddu i %s i’w gweld yma.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Bydd y mewngofnodi rydych yn eu cadw neu’n cydweddu i %s i’w gweld yma.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Bydd y cyfrineiriau rydych yn eu cadw neu eu cydweddu i %s yn cael eu rhestru yma. Mae\'r holl gyfrineiriau rydych chi\'n eu cadw wedi\'u hamgryptio.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Bydd y cyfrineiriau rydych yn eu cadw neu eu cydweddu i %s yn cael eu rhestru yma. Mae\'r holl gyfrineiriau rydych chi\'n eu cadw wedi\'u hamgryptio.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Dysgu rhagor am Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Dysgu rhagor am Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Dysgwch fwy am gydweddu</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Dysgwch fwy am gydweddu</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Eithriadau</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Bydd mewngofnodion a chyfrineiriau sydd heb eu cadw i’w gweld yma.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Bydd mewngofnodion a chyfrineiriau sydd heb eu cadw i’w gweld yma.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">Fydd %s ddim yn cadw cyfrineiriau ar gyfer gwefannau sy\'n cael eu rhestru yma.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">Fydd %s ddim yn cadw cyfrineiriau ar gyfer gwefannau sy\'n cael eu rhestru yma.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Ni fydd mewngofnodion a chyfrineiriau’n cael eu cadw ar gyfer y gwefannau hyn.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ni fydd mewngofnodion a chyfrineiriau’n cael eu cadw ar gyfer y gwefannau hyn.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">Fydd %s ddim yn cadw cyfrineiriau ar gyfer y gwefannau hyn.</string>
+    <string name="preferences_passwords_exceptions_description_2">Fydd %s ddim yn cadw cyfrineiriau ar gyfer y gwefannau hyn.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Dileu pob eithriad</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Chwilio mewngofnodion</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Chwilio mewngofnodion</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Chwilio cyfrineiriau</string>
+    <string name="preferences_passwords_saved_logins_search_2">Chwilio cyfrineiriau</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Gwefan</string>
     <!-- The header for the username for a login -->
@@ -1750,17 +1765,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Cuddio cyfrinair</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Datgloi i weld eich mewngofnodi wedi’u cadw</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Datgloi i weld eich mewngofnodi wedi’u cadw</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Datgloi i weld eich cyfrineiriau wedi\'u cadw</string>
+    <string name="logins_biometric_prompt_message_2">Datgloi i weld eich cyfrineiriau wedi\'u cadw</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Diogelu mewngofnodion a chyfrineiriau</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Diogelu mewngofnodion a chyfrineiriau</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Diogelwch eich cyfrineiriau wedi\'u cadw</string>
+    <string name="logins_warning_dialog_title_2">Diogelwch eich cyfrineiriau wedi\'u cadw</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Creu patrwm cloi dyfais, PIN, neu gyfrinair i ddiogelu eich mewngofnodion a’ch cyfrineiriau sydd wedi’u cadw rhag i rhywun arall sydd â mynediad i’ch dyfais.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Creu patrwm cloi dyfais, PIN, neu gyfrinair i ddiogelu eich mewngofnodion a’ch cyfrineiriau sydd wedi’u cadw rhag i rhywun arall sydd â mynediad i’ch dyfais.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Gosodwch batrwm clo dyfais, PIN, neu gyfrinair i ddiogelu eich cyfrineiriau sydd wedi\'u cadw rhag i rywun arall sydd â\'ch dyfais gael mynediad iddyn nhw.</string>
+    <string name="logins_warning_dialog_message_2">Gosodwch batrwm clo dyfais, PIN, neu gyfrinair i ddiogelu eich cyfrineiriau sydd wedi\'u cadw rhag i rywun arall sydd â\'ch dyfais gael mynediad iddyn nhw.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Yn hwyrach</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1777,10 +1792,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Defnyddiwyd Diwethaf</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Trefnu dewislen mewngofnodi</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Trefnu dewislen mewngofnodi</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Didoli dewislen cyfrineiriau</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Didoli dewislen cyfrineiriau</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1788,43 +1803,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Cyfeiriadau</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Cardiau credyd</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Cardiau credyd</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Dulliau talu</string>
+    <string name="preferences_credit_cards_2">Dulliau talu</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Cadw ac awtolanw cardiau</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Cadw ac awtolanw cardiau</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Cadw a llanw dulliau talu</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Cadw a llanw dulliau talu</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Mae data wedi’i amgryptio</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Mae data wedi’i amgryptio</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">Mae %s yn amgryptio pob dull talu rydych yn ei gadw</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">Mae %s yn amgryptio pob dull talu rydych yn ei gadw</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Cydweddu cardiau ar draws dyfeisiau</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Cydweddu cardiau</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Ychwanegu cerdyn credyd</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Ychwanegu cerdyn credyd</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Ychwanegu cerdyn</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Ychwanegu cerdyn</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Rheoli cardiau wedi’u cadw</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Rheoli cardiau wedi’u cadw</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Rheoli cardiau</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Rheoli cardiau</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Ychwanegu cyfeiriad</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Rheoli cyfeiriadau</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Cadw ac awtolanw cyfeiriadau</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Cadw ac awtolanw cyfeiriadau</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Cadw a llanw cyfeiriadau</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Cadw a llanw cyfeiriadau</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Cynhwyswch fanylion fel rhifau, cyfeiriadau e-bost a chludo</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Cynhwyswch fanylion fel rhifau, cyfeiriadau e-bost a chludo</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Yn cynnwys rhifau ffôn a chyfeiriadau e-bost</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Yn cynnwys rhifau ffôn a chyfeiriadau e-bost</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Ychwanegu cerdyn</string>
@@ -1845,9 +1860,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Dileu cerdyn</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Ydych chi’n siŵr eich bod am ddileu’r cerdyn credyd yma?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Ydych chi’n siŵr eich bod am ddileu’r cerdyn credyd yma?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Dileu cerdyn?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Dileu cerdyn?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Dileu</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1861,24 +1876,24 @@
     <string name="credit_cards_saved_cards">Cardiau wedi’u cadw</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Rhowch rif cerdyn credyd dilys</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Rhowch rif cerdyn credyd dilys</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Rhoi rif cerdyn dilys</string>
+    <string name="credit_cards_number_validation_error_message_2">Rhoi rif cerdyn dilys</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Llanwch y maes yma.</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Llanwch y maes yma.</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Ychwanegu enw</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Ychwanegu enw</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Datgloi i weld y cardiau rydych wedi’u cadw</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Diogelwch eich cerdyn credyd</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Diogelwch eich cerdyn credyd</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Diogelu eich dulliau talu sydd wedi\'u cadw</string>
+    <string name="credit_cards_warning_dialog_title_2">Diogelu eich dulliau talu sydd wedi\'u cadw</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Gosodwch batrwm cloi dyfais, PIN, neu gyfrinair i ddiogelu eich mewngofnodion a’ch cyfrineiriau sydd wedi’u cadw rhag i rhywun arall sydd â mynediad i’ch dyfais.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Gosodwch batrwm cloi dyfais, PIN, neu gyfrinair i ddiogelu eich mewngofnodion a’ch cyfrineiriau sydd wedi’u cadw rhag i rhywun arall sydd â mynediad i’ch dyfais.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Gosodwch batrwm clo dyfais, PIN, neu gyfrinair i ddiogelu eich dulliau talu rhag i rywun arall sydd â\'ch dyfais gael mynediad iddyn nhw.</string>
+    <string name="credit_cards_warning_dialog_message_3">Gosodwch batrwm clo dyfais, PIN, neu gyfrinair i ddiogelu eich dulliau talu rhag i rywun arall sydd â\'ch dyfais gael mynediad iddyn nhw.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Gosod nawr</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1887,10 +1902,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Datgloi’ch dyfais</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Datglowch i ddefnyddio manylion cerdyn credyd wedi’i storio</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Datglowch i ddefnyddio manylion cerdyn credyd wedi’i storio</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Datgloi i ddefnyddio dulliau talu wedi\'u cadw</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Datgloi i ddefnyddio dulliau talu wedi\'u cadw</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Ychwanegu cyfeiriad</string>
     <!-- Title of the "Edit address" screen -->
@@ -1898,11 +1913,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Rheoli cyfeiriadau</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Enw Cyntaf</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Enw Cyntaf</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Enw Canol</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Enw Canol</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Enw Olaf</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Enw Olaf</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Enw</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Cyfeiriad Stryd</string>
     <!-- The header for the city of an address -->
@@ -1927,9 +1944,9 @@
     <string name="addressess_delete_address_button">Dileu cyfeiriad</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Ydych chi’n siŵr eich bod am ddileu’r cyfeiriad hwn?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ydych chi’n siŵr eich bod am ddileu’r cyfeiriad hwn?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Dileu\'r cyfeiriad hwn?</string>
+    <string name="addressess_confirm_dialog_message_2">Dileu\'r cyfeiriad hwn?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Dileu</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2027,49 +2044,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Golygu</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Ydych chi’n siŵr eich bod eisiau dileu’r mewngofnod?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Ydych chi’n siŵr eich bod eisiau dileu’r mewngofnod?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Ydych chi\'n siŵr eich bod am ddileu\'r cyfrinair hwn?</string>
+    <string name="login_deletion_confirmation_2">Ydych chi\'n siŵr eich bod am ddileu\'r cyfrinair hwn?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Dileu</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Diddymu</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Dewisiadau mewngofnodi</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Dewisiadau mewngofnodi</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Dewisiadau cyfrineiriau</string>
+    <string name="login_options_menu_2">Dewisiadau cyfrineiriau</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Maes testun golygadwy cyfeiriad gwe’r mewngofnodi.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Maes testun golygadwy cyfeiriad gwe’r mewngofnodi.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Maes testun golygadwy y wefan.</string>
+    <string name="saved_login_hostname_description_3">Maes testun golygadwy y wefan.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Maes testun golygadwy enw defnyddiwr y mewngofnodi.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Maes testun golygadwy enw defnyddiwr y mewngofnodi.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Maes testun golygadwy yr enw defnyddiwr.</string>
+    <string name="saved_login_username_description_3">Maes testun golygadwy yr enw defnyddiwr.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Maes testun golygadwy cyfrinair y mewngofnodi.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Maes testun golygadwy cyfrinair y mewngofnodi.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Maes testun golygadwy y cyfrinair.</string>
+    <string name="saved_login_password_description_2">Maes testun golygadwy y cyfrinair.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Cadw newidiadau i’r mewngofnodi.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Cadw newidiadau i’r mewngofnodi.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Cadw newidiadau.</string>
+    <string name="save_changes_to_login_2">Cadw newidiadau.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Golygu</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Golygu</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Golygu cyfrinair</string>
+    <string name="edit_2">Golygu cyfrinair</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Ychwanegu mewngofnod newydd</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Ychwanegu mewngofnod newydd</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Ychwanegu cyfrinair</string>
+    <string name="add_login_2">Ychwanegu cyfrinair</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Mae angen cyfrinair</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Mae angen cyfrinair</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Rhowch gyfrinair</string>
+    <string name="saved_login_password_required_2">Rhowch gyfrinair</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Mae angen enw defnyddiwr</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Mae angen enw defnyddiwr</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Rhoi enw defnyddiwr</string>
+    <string name="saved_login_username_required_2">Rhoi enw defnyddiwr</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Mae angen enw gwesteiwr</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2182,7 +2199,7 @@
     <string name="radio_preference_info_content_description">Cliciwch am ragor o fanylion</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Llywio i fyny</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Llywio i fyny</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Cau</string>
@@ -2223,8 +2240,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Gradd wedi’i haddasu</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Dilëwyd yr adolygiadau annibynadwy</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Ar sail adolygiadau dibynadwy</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Uchafbwyntiau o adolygiadau diweddar</string>
@@ -2280,10 +2295,6 @@
     <string name="review_quality_check_product_availability_warning_body">Os ydych yn gweld fod y cynnyrch hwn nôl mewn stoc, rhowch wybod i ni ac fe wnawn ni ddiweddaru’r dadansoddiad.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Adrodd fod cynnyrch mewn stoc</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Yn gwirio ansawdd adolygiadau</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Yn gwirio ansawdd adolygiadau</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Yn gwirio ansawdd adolygiadau (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2329,13 +2340,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Dysgu rhagor</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Trwy ddewis “Iawn, rhoi cynnig arno” rydych yn cytuno i %2$s a %3$s %1$s gan Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Trwy ddewis “Iawn, rhoi cynnig arno” rydych yn cytuno i %2$s a %3$s %1$s gan Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Wrth ddewis “Iawn, rhowch gynnig arni” rydych yn cytuno i’r canlynol o %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Drwy ddewis &quot;Ie, rhowch gynnig arni&quot; rydych yn cytuno i %2$s %1$s a %3$s %4$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Drwy ddewis &quot;Ie, rhowch gynnig arni&quot; rydych yn cytuno i %2$s %1$s a %3$s %4$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">polisi preifatrwydd</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">polisi preifatrwydd</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Polisi preifatrwydd</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">hysbysiad preifatrwydd</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">telerau defnydd</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2406,6 +2423,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Cyfieithu\'r dudalen?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Tudalen wedi\'i chyfieithu o %1$s i %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Rhowch gynnig ar gyfieithu preifat yn %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2418,6 +2439,8 @@
     <string name="translations_bottom_sheet_translate_to">Cyfieithu i\'r</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Nid nawr</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Dangos y gwreiddiol</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Gorffen</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2441,6 +2464,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Darllen rhagor</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Wrthi\'n cyfieithu…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Dewisiadau Cyfieithu</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 1ecf296b4..f6f164a0a 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -331,7 +331,6 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Privatlivserklæring for Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Vi elsker at holde dig sikker</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
@@ -689,9 +688,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Bogmærker</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Logins</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Logins</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Adgangskoder</string>
+    <string name="preferences_sync_logins_2">Adgangskoder</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Åbne faneblade</string>
     <!-- Preference for signing out -->
@@ -717,9 +716,9 @@
     <string name="default_device_name_2">%1$s på %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Betalingskort</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Betalingskort</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Betalingsmetoder</string>
+    <string name="preferences_sync_credit_cards_2">Betalingsmetoder</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresser</string>
 
@@ -1654,13 +1653,13 @@
     <string name="add_to_homescreen_description_2">Du kan nemt føje dette websted til din enheds startskærm for at have hurtig adgang til det og browse hurtigere med en app-lignende oplevelse.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Logins og adgangskoder</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Logins og adgangskoder</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Adgangskoder</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Adgangskoder</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Gem logins og adgangskoder</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Gem logins og adgangskoder</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Gem adgangskoder</string>
+    <string name="preferences_passwords_save_logins_2">Gem adgangskoder</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Bed om at gemme</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1675,48 +1674,48 @@
     <string name="preferences_android_autofill_description">Udfyld brugernavne og adgangskoder i andre apps på din enhed.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Tilføj login</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Tilføj login</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Tilføj adgangskode</string>
+    <string name="preferences_logins_add_login_2">Tilføj adgangskode</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Synkroniser logins</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synkroniser adgangskoder</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Synkroniser logins</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Synkroniser adgangskoder</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Synkroniser logins på tværs af enheder</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Synkroniser logins på tværs af enheder</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synkroniser adgangskoder på tværs af enheder</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Synkroniser adgangskoder på tværs af enheder</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Gemte logins</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Gemte logins</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Gemte adgangskoder</string>
+    <string name="preferences_passwords_saved_logins_2">Gemte adgangskoder</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">De logins, du gemmer eller synkroniserer til %s, vises her.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">De logins, du gemmer eller synkroniserer til %s, vises her.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Adgangskoderne, du gemmer i eller synkroniserer med %s vil blive vist her. Alle dine gemte adgangskoder bliver krypteret.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Adgangskoderne, du gemmer i eller synkroniserer med %s vil blive vist her. Alle dine gemte adgangskoder bliver krypteret.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Læs mere om Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Læs mere om Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Læs mere om synkronisering</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Læs mere om synkronisering</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Undtagelser</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Logins og adgangskoder, der ikke er gemt, vises her.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Logins og adgangskoder, der ikke er gemt, vises her.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s gemmer ikke adgangskoder til websteder vist her.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s gemmer ikke adgangskoder til websteder vist her.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Logins og adgangskoder vil ikke blive gemt for disse websteder.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Logins og adgangskoder vil ikke blive gemt for disse websteder.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s gemmer ikke adgangskoder til disse websteder.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s gemmer ikke adgangskoder til disse websteder.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Slet alle undtagelser</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Søg efter logins</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Søg efter logins</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Søg efter adgangskoder</string>
+    <string name="preferences_passwords_saved_logins_search_2">Søg efter adgangskoder</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Websted</string>
     <!-- The header for the username for a login -->
@@ -1744,17 +1743,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Skjul adgangskode</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Lås op for at se dine gemte logins</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Lås op for at se dine gemte logins</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Lås op for at se dine gemte adgangskoder</string>
+    <string name="logins_biometric_prompt_message_2">Lås op for at se dine gemte adgangskoder</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Gør dine logins og adgangskoder sikre</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Gør dine logins og adgangskoder sikre</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Gør dine gemte adgangskoder sikre</string>
+    <string name="logins_warning_dialog_title_2">Gør dine gemte adgangskoder sikre</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Indstil en pinkode, en adgangskode eller et låsemønster på din enhed for at forhindre, at andre mennesker får adgang til dine gemte logins og adgangskoder, hvis de har adgang til din enhed.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Indstil en pinkode, en adgangskode eller et låsemønster på din enhed for at forhindre, at andre mennesker får adgang til dine gemte logins og adgangskoder, hvis de har adgang til din enhed.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Indstil en pinkode, en adgangskode eller et låsemønster på din enhed for at forhindre, at andre mennesker får adgang til dine gemte  adgangskoder, hvis de har adgang til din enhed.</string>
+    <string name="logins_warning_dialog_message_2">Indstil en pinkode, en adgangskode eller et låsemønster på din enhed for at forhindre, at andre mennesker får adgang til dine gemte  adgangskoder, hvis de har adgang til din enhed.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Senere</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1772,10 +1771,10 @@
     <string name="saved_logins_sort_strategy_last_used">Senest brugt</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sortér menuen logins</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Sortér menuen logins</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menuen sorter adgangskoder</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menuen sorter adgangskoder</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1783,42 +1782,42 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adresser</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Betalingskort</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Betalingskort</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Betalingsmetoder</string>
+    <string name="preferences_credit_cards_2">Betalingsmetoder</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Gem og autofyld betalingskort</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Gem og autofyld betalingskort</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Gem og udfyld betalingsmetoder</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Gem og udfyld betalingsmetoder</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data er krypteret</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Data er krypteret</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s krypterer alle betalingsmetoder, du gemmer</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s krypterer alle betalingsmetoder, du gemmer</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synkroniser kort på tværs af enheder</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Synkroniser kort</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Tilføj betalingskort</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Tilføj betalingskort</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Tilføj kort</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Tilføj kort</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Håndter gemte kort</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Håndter gemte kort</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Håndter kort</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Håndter kort</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Tilføj adresse</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Håndter adresser</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Gem og autofyld adresser</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Gem og autofyld adresser</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Gem og udfyld adresser</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Gem og udfyld adresser</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Inkluderer oplysninger såsom telefonnumre, mail- og forsendelsesadresser</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Inkluderer oplysninger såsom telefonnumre, mail- og forsendelsesadresser</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Inkluderer telefonnumre og mailadresser</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Inkluderer telefonnumre og mailadresser</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Tilføj kort</string>
@@ -1839,9 +1838,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Slet kort</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Er du sikker på, at du vil slette dette betalingskort?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Er du sikker på, at du vil slette dette betalingskort?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Slet kort?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Slet kort?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Slet</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1855,24 +1854,24 @@
     <string name="credit_cards_saved_cards">Gemte kort</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Indtast et gyldigt betalingskortnummer</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Indtast et gyldigt betalingskortnummer</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Indtast et gyldigt kortnummer</string>
+    <string name="credit_cards_number_validation_error_message_2">Indtast et gyldigt kortnummer</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Udfyld dette felt</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Udfyld dette felt</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Tilføj navn</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Tilføj navn</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Lås op for at se dine gemte betalingskort</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Beskyt dine betalingskort</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Beskyt dine betalingskort</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Gør dine gemte betalingsmetoder sikre</string>
+    <string name="credit_cards_warning_dialog_title_2">Gør dine gemte betalingsmetoder sikre</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Indstil en pinkode, en adgangskode eller et låsemønster på din enhed for at forhindre, at andre mennesker får adgang til dine gemte betalingskort, hvis de har adgang til din enhed.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Indstil en pinkode, en adgangskode eller et låsemønster på din enhed for at forhindre, at andre mennesker får adgang til dine gemte betalingskort, hvis de har adgang til din enhed.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Indstil en pinkode, en adgangskode eller et låsemønster på din enhed for at forhindre, at andre mennesker får adgang til dine gemte betalingsmetoder, hvis de har adgang til din enhed.</string>
+    <string name="credit_cards_warning_dialog_message_3">Indstil en pinkode, en adgangskode eller et låsemønster på din enhed for at forhindre, at andre mennesker får adgang til dine gemte betalingsmetoder, hvis de har adgang til din enhed.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Indstil nu</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1880,10 +1879,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Lås din enhed op</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Lås op for at anvende gemte informationer om betalingskort</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Lås op for at anvende gemte informationer om betalingskort</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Lås op for at bruge gemte betalingsmetoder</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Lås op for at bruge gemte betalingsmetoder</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Tilføj adresse</string>
     <!-- Title of the "Edit address" screen -->
@@ -1891,11 +1890,11 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Håndter adresser</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Fornavn</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Fornavn</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Mellemnavn</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Mellemnavn</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Efternavn</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Efternavn</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Postadresse</string>
     <!-- The header for the city of an address -->
@@ -1919,9 +1918,9 @@
     <!-- The text for the "Delete address" button for deleting an address -->
     <string name="addressess_delete_address_button">Slet adresse</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Er du sikker på, at du vil slette denne adresse?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Er du sikker på, at du vil slette denne adresse?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Slet denne adresse?</string>
+    <string name="addressess_confirm_dialog_message_2">Slet denne adresse?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Slet</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2020,49 +2019,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Rediger</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Er du sikker på, at du vil slette dette login?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Er du sikker på, at du vil slette dette login?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Er du sikker på, at du vil slette denne adgangskode?</string>
+    <string name="login_deletion_confirmation_2">Er du sikker på, at du vil slette denne adgangskode?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Slet</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Annuller</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Login-indstillinger</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Login-indstillinger</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Adgangskode-indstillinger</string>
+    <string name="login_options_menu_2">Adgangskode-indstillinger</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Det redigerbare tekstfelt for login’ets webadresse.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Det redigerbare tekstfelt for login’ets webadresse.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Det redigerbare tekstfelt for webadressen.</string>
+    <string name="saved_login_hostname_description_3">Det redigerbare tekstfelt for webadressen.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Det redigerbare tekstfelt for login’ets brugernavn.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Det redigerbare tekstfelt for login’ets brugernavn.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Det redigerbare tekstfelt for brugernavnet.</string>
+    <string name="saved_login_username_description_3">Det redigerbare tekstfelt for brugernavnet.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Det redigerbare tekstfelt for login’ets adgangskode.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Det redigerbare tekstfelt for login’ets adgangskode.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Det redigerbare tekstfelt for adgangskoden.</string>
+    <string name="saved_login_password_description_2">Det redigerbare tekstfelt for adgangskoden.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Gem ændringer til login.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Gem ændringer til login.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Gem ændringer.</string>
+    <string name="save_changes_to_login_2">Gem ændringer.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Rediger</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Rediger</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Rediger adgangskode</string>
+    <string name="edit_2">Rediger adgangskode</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Tilføj nyt login</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Tilføj nyt login</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Tilføj adgangskode</string>
+    <string name="add_login_2">Tilføj adgangskode</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Adgangskode påkrævet</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Adgangskode påkrævet</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Indtast en adgangskode</string>
+    <string name="saved_login_password_required_2">Indtast en adgangskode</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Brugernavn påkrævet</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Brugernavn påkrævet</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Indtast et brugernavn</string>
+    <string name="saved_login_username_required_2">Indtast et brugernavn</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Værtsnavn påkrævet</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2173,7 +2172,7 @@
     <string name="radio_preference_info_content_description">Tryk for at se flere detaljer</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Naviger op</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Naviger op</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Luk</string>
@@ -2214,8 +2213,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Justeret bedømmelse</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Upålidelige anmeldelser er blevet fjernet</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Baseret på pålidelige anmeldelser</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Højdepunkter fra de seneste anmeldelser</string>
@@ -2273,10 +2270,6 @@
     <string name="review_quality_check_product_availability_warning_body">Hvis du lægger mærke til at produktet er på lager igen, må du gerne rapportere det. Så kan vi kontrollere anmeldelserne.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Rapporter at produktet er på lager</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Kontrollerer kvaliteten af anmeldelser</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Kontrollerer kvaliteten af anmeldelser</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Kontrollerer kvaliteten af anmeldelser (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2323,11 +2316,11 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Læs mere</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Ved at vælge &quot;Ja, prøv det&quot; accepterer du %1$s fra Mozillas %2$s og %3$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Ved at vælge “Ja, prøv det” accepterer du %1$s fra Mozillas %2$s og %3$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
-    <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Ved at vælge &quot;Ja, prøv det&quot; accepterer du følgende fra %1$s:</string>
+    <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Ved at vælge “Ja, prøv det” accepterer du følgende fra %1$s:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">privatlivspolitik</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">privatlivspolitik</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Privatlivspolitik</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d31cb9ca6..6ad60d827 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -258,6 +258,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Seite übersetzen</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Seite von %1$s in %2$s übersetzt.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Gewählte Sprache</string>
@@ -336,12 +341,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox-Datenschutzhinweis</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Weitere Informationen finden Sie in unserem Datenschutzhinweis</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Wir schützen Sie gerne</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Erfahren Sie, warum Millionen Firefox Firefox lieben</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Sicheres Surfen mit mehr Auswahl</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Unser gemeinnütziger Browser verhindert, dass Unternehmen heimlich Ihre Aktivitäten im Internet verfolgen.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Mehr als 100 Millionen Menschen schützen ihre Privatsphäre, indem sie einen Browser wählen, der von einer gemeinnützigen Organisation unterstützt wird.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Bekannte Elemente zur Aktivitätenverfolgung? Automatisch blockiert. Erweiterungen? Alle 700 PDFs ausprobieren? Unser eingebautes Lesezeichen macht sie einfach zu verwalten.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Unser gemeinnütziger Browser verhindert, dass Unternehmen heimlich Ihre Aktivitäten im Internet verfolgen.\n\nWeitere Informationen finden Sie in unserem Datenschutzhinweis.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -697,9 +712,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Lesezeichen</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Zugangsdaten</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Zugangsdaten</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Passwörter</string>
+    <string name="preferences_sync_logins_2">Passwörter</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Offene Tabs</string>
     <!-- Preference for signing out -->
@@ -725,9 +740,9 @@
     <string name="default_device_name_2">%1$s auf %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Kreditkarten</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditkarten</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Zahlungsmethoden</string>
+    <string name="preferences_sync_credit_cards_2">Zahlungsmethoden</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adressen</string>
 
@@ -1695,13 +1710,13 @@
     <string name="add_to_homescreen_description_2">Sie können diese Website einfach zum Startbildschirm Ihres Geräts hinzufügen, um unmittelbaren Zugriff darauf zu haben und sie wie eine App zu nutzen.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Zugangsdaten und Passwörter</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Zugangsdaten und Passwörter</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Passwörter</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Passwörter</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Zugangsdaten und Passwörter speichern</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Zugangsdaten und Passwörter speichern</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Passwörter speichern</string>
+    <string name="preferences_passwords_save_logins_2">Passwörter speichern</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Zum Speichern nachfragen</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1717,47 +1732,47 @@
     <string name="preferences_android_autofill_description">Benutzernamen und Passwörter auf Webseite bei Nutzung von anderen Apps auf Ihrem Gerät automatisch ausfüllen.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Zugangsdaten hinzufügen</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Zugangsdaten hinzufügen</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Passwort hinzufügen</string>
+    <string name="preferences_logins_add_login_2">Passwort hinzufügen</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Zugangsdaten synchronisieren</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Passwörter synchronisieren</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Zugangsdaten synchronisieren</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Passwörter synchronisieren</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Zugangsdaten zwischen Geräten synchronisieren</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Zugangsdaten zwischen Geräten synchronisieren</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Passwörter geräteübergreifend synchronisieren</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Passwörter geräteübergreifend synchronisieren</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Gespeicherte Zugangsdaten</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Gespeicherte Zugangsdaten</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Gespeicherte Passwörter</string>
+    <string name="preferences_passwords_saved_logins_2">Gespeicherte Passwörter</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Die Zugangsdaten, die Sie speichern oder mit %s synchronisieren, werden hier angezeigt.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Die Zugangsdaten, die Sie speichern oder mit %s synchronisieren, werden hier angezeigt.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Die Passwörter, die Sie speichern oder mit %s synchronisieren, werden hier aufgelistet. Alle gespeicherten Passwörter werden verschlüsselt.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Die Passwörter, die Sie speichern oder mit %s synchronisieren, werden hier aufgelistet. Alle gespeicherten Passwörter werden verschlüsselt.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Erfahren Sie mehr über Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Erfahren Sie mehr über Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Weitere Informationen über Sync</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Weitere Informationen über Sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Ausnahmen</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Zugangsdaten und Passwörter, die nicht gespeichert werden, werden hier angezeigt.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Zugangsdaten und Passwörter, die nicht gespeichert werden, werden hier angezeigt.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s speichert keine Passwörter für die hier aufgeführten Websites.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s speichert keine Passwörter für die hier aufgeführten Websites.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Zugangsdaten und Passwörter werden für diese Websites nicht gespeichert.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Zugangsdaten und Passwörter werden für diese Websites nicht gespeichert.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s speichert keine Passwörter für diese Websites.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s speichert keine Passwörter für diese Websites.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Alle Ausnahmen löschen</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Zugangsdaten durchsuchen</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Zugangsdaten durchsuchen</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Passwörter durchsuchen</string>
+    <string name="preferences_passwords_saved_logins_search_2">Passwörter durchsuchen</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Website</string>
     <!-- The header for the username for a login -->
@@ -1785,17 +1800,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Passwort verbergen</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Zum Anzeigen Ihrer gespeicherten Zugangsdaten entsperren</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Zum Anzeigen Ihrer gespeicherten Zugangsdaten entsperren</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Zum Anzeigen Ihrer gespeicherten Passwörter entsperren</string>
+    <string name="logins_biometric_prompt_message_2">Zum Anzeigen Ihrer gespeicherten Passwörter entsperren</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Sichern Sie Ihre Zugangsdaten und Passwörter</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Sichern Sie Ihre Zugangsdaten und Passwörter</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Sichern Sie Ihre gespeicherten Passwörter</string>
+    <string name="logins_warning_dialog_title_2">Sichern Sie Ihre gespeicherten Passwörter</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Zugangsdaten und Passwörter zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Zugangsdaten und Passwörter zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Passwörter zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
+    <string name="logins_warning_dialog_message_2">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Passwörter zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Später</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1813,10 +1828,10 @@
     <string name="saved_logins_sort_strategy_last_used">Zuletzt verwendet</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menü mit Zugangsdaten sortieren</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Menü mit Zugangsdaten sortieren</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menü „Passwörter sortieren“</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menü „Passwörter sortieren“</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1824,43 +1839,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adressen</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Kreditkarten</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditkarten</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Zahlungsmethoden</string>
+    <string name="preferences_credit_cards_2">Zahlungsmethoden</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Autovervollständigung für Kreditkartendaten</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Autovervollständigung für Kreditkartendaten</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Zahlungsmethoden speichern und ausfüllen</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Zahlungsmethoden speichern und ausfüllen</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Daten sind verschlüsselt</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Daten sind verschlüsselt</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s verschlüsselt alle von Ihnen gespeicherten Zahlungsmethoden</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s verschlüsselt alle von Ihnen gespeicherten Zahlungsmethoden</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Karten zwischen Geräten synchronisieren</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Kreditkarten synchronisieren</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Kreditkarte hinzufügen</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditkarte hinzufügen</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Karte hinzufügen</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Karte hinzufügen</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Gespeicherte Karten verwalten</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Gespeicherte Karten verwalten</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Karten verwalten</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Karten verwalten</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adresse hinzufügen</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Adressen verwalten</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Autovervollständigung für Adressen</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Autovervollständigung für Adressen</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Adressen speichern und ausfüllen</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Adressen speichern und ausfüllen</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Dies beinhaltetet Nummern, E-Mail- und Lieferadressen</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Dies beinhaltetet Nummern, E-Mail- und Lieferadressen</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Enthält Telefonnummern und E-Mail-Adressen</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Enthält Telefonnummern und E-Mail-Adressen</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Karte hinzufügen</string>
@@ -1881,9 +1896,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Karte löschen</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Soll diese Kreditkarte wirklich gelöscht werden?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Soll diese Kreditkarte wirklich gelöscht werden?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Karte löschen?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Karte löschen?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Löschen</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1897,24 +1912,24 @@
     <string name="credit_cards_saved_cards">Gespeicherte Karten</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Bitte geben Sie eine gültige Kreditkartennummer ein</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Bitte geben Sie eine gültige Kreditkartennummer ein</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Geben Sie eine gültige Kartennummer ein</string>
+    <string name="credit_cards_number_validation_error_message_2">Geben Sie eine gültige Kartennummer ein</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Bitte füllen Sie dieses Feld aus</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Bitte füllen Sie dieses Feld aus</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Fügen Sie einen Namen hinzu</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Fügen Sie einen Namen hinzu</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Zum Anzeigen Ihrer gespeicherten Karten entsperren</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Sichern Sie Ihre Kreditkarten</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Sichern Sie Ihre Kreditkarten</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Sichern Sie Ihre gespeicherten Zahlungsmethoden</string>
+    <string name="credit_cards_warning_dialog_title_2">Sichern Sie Ihre gespeicherten Zahlungsmethoden</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Karten zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Karten zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Zahlungsmethoden zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
+    <string name="credit_cards_warning_dialog_message_3">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Zahlungsmethoden zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Jetzt einrichten</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1923,10 +1938,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Entsperren Sie Ihr Gerät</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Entsperren, um gespeicherte Kreditkartendaten zu verwenden</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Entsperren, um gespeicherte Kreditkartendaten zu verwenden</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Zum Verwenden Ihrer gespeicherten Zahlungsmethoden entsperren</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Zum Verwenden Ihrer gespeicherten Zahlungsmethoden entsperren</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adresse hinzufügen</string>
     <!-- Title of the "Edit address" screen -->
@@ -1934,11 +1949,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Adressen verwalten</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Vorname</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Vorname</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Zweiter Vorname</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Zweiter Vorname</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Nachname</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Nachname</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Name</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Straße und Hausnummer</string>
     <!-- The header for the city of an address -->
@@ -1963,9 +1980,9 @@
     <string name="addressess_delete_address_button">Adresse löschen</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Soll diese Adresse wirklich gelöscht werden?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Soll diese Adresse wirklich gelöscht werden?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Diese Adresse löschen?</string>
+    <string name="addressess_confirm_dialog_message_2">Diese Adresse löschen?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Löschen</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2063,49 +2080,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Bearbeiten</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Sollen diese Zugangsdaten wirklich gelöscht werden?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Sollen diese Zugangsdaten wirklich gelöscht werden?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Soll dieses Passwort wirklich gelöscht werden?</string>
+    <string name="login_deletion_confirmation_2">Soll dieses Passwort wirklich gelöscht werden?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Löschen</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Abbrechen</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Optionen für Zugangsdaten</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Optionen für Zugangsdaten</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Passwort-Optionen</string>
+    <string name="login_options_menu_2">Passwort-Optionen</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Das bearbeitbare Textfeld für die Internetadresse der Zugangsdaten.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Das bearbeitbare Textfeld für die Internetadresse der Zugangsdaten.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Das bearbeitbare Textfeld für die Adresse der Website.</string>
+    <string name="saved_login_hostname_description_3">Das bearbeitbare Textfeld für die Adresse der Website.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Das bearbeitbare Textfeld für den Benutzernamen der Zugangsdaten.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Das bearbeitbare Textfeld für den Benutzernamen der Zugangsdaten.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Das bearbeitbare Textfeld für den Benutzernamen.</string>
+    <string name="saved_login_username_description_3">Das bearbeitbare Textfeld für den Benutzernamen.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Das bearbeitbare Textfeld für das Passwort der Zugangsdaten.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Das bearbeitbare Textfeld für das Passwort der Zugangsdaten.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Das bearbeitbare Textfeld für das Passwort.</string>
+    <string name="saved_login_password_description_2">Das bearbeitbare Textfeld für das Passwort.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Änderungen an Zugangsdaten speichern.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Änderungen an Zugangsdaten speichern.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Änderungen speichern.</string>
+    <string name="save_changes_to_login_2">Änderungen speichern.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Bearbeiten</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Bearbeiten</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Passwort bearbeiten</string>
+    <string name="edit_2">Passwort bearbeiten</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Neue Zugangsdaten hinzufügen</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Neue Zugangsdaten hinzufügen</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Passwort hinzufügen</string>
+    <string name="add_login_2">Passwort hinzufügen</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Passwort erforderlich</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Passwort erforderlich</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Passwort eingeben</string>
+    <string name="saved_login_password_required_2">Passwort eingeben</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Benutzername erforderlich</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Benutzername erforderlich</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Benutzername eingeben</string>
+    <string name="saved_login_username_required_2">Benutzername eingeben</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hostname erforderlich</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2217,7 +2234,7 @@
     <string name="radio_preference_info_content_description">Klicken Sie hier für weitere Details</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Nach oben navigieren</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Nach oben navigieren</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Schließen</string>
@@ -2258,8 +2275,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Bewertungen angepasst</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Unzuverlässige Bewertungen entfernt</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Basierend auf zuverlässigen Bewertungen</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Highlights aus aktuellen Bewertungen</string>
@@ -2315,10 +2330,6 @@
     <string name="review_quality_check_product_availability_warning_body">Wenn Sie sehen, dass dieses Produkt wieder auf Lager ist, melden Sie es und wir arbeiten an der Überprüfung der Bewertungen.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Melden, dass das Produkt vorrätig ist</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Qualität der Bewertung wird überprüft</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Qualität der Bewertung wird überprüft</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Qualität der Bewertungen wird überprüft (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2364,13 +2375,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Weitere Informationen</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Indem Sie „Ja, ausprobieren“ auswählen, stimmen Sie der %2$s und den %3$s von %1$s zu, das von Mozilla angeboten wird.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Indem Sie „Ja, ausprobieren“ auswählen, stimmen Sie der %2$s und den %3$s von %1$s zu, das von Mozilla angeboten wird.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Indem Sie „Ja, ausprobieren“ auswählen, stimmen Sie dem folgenden von %1$s zu:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Indem Sie „Ja, ausprobieren“ auswählen, stimmen Sie dem %2$s von %1$s und dem %4$s von %3$s zu.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Indem Sie „Ja, ausprobieren“ auswählen, stimmen Sie dem %2$s von %1$s und dem %4$s von %3$s zu.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">Datenschutzerklärung</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">Datenschutzerklärung</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Datenschutzrichtlinie</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">Datenschutzhinweis</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">Nutzungsbedingungen</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2441,6 +2458,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Diese Seite übersetzen?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Seite von %1$s in %2$s übersetzt</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Private Übersetzungen in %1$s ausprobieren</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2453,6 +2474,8 @@
     <string name="translations_bottom_sheet_translate_to">Übersetzen auf</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Nicht jetzt</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Original anzeigen</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Fertig</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2475,6 +2498,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Weitere Informationen</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Wird übersetzt…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Übersetzungsoptionen</string>
diff --git a/app/src/main/res/values-dsb/strings.xml b/app/src/main/res/values-dsb/strings.xml
index 629b72032..d0cd466ea 100644
--- a/app/src/main/res/values-dsb/strings.xml
+++ b/app/src/main/res/values-dsb/strings.xml
@@ -254,6 +254,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Bok pśełožyś</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Bok jo se pśełožył z rěcy %1$s do rěcy %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Wubrana rěc</string>
@@ -330,12 +335,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Powěźeńka priwatnosći Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Zgóńśo wěcej w našej powěźeńce priwatnosći</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Šćitamy was rad</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Wuslěźćo, cogodla miliony luźi Firefox lubuju</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Wěste pśeglědowanje z wěcej wuběrkami</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Naš za wšykne wužytny wobglědowak pśedewześam zawoborujo, wam kšajźu pó interneśe slědowaś.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Wěcej ako 100 milionow luźi šćita swóju priwatnosć, gaž wobglědowak wuběraśo, kótaryž se wót njekomercielneje organizacije pódpěra.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Znate pśeslědowaki? Blokuju se awtomatiski. Rozšyrjenja? Wopytajśo wšykne 700. PDF? Naš zatwarjony cytak wólažcujo je zastojaś.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Naš za wšykne wužytny wobglědowak tomu zajźujo, až pśedewześa wam kšajźu pó interneśe slěduju.\n\nDalšne informacije w našej powěźeńce priwatnosći.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -689,9 +704,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Cytańske znamjenja</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Pśizjawjenja</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Pśizjawjenja</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Gronidła</string>
+    <string name="preferences_sync_logins_2">Gronidła</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Wócynjone rejtarki</string>
     <!-- Preference for signing out -->
@@ -717,9 +732,9 @@
     <string name="default_device_name_2">%1$s wót %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Kreditowe kórty</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditowe kórty</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Płaśeńske metody</string>
+    <string name="preferences_sync_credit_cards_2">Płaśeńske metody</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adrese</string>
 
@@ -1661,13 +1676,13 @@
     <string name="add_to_homescreen_description_2">Móžośo startowej wobrazowce swójogo rěda toś to websedło lažko pśidaś, aby direktny pśistup měł a malsnjej z dožywjenim nałoženja pśeglědował.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Pśizjawjenja a gronidła</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Pśizjawjenja a gronidła</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Gronidła</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Gronidła</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Pśizjawjenja a gronidła składowaś</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Pśizjawjenja a gronidła składowaś</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Gronidła składowaś</string>
+    <string name="preferences_passwords_save_logins_2">Gronidła składowaś</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Pśed składowanim se pšašaś</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1682,47 +1697,47 @@
     <string name="preferences_android_autofill_description">Wužywaŕske mjenja a gronidła w drugich nałoženjach na wašom rěźe zasajźiś.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Pśizjawjenje pśidaś</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Pśizjawjenje pśidaś</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Gronidło pśidaś</string>
+    <string name="preferences_logins_add_login_2">Gronidło pśidaś</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Pśizjawjenja synchronizěrowaś</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Gronidła synchronizěrowaś</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Pśizjawjenja synchronizěrowaś</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Gronidła synchronizěrowaś</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Pśizjawjenja mjazy rědami synchronizěrowaś</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Pśizjawjenja mjazy rědami synchronizěrowaś</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Gronidła pśez rědy synchronizěrowaś</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Gronidła pśez rědy synchronizěrowaś</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Skłaźone pśizjawjenja</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Skłaźone pśizjawjenja</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Skłaźone gronidła</string>
+    <string name="preferences_passwords_saved_logins_2">Skłaźone gronidła</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Pśizjawjenja, kótarež składujośo abo z %s synchronizěrujośo, se how pokažu.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Pśizjawjenja, kótarež składujośo abo z %s synchronizěrujośo, se how pokažu.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Gronidła, kótarež składujośo abo z %s synchronizěrujośo, se how nalicyju. Wšykne gronidła, kótarež składujośo, se koděruju.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Gronidła, kótarež składujośo abo z %s synchronizěrujośo, se how nalicyju. Wšykne gronidła, kótarež składujośo, se koděruju.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Zgóńśo wěcej wó Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Zgóńśo wěcej wó Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Zgóńśo wěcej wó sync</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Zgóńśo wěcej wó sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Wuwześa</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Pśizjawjenja a gronidła, kótarež se njeskładuju, se how pokažu.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Pśizjawjenja a gronidła, kótarež se njeskładuju, se how pokažu.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s gronidła za sedła njeskładujo, kótarež su how nalicone.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s gronidła za sedła njeskładujo, kótarež su how nalicone.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Pśizjawjenja a gronidła se za toś te sedła njeskładuju.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Pśizjawjenja a gronidła se za toś te sedła njeskładuju.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s gronidła za toś te sedła njeskładujo.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s gronidła za toś te sedła njeskładujo.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Wšykne wuwześa wulašowaś</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Pśizjawjenja pytaś</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Pśizjawjenja pytaś</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Gronidła pśepytaś</string>
+    <string name="preferences_passwords_saved_logins_search_2">Gronidła pśepytaś</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sedło</string>
     <!-- The header for the username for a login -->
@@ -1751,17 +1766,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Gronidła schowaś</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Za zwobraznjowanje wašych skłaźonych pśizjawjenjow wótwóriś</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Za zwobraznjowanje wašych skłaźonych pśizjawjenjow wótwóriś</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Za zwobraznjowanje wašych skłaźonych kreditowych gronidłow wótwóriś</string>
+    <string name="logins_biometric_prompt_message_2">Za zwobraznjowanje wašych skłaźonych kreditowych gronidłow wótwóriś</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Zawěsććo swóje pśizjawjenja a gronidła</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Zawěsććo swóje pśizjawjenja a gronidła</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Zawěsććo swóje skłaźone gronidła</string>
+    <string name="logins_warning_dialog_title_2">Zawěsććo swóje skłaźone gronidła</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym pśizjawjenjam a gronidłam zajźował, jolic něchten drugi ma waš rěd.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym pśizjawjenjam a gronidłam zajźował, jolic něchten drugi ma waš rěd.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym gronidłam zajźował, jolic něchten drugi ma waš rěd.</string>
+    <string name="logins_warning_dialog_message_2">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym gronidłam zajźował, jolic něchten drugi ma waš rěd.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Pózdźej</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1779,10 +1794,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Slědnem wužyśu</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Meni pśizjawjeńskich datow sortěrowaś</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Meni pśizjawjeńskich datow sortěrowaś</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Meni „Gronidła sortěrowaś“</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Meni „Gronidła sortěrowaś“</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1790,43 +1805,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adrese</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Kreditowe kórty</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditowe kórty</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Płaśeńske metody</string>
+    <string name="preferences_credit_cards_2">Płaśeńske metody</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Kórty składowaś a awtomatiski wupołniś</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kórty składowaś a awtomatiski wupołniś</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Płaśeńske metody składowaś a wupołniś</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Płaśeńske metody składowaś a wupołniś</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Daty su skoděrowane</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Daty su skoděrowane</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s wšykne płaśeńske metody koděrujo, kótarež składujośo</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s wšykne płaśeńske metody koděrujo, kótarež składujośo</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Kórty pśez rědy synchronizěrowaś</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Kórty synchronizěrowaś</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Kreditowu kórtu pśidaś</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditowu kórtu pśidaś</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Kórtu pśidaś</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Kórtu pśidaś</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Skłaźone kórty zastojaś</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Skłaźone kórty zastojaś</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Kórty zastojaś</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Kórty zastojaś</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adresu pśidaś</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Adrese zastojaś</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Adrese składowaś a awtomatiski wupołniś</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Adrese składowaś a awtomatiski wupołniś</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Adrese składowaś a wupołniś</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Adrese składowaś a wupołniś</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Informacije ako licby, e-mailowe a rozpósłańske adrese zapśimjeś</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Informacije ako licby, e-mailowe a rozpósłańske adrese zapśimjeś</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Wopśimujo telefonowe numery a e-mailowe adrese</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Wopśimujo telefonowe numery a e-mailowe adrese</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Kórtu pśidaś</string>
@@ -1847,9 +1862,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Kórtu wulašowaś</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Cośo napšawdu toś tu kreditowu kórtu lašowaś?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Cośo napšawdu toś tu kreditowu kórtu lašowaś?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Kórtu wulašowaś?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Kórtu wulašowaś?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Lašowaś</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1863,24 +1878,24 @@
     <string name="credit_cards_saved_cards">Skłaźone kórty</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Pšosym zapódajśo płaśiwy numer kreditoweje kórty</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Pšosym zapódajśo płaśiwy numer kreditoweje kórty</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Zapódajśo płaśiwy kórtowy numer</string>
+    <string name="credit_cards_number_validation_error_message_2">Zapódajśo płaśiwy kórtowy numer</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Pšosym wupołńśo toś to pólo</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Pšosym wupołńśo toś to pólo</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Pśidajśo mě</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Pśidajśo mě</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Za zwobraznjowanje wašych skłaźonych kreditowych kórtow wótwóriś</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Kreditowe kórty zawěsćiś</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditowe kórty zawěsćiś</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Zawěsććo swóje skłaźone płaśeńske metody</string>
+    <string name="credit_cards_warning_dialog_title_2">Zawěsććo swóje skłaźone płaśeńske metody</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym kreditowym kórtam zajźował, jolic něchten drugi ma waš rěd.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym kreditowym kórtam zajźował, jolic něchten drugi ma waš rěd.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym płaśeńskim metodam zajźował, jolic něchten drugi ma waš rěd.</string>
+    <string name="credit_cards_warning_dialog_message_3">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym płaśeńskim metodam zajźował, jolic něchten drugi ma waš rěd.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Něnto konfigurěrowaś</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1889,10 +1904,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Wótwóŕśo swój rěd</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Blokěrowanje wótpóraś, aby se skłaźone informacije kreditoweje kórty wužywali</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Blokěrowanje wótpóraś, aby se skłaźone informacije kreditoweje kórty wužywali</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Wótwóriś, aby wy skłaźone płaśeńske metody wužywał</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Wótwóriś, aby wy skłaźone płaśeńske metody wužywał</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adresu pśidaś</string>
     <!-- Title of the "Edit address" screen -->
@@ -1900,11 +1915,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Adrese zastojaś</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Pśedmě</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Pśedmě</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Druge pśedmě</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Druge pśedmě</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Familijowe mě</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Familijowe mě</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Mě</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Adresa drogi</string>
     <!-- The header for the city of an address -->
@@ -1929,9 +1946,9 @@
     <string name="addressess_delete_address_button">Adresu lašowaś</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Cośo napšawdu toś tu adresu wulašowaś?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Cośo napšawdu toś tu adresu wulašowaś?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Toś tu adresu lašowaś?</string>
+    <string name="addressess_confirm_dialog_message_2">Toś tu adresu lašowaś?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Lašowaś</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2029,49 +2046,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Wobźěłaś</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Cośo napšawdu toś to pśizjawjenje lašowaś?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Cośo napšawdu toś to pśizjawjenje lašowaś?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Cośo napšawdu toś to gronidło lašowaś?</string>
+    <string name="login_deletion_confirmation_2">Cośo napšawdu toś to gronidło lašowaś?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Lašowaś</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Pśetergnuś</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Pśizjawjeńske nastajenja</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Pśizjawjeńske nastajenja</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Gronidłowe nastajenja</string>
+    <string name="login_options_menu_2">Gronidłowe nastajenja</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Wobźěłujobne tekstowe pólo za webadresu pśizjawjenja.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Wobźěłujobne tekstowe pólo za webadresu pśizjawjenja.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Wobźěłujobne tekstowe pólo za adresu websedła.</string>
+    <string name="saved_login_hostname_description_3">Wobźěłujobne tekstowe pólo za adresu websedła.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Wobźěłujobne tekstowe pólo za wužywaŕske mě pśizjawjenja.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Wobźěłujobne tekstowe pólo za wužywaŕske mě pśizjawjenja.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Wobźěłujobne tekstowe pólo za wužywaŕske mě.</string>
+    <string name="saved_login_username_description_3">Wobźěłujobne tekstowe pólo za wužywaŕske mě.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Wobźěłujobne tekstowe pólo za gronidło pśizjawjenja.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Wobźěłujobne tekstowe pólo za gronidło pśizjawjenja.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Wobźěłujobne tekstowe pólo za gronidło.</string>
+    <string name="saved_login_password_description_2">Wobźěłujobne tekstowe pólo za gronidło.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Změny pśizjawjenja składowaś</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Změny pśizjawjenja składowaś</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Změny składowaś.</string>
+    <string name="save_changes_to_login_2">Změny składowaś.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Wobźěłaś</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Wobźěłaś</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Gronidło wobźěłaś</string>
+    <string name="edit_2">Gronidło wobźěłaś</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Nowe pśizjawjenje pśidaś</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Nowe pśizjawjenje pśidaś</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Gronidło pśidaś</string>
+    <string name="add_login_2">Gronidło pśidaś</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Gronidło trěbne</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Gronidło trěbne</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Gronidło zapódaś</string>
+    <string name="saved_login_password_required_2">Gronidło zapódaś</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Wužywaŕske mě trěbne.</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Wužywaŕske mě trěbne.</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Wužywaŕske mě zapódaś</string>
+    <string name="saved_login_username_required_2">Wužywaŕske mě zapódaś</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hostmě trěbne.</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2184,7 +2201,7 @@
     <string name="radio_preference_info_content_description">Klikniśo za dalšne drobnostki</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Górjej</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Górjej</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Zacyniś</string>
@@ -2225,8 +2242,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Pśměrjone pógódnośowanje</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Njespušćobne pógódnośenja wótwónoźone</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Bazěrujo na spušćobnych pógódnośenjach</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Wjerški z nejnowšych pógódnośenjow</string>
@@ -2283,10 +2298,6 @@ To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produkt
     <string name="review_quality_check_product_availability_warning_body">Jolic wiźiśo, až toś ten produkt jo zasej na skłaźe, dajśo to k wěsći a buźomy na kontrolěrowanju pógódnośenjow źěłaś.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">K wěsći daś, až produkt jo na skłaźe</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Kontrola kwalitu pógódnośenjow</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Kontrola kwalitu pógódnośenjow</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Kontrola kwalitu pógódnośenjow (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2333,13 +2344,19 @@ To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produkt
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Dalšne informacije</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Gaž „Jo, wopytaś“ wuběraśo, zwólijośo do %2$s a %3$s Mozilla za %1$s. </string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Gaž „Jo, wopytaś“ wuběraśo, zwólijośo do %2$s a %3$s Mozilla za %1$s. </string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Gaž „Jo, wopytaś“ wuběraśo, zwólijośo do slědujucego wót %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Gaž „Jo, wopytaś“ wuběraśo, zwólijośo do %2$s %1$s a %4$s %3$s </string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Gaž „Jo, wopytaś“ wuběraśo, zwólijośo do %2$s %1$s a %4$s %3$s </string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">pšawidła priwatnosći</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">pšawidła priwatnosći</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Pšawidła priwatnosći</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">powěźeńka priwatnosći</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">wužywańske wuměnjenja</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2410,6 +2427,10 @@ To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produkt
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Toś ten bok pśełožowaś?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Bok jo se pśełožył z rěcy %1$s do rěcy %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Priwatne pśełožki w %1$s testowaś</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2422,6 +2443,8 @@ To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produkt
     <string name="translations_bottom_sheet_translate_to">Celowa rěc</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Nic něnto</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Original pokazaś</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Dokóńcone</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2444,6 +2467,9 @@ To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produkt
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Dalšne informacije</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Pśełožujo se…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Pśełožowańske nastajenja</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 4de3758d7..56cdddaf8 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -260,6 +260,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Μετάφραση σελίδας</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Η σελίδα μεταφράστηκε από τα %1$s στα %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Επιλεγμένη γλώσσα</string>
@@ -338,12 +343,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Σημείωση απορρήτου του Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Μάθετε περισσότερα στη σημείωση απορρήτου μας</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Μας αρέσει να σας προστατεύουμε</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Μάθετε γιατί εκατομμύρια άνθρωποι αγαπούν το Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Ασφαλής περιήγηση με περισσότερες επιλογές</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Το πρόγραμμα περιήγησης του μη κερδοσκοπικού μας οργανισμού σταματά τις εταιρείες από το να σας ακολουθούν κρυφά σε όλο το διαδίκτυο.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Περισσότεροι από 100 εκατομμύρια χρήστες προστατεύουν το απόρρητό τους επιλέγοντας ένα πρόγραμμα περιήγησης που υποστηρίζεται από έναν μη κερδοσκοπικό οργανισμό.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Γνωστοί ιχνηλάτες; Αποκλείονται αυτόματα. Επεκτάσεις; Δοκιμάστε και τις 700. PDF; Το ενσωματωμένο εργαλείο ανάγνωσης καθιστά εύκολη τη διαχείρισή τους.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Το πρόγραμμα περιήγησης του μη κερδοσκοπικού μας οργανισμού σταματά τις εταιρείες από το να σας ακολουθούν κρυφά σε όλο το διαδίκτυο.\n\nΜάθετε περισσότερα στη σημείωση απορρήτου μας.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -701,9 +716,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Σελιδοδείκτες</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Συνδέσεις</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Συνδέσεις</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Κωδικοί πρόσβασης</string>
+    <string name="preferences_sync_logins_2">Κωδικοί πρόσβασης</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Ανοικτές καρτέλες</string>
     <!-- Preference for signing out -->
@@ -729,9 +744,9 @@
     <string name="default_device_name_2">%1$s στο %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Πιστωτικές κάρτες</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Πιστωτικές κάρτες</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Μέθοδοι πληρωμής</string>
+    <string name="preferences_sync_credit_cards_2">Μέθοδοι πληρωμής</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Διευθύνσεις</string>
 
@@ -1681,13 +1696,13 @@
     <string name="add_to_homescreen_description_2">Μπορείτε εύκολα να προσθέσετε αυτόν τον ιστότοπο στην αρχική οθόνη για άμεση πρόσβαση και ταχύτερη περιήγηση, σαν να ήταν εφαρμογή.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Συνδέσεις και κωδικοί πρόσβασης</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Συνδέσεις και κωδικοί πρόσβασης</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Κωδικοί πρόσβασης</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Κωδικοί πρόσβασης</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Αποθήκευση συνδέσεων και κωδικών πρόσβασης</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Αποθήκευση συνδέσεων και κωδικών πρόσβασης</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Αποθήκευση κωδικών πρόσβασης</string>
+    <string name="preferences_passwords_save_logins_2">Αποθήκευση κωδικών πρόσβασης</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Ερώτηση για αποθήκευση</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1703,47 +1718,47 @@
     <string name="preferences_android_autofill_description">Συμπλήρωση στοιχείων σύνδεσης σε άλλες εφαρμογές της συσκευής σας.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Προσθήκη σύνδεσης</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Προσθήκη σύνδεσης</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Προσθήκη κωδικού πρόσβασης</string>
+    <string name="preferences_logins_add_login_2">Προσθήκη κωδικού πρόσβασης</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Συγχρονισμός συνδέσεων</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Συγχρονισμός κωδικών πρόσβασης</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Συγχρονισμός συνδέσεων</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Συγχρονισμός κωδικών πρόσβασης</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Συγχρονισμός συνδέσεων μεταξύ συσκευών</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Συγχρονισμός συνδέσεων μεταξύ συσκευών</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Συγχρονισμός κωδικών πρόσβασης μεταξύ των συσκευών σας</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Συγχρονισμός κωδικών πρόσβασης μεταξύ των συσκευών σας</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Αποθηκευμένες συνδέσεις</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Αποθηκευμένες συνδέσεις</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Αποθηκευμένοι κωδικοί πρόσβασης</string>
+    <string name="preferences_passwords_saved_logins_2">Αποθηκευμένοι κωδικοί πρόσβασης</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Οι συνδέσεις που αποθηκεύετε ή συγχρονίζετε στο %s θα εμφανίζονται εδώ.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Οι συνδέσεις που αποθηκεύετε ή συγχρονίζετε στο %s θα εμφανίζονται εδώ.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Οι κωδικοί πρόσβασης που αποθηκεύετε ή συγχρονίζετε στο %s θα εμφανίζονται εδώ. Όλοι οι κωδικοί πρόσβασης που αποθηκεύετε κρυπτογραφούνται.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Οι κωδικοί πρόσβασης που αποθηκεύετε ή συγχρονίζετε στο %s θα εμφανίζονται εδώ. Όλοι οι κωδικοί πρόσβασης που αποθηκεύετε κρυπτογραφούνται.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Μάθετε περισσότερα σχετικά με το Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Μάθετε περισσότερα σχετικά με το Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Μάθετε περισσότερα σχετικά με τον συγχρονισμό</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Μάθετε περισσότερα σχετικά με τον συγχρονισμό</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Εξαιρέσεις</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Εδώ εμφανίζονται οι συνδέσεις και οι κωδικοί πρόσβασης που δεν αποθηκεύονται.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Εδώ εμφανίζονται οι συνδέσεις και οι κωδικοί πρόσβασης που δεν αποθηκεύονται.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">Το %s δεν θα αποθηκεύει κωδικούς πρόσβασης για τους ιστοτόπους που αναφέρονται εδώ.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">Το %s δεν θα αποθηκεύει κωδικούς πρόσβασης για τους ιστοτόπους που αναφέρονται εδώ.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Δεν θα αποθηκεύονται στοιχεία σύνδεσης για τους εξής ιστοτόπους.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Δεν θα αποθηκεύονται στοιχεία σύνδεσης για τους εξής ιστοτόπους.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">Το %s δεν θα αποθηκεύει κωδικούς πρόσβασης για αυτούς τους ιστοτόπους.</string>
+    <string name="preferences_passwords_exceptions_description_2">Το %s δεν θα αποθηκεύει κωδικούς πρόσβασης για αυτούς τους ιστοτόπους.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Διαγραφή όλων των εξαιρέσεων</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Αναζήτηση συνδέσεων</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Αναζήτηση συνδέσεων</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Αναζήτηση κωδικών πρόσβασης</string>
+    <string name="preferences_passwords_saved_logins_search_2">Αναζήτηση κωδικών πρόσβασης</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Ιστότοπος</string>
     <!-- The header for the username for a login -->
@@ -1771,17 +1786,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Απόκρυψη κωδικού πρόσβασης</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Ξεκλειδώστε για να δείτε τις αποθηκευμένες συνδέσεις σας</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ξεκλειδώστε για να δείτε τις αποθηκευμένες συνδέσεις σας</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Ξεκλειδώστε για να δείτε τους αποθηκευμένους κωδικούς πρόσβασής σας</string>
+    <string name="logins_biometric_prompt_message_2">Ξεκλειδώστε για να δείτε τους αποθηκευμένους κωδικούς πρόσβασής σας</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Προστασία στοιχείων σύνδεσης</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Προστασία στοιχείων σύνδεσης</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Προστασία των αποθηκευμένων κωδικών πρόσβασής σας</string>
+    <string name="logins_warning_dialog_title_2">Προστασία των αποθηκευμένων κωδικών πρόσβασής σας</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Ορίστε ένα μοτίβο κλειδώματος συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για προστασία των αποθηκευμένων στοιχείων σύνδεσης, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ορίστε ένα μοτίβο κλειδώματος συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για προστασία των αποθηκευμένων στοιχείων σύνδεσης, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Ορίστε ένα μοτίβο κλειδώματος συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για την προστασία των αποθηκευμένων κωδικών πρόσβασής σας, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
+    <string name="logins_warning_dialog_message_2">Ορίστε ένα μοτίβο κλειδώματος συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για την προστασία των αποθηκευμένων κωδικών πρόσβασής σας, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Αργότερα</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1798,10 +1813,10 @@
     <string name="saved_logins_sort_strategy_last_used">Τελευταία χρήση</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ταξινόμηση μενού σύνδεσης</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ταξινόμηση μενού σύνδεσης</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Μενού ταξινόμησης κωδικών πρόσβασης</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Μενού ταξινόμησης κωδικών πρόσβασης</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1809,44 +1824,44 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Διευθύνσεις</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Πιστωτικές κάρτες</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Πιστωτικές κάρτες</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Μέθοδοι πληρωμής</string>
+    <string name="preferences_credit_cards_2">Μέθοδοι πληρωμής</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Αποθήκευση και αυτόματη συμπλήρωση στοιχείων καρτών</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Αποθήκευση και αυτόματη συμπλήρωση στοιχείων καρτών</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Αποθήκευση και συμπλήρωση μεθόδων πληρωμής</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Αποθήκευση και συμπλήρωση μεθόδων πληρωμής</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Τα δεδομένα κρυπτογραφούνται</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Τα δεδομένα κρυπτογραφούνται</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">Το %s κρυπτογραφεί όλες τις μεθόδους πληρωμής που αποθηκεύετε</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">Το %s κρυπτογραφεί όλες τις μεθόδους πληρωμής που αποθηκεύετε</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Συγχρονισμός καρτών μεταξύ συσκευών</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Συγχρονισμός καρτών</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Προσθήκη πιστωτικής κάρτας</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Προσθήκη πιστωτικής κάρτας</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Προσθήκη κάρτας</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Προσθήκη κάρτας</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Διαχείριση αποθηκευμένων καρτών</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Διαχείριση αποθηκευμένων καρτών</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Διαχείριση καρτών</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Διαχείριση καρτών</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Προσθήκη διεύθυνσης</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Διαχείριση διευθύνσεων</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Αποθήκευση και αυτόματη συμπλήρωση διευθύνσεων</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Αποθήκευση και αυτόματη συμπλήρωση διευθύνσεων</string>
 
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Αποθήκευση και συμπλήρωση διευθύνσεων</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Αποθήκευση και συμπλήρωση διευθύνσεων</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Συμπεριλάβετε πληροφορίες, όπως αριθμούς, email και διευθύνσεις αποστολής</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Συμπεριλάβετε πληροφορίες, όπως αριθμούς, email και διευθύνσεις αποστολής</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Περιλαμβάνει αριθμούς τηλεφώνου και διευθύνσεις email</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Περιλαμβάνει αριθμούς τηλεφώνου και διευθύνσεις email</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Προσθήκη κάρτας</string>
@@ -1867,9 +1882,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Διαγραφή κάρτας</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Θέλετε σίγουρα να διαγράψετε αυτήν την πιστωτική κάρτα;</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Θέλετε σίγουρα να διαγράψετε αυτήν την πιστωτική κάρτα;</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Διαγραφή κάρτας;</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Διαγραφή κάρτας;</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Διαγραφή</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1883,24 +1898,24 @@
     <string name="credit_cards_saved_cards">Αποθηκευμένες κάρτες</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Παρακαλώ εισαγάγετε έναν έγκυρο αριθμό πιστωτικής κάρτας</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Παρακαλώ εισαγάγετε έναν έγκυρο αριθμό πιστωτικής κάρτας</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Εισαγάγετε έγκυρο αριθμό κάρτας</string>
+    <string name="credit_cards_number_validation_error_message_2">Εισαγάγετε έγκυρο αριθμό κάρτας</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Παρακαλώ συμπληρώστε αυτό το πεδίο</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Παρακαλώ συμπληρώστε αυτό το πεδίο</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Προσθήκη ονόματος</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Προσθήκη ονόματος</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Ξεκλειδώστε για να δείτε τις αποθηκευμένες κάρτες σας</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Ασφαλίστε τις πιστωτικές κάρτες σας</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Ασφαλίστε τις πιστωτικές κάρτες σας</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Προστασία των αποθηκευμένων μεθόδων πληρωμής σας</string>
+    <string name="credit_cards_warning_dialog_title_2">Προστασία των αποθηκευμένων μεθόδων πληρωμής σας</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Ορίστε ένα μοτίβο κλειδώματος συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για την προστασία των αποθηκευμένων πιστωτικών καρτών σας, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ορίστε ένα μοτίβο κλειδώματος συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για την προστασία των αποθηκευμένων πιστωτικών καρτών σας, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Ορίστε ένα μοτίβο κλειδώματος της συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για την προστασία των αποθηκευμένων καρτών σας, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
+    <string name="credit_cards_warning_dialog_message_3">Ορίστε ένα μοτίβο κλειδώματος της συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για την προστασία των αποθηκευμένων καρτών σας, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Ρύθμιση τώρα</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1909,10 +1924,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Ξεκλειδώστε τη συσκευή σας</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Ξεκλειδώστε για χρήση των στοιχείων πιστωτικής κάρτας</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ξεκλειδώστε για χρήση των στοιχείων πιστωτικής κάρτας</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Ξεκλειδώστε για χρήση των αποθηκευμένων μεθόδων πληρωμής</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Ξεκλειδώστε για χρήση των αποθηκευμένων μεθόδων πληρωμής</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Προσθήκη διεύθυνσης</string>
     <!-- Title of the "Edit address" screen -->
@@ -1920,11 +1935,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Διαχείριση διευθύνσεων</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Όνομα</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Όνομα</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Μεσαίο όνομα</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Μεσαίο όνομα</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Επώνυμο</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Επώνυμο</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Όνομα</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Διεύθυνση</string>
     <!-- The header for the city of an address -->
@@ -1949,9 +1966,9 @@
     <string name="addressess_delete_address_button">Διαγραφή διεύθυνσης</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Θέλετε σίγουρα να διαγράψετε αυτήν τη διεύθυνση;</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Θέλετε σίγουρα να διαγράψετε αυτήν τη διεύθυνση;</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Διαγραφή διεύθυνσης;</string>
+    <string name="addressess_confirm_dialog_message_2">Διαγραφή διεύθυνσης;</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Διαγραφή</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2052,49 +2069,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Επεξεργασία</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Θέλετε σίγουρα να διαγράψετε αυτή τη σύνδεση;</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Θέλετε σίγουρα να διαγράψετε αυτή τη σύνδεση;</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Θέλετε σίγουρα να διαγράψετε αυτόν τον κωδικό πρόσβασης;</string>
+    <string name="login_deletion_confirmation_2">Θέλετε σίγουρα να διαγράψετε αυτόν τον κωδικό πρόσβασης;</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Διαγραφή</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Ακύρωση</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Επιλογές σύνδεσης</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Επιλογές σύνδεσης</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Επιλογές κωδικών πρόσβασης</string>
+    <string name="login_options_menu_2">Επιλογές κωδικών πρόσβασης</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Το επεξεργάσιμο πεδίο κειμένου της διεύθυνσης ιστού της σύνδεσης.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Το επεξεργάσιμο πεδίο κειμένου της διεύθυνσης ιστού της σύνδεσης.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Το επεξεργάσιμο πεδίο κειμένου της διεύθυνσης ιστοτόπου.</string>
+    <string name="saved_login_hostname_description_3">Το επεξεργάσιμο πεδίο κειμένου της διεύθυνσης ιστοτόπου.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Το επεξεργάσιμο πεδίο κειμένου για το όνομα χρήστη της σύνδεσης.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Το επεξεργάσιμο πεδίο κειμένου για το όνομα χρήστη της σύνδεσης.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Το επεξεργάσιμο πεδίο κειμένου για το όνομα χρήστη.</string>
+    <string name="saved_login_username_description_3">Το επεξεργάσιμο πεδίο κειμένου για το όνομα χρήστη.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Το επεξεργάσιμο πεδίο κειμένου για τον κωδικό πρόσβασης της σύνδεσης.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Το επεξεργάσιμο πεδίο κειμένου για τον κωδικό πρόσβασης της σύνδεσης.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Το επεξεργάσιμο πεδίο κειμένου για τον κωδικό πρόσβασης.</string>
+    <string name="saved_login_password_description_2">Το επεξεργάσιμο πεδίο κειμένου για τον κωδικό πρόσβασης.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Αποθήκευση αλλαγών στη σύνδεση.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Αποθήκευση αλλαγών στη σύνδεση.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Αποθήκευση αλλαγών.</string>
+    <string name="save_changes_to_login_2">Αποθήκευση αλλαγών.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Επεξεργασία</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Επεξεργασία</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Επεξεργασία κωδικού πρόσβασης</string>
+    <string name="edit_2">Επεξεργασία κωδικού πρόσβασης</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Προσθήκη νέας σύνδεσης</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Προσθήκη νέας σύνδεσης</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Προσθήκη κωδικού πρόσβασης</string>
+    <string name="add_login_2">Προσθήκη κωδικού πρόσβασης</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Απαιτείται κωδικός πρόσβασης</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Απαιτείται κωδικός πρόσβασης</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Εισαγάγετε έναν κωδικό πρόσβασης</string>
+    <string name="saved_login_password_required_2">Εισαγάγετε έναν κωδικό πρόσβασης</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Απαιτείται όνομα χρήστη</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Απαιτείται όνομα χρήστη</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Εισαγάγετε ένα όνομα χρήστη</string>
+    <string name="saved_login_username_required_2">Εισαγάγετε ένα όνομα χρήστη</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Απαιτείται όνομα κεντρικού υπολογιστή</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2207,7 +2224,7 @@
     <string name="radio_preference_info_content_description">Πατήστε για περισσότερες λεπτομέρειες</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Πλοήγηση προς τα πάνω</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Πλοήγηση προς τα πάνω</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Κλείσιμο</string>
@@ -2248,8 +2265,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Αναπροσαρμοσμένη βαθμολογία</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Οι αναξιόπιστες κριτικές αφαιρέθηκαν</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Με βάση αξιόπιστες κριτικές</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Σημαντικά σημεία από πρόσφατες κριτικές</string>
@@ -2305,10 +2320,6 @@
     <string name="review_quality_check_product_availability_warning_body">Εάν παρατηρήσετε ότι αυτό το προϊόν είναι ξανά σε απόθεμα, αναφέρετέ το σε μας και θα αρχίσουμε τον έλεγχο των κριτικών.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Αναφέρετε ότι το προϊόν είναι σε απόθεμα</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Έλεγχος ποιότητας κριτικής</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Έλεγχος ποιότητας κριτικής</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Έλεγχος ποιότητας κριτικής (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2354,13 +2365,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Μάθετε περισσότερα</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Επιλέγοντας «Έναρξη δοκιμής», αποδέχεστε την %2$s και τους %3$s του %1$s, που παρέχεται από τη Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Επιλέγοντας «Έναρξη δοκιμής», αποδέχεστε την %2$s και τους %3$s του %1$s, που παρέχεται από τη Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Επιλέγοντας «Έναρξη δοκιμής», συμφωνείτε με τα ακόλουθα από το %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Επιλέγοντας «Έναρξη δοκιμής», αποδέχεστε τη %2$s του %1$s και τους %4$s του %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Επιλέγοντας «Έναρξη δοκιμής», αποδέχεστε τη %2$s του %1$s και τους %4$s του %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">πολιτική απορρήτου</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">πολιτική απορρήτου</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Πολιτική απορρήτου</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">σημείωση απορρήτου</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">όρους χρήσης</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2432,6 +2449,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Μετάφραση σελίδας;</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Η σελίδα μεταφράστηκε από τα %1$s στα %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Ιδιωτικές μεταφράσεις στο %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2444,6 +2465,8 @@
     <string name="translations_bottom_sheet_translate_to">Μετάφραση σε</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Όχι τώρα</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Εμφάνιση πρωτότυπου</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Τέλος</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2466,6 +2489,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Μάθετε περισσότερα</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Μετάφραση…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Επιλογές μετάφρασης</string>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 7f37c4523..ac6f9be87 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -252,6 +252,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Translate page</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Page translated from %1$s to %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Selected language</string>
@@ -329,12 +334,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox privacy notice</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Learn more in our privacy notice</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">We love keeping you safe</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Find out why millions love Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Safe browsing with more choices</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Our non-profit backed browser helps stop companies from secretly following you around the web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">More than 100 million people protect their privacy by choosing a browser that’s backed by a nonprofit.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Known trackers? Blocked automatically. Extensions? Try all 700. PDFs? Our built-in reader makes them easy to manage.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Our non-profit backed browser helps stop companies from secretly following you around the web.\n\nLearn more in our privacy notice.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -688,9 +703,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Bookmarks</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Logins</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Logins</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Passwords</string>
+    <string name="preferences_sync_logins_2">Passwords</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Open tabs</string>
     <!-- Preference for signing out -->
@@ -716,9 +731,9 @@
     <string name="default_device_name_2">%1$s on %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Credit cards</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Credit cards</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Payment methods</string>
+    <string name="preferences_sync_credit_cards_2">Payment methods</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Addresses</string>
 
@@ -1653,13 +1668,13 @@
     <string name="add_to_homescreen_description_2">You can easily add this web site to your device’s Home screen to have instant access and browse faster with an app-like experience.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Logins and passwords</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Logins and passwords</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Passwords</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Passwords</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Save logins and passwords</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Save logins and passwords</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Save passwords</string>
+    <string name="preferences_passwords_save_logins_2">Save passwords</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Ask to save</string>
 
@@ -1675,48 +1690,48 @@
     <string name="preferences_android_autofill_description">Fill usernames and passwords in other apps on your device.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Add login</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Add login</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Add password</string>
+    <string name="preferences_logins_add_login_2">Add password</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Synchronise logins</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synchronise passwords</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Synchronise logins</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Synchronise passwords</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Synchronise logins across devices</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Synchronise logins across devices</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synchronise passwords across devices</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Synchronise passwords across devices</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Saved logins</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Saved logins</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Saved passwords</string>
+    <string name="preferences_passwords_saved_logins_2">Saved passwords</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">The logins you save or synchronise to %s will show up here.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">The logins you save or synchronise to %s will show up here.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">The passwords you save or synchronise to %s will be listed here. All passwords you save are encrypted.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">The passwords you save or synchronise to %s will be listed here. All passwords you save are encrypted.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Learn more about Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Learn more about Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Learn more about Sync</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Learn more about Sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Exceptions</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Logins and passwords that are not saved will be shown here.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Logins and passwords that are not saved will be shown here.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s won’t save passwords for sites listed here.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s won’t save passwords for sites listed here.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Logins and passwords will not be saved for these sites.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Logins and passwords will not be saved for these sites.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s won’t save passwords for these sites.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s won’t save passwords for these sites.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Delete all exceptions</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Search logins</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Search logins</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Search passwords</string>
+    <string name="preferences_passwords_saved_logins_search_2">Search passwords</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Site</string>
     <!-- The header for the username for a login -->
@@ -1744,17 +1759,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Hide password</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Unlock to view your saved logins</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Unlock to view your saved logins</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Unlock to view your saved passwords</string>
+    <string name="logins_biometric_prompt_message_2">Unlock to view your saved passwords</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Secure your logins and passwords</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Secure your logins and passwords</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Secure your saved passwords</string>
+    <string name="logins_warning_dialog_title_2">Secure your saved passwords</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Set up a device lock pattern, PIN, or password to protect your saved logins and passwords from being accessed if someone else has your device.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Set up a device lock pattern, PIN, or password to protect your saved logins and passwords from being accessed if someone else has your device.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Set up a device lock pattern, PIN, or password to protect your saved passwords from being accessed if someone else has your device.</string>
+    <string name="logins_warning_dialog_message_2">Set up a device lock pattern, PIN, or password to protect your saved passwords from being accessed if someone else has your device.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Later</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1771,10 +1786,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Last used</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sort logins menu</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Sort logins menu</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Sort passwords menu</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Sort passwords menu</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1782,43 +1797,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Addresses</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Credit cards</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Credit cards</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Payment methods</string>
+    <string name="preferences_credit_cards_2">Payment methods</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Save and autofill cards</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Save and autofill cards</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Save and fill payment methods</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Save and fill payment methods</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data is encrypted</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Data is encrypted</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s encrypts all payment methods you save</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s encrypts all payment methods you save</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synchronise cards across devices</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Synchronise cards</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Add credit card</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Add credit card</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Add card</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Add card</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Manage saved cards</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Manage saved cards</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Manage cards</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Manage cards</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Add address</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Manage addresses</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Save and autofill addresses</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Save and autofill addresses</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Save and fill addresses</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Save and fill addresses</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Include information like numbers, email and shipping addresses</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Include information like numbers, email and shipping addresses</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Includes phone numbers and email addresses</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Includes phone numbers and email addresses</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Add card</string>
@@ -1839,9 +1854,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Delete card</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Are you sure you want to delete this credit card?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Are you sure you want to delete this credit card?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Delete card?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Delete card?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Delete</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1855,24 +1870,24 @@
     <string name="credit_cards_saved_cards">Saved cards</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Please enter a valid credit card number</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Please enter a valid credit card number</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Enter a valid card number</string>
+    <string name="credit_cards_number_validation_error_message_2">Enter a valid card number</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Please fill out this field</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Please fill out this field</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Add a name</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Add a name</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Unlock to view your saved cards</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Secure your credit cards</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Secure your credit cards</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Secure your saved payment methods</string>
+    <string name="credit_cards_warning_dialog_title_2">Secure your saved payment methods</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Set up a device lock pattern, PIN, or password to protect your saved credit cards from being accessed if someone else has your device.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Set up a device lock pattern, PIN, or password to protect your saved credit cards from being accessed if someone else has your device.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Set up a device lock pattern, PIN, or password to protect your saved payment methods from being accessed if someone else has your device.</string>
+    <string name="credit_cards_warning_dialog_message_3">Set up a device lock pattern, PIN, or password to protect your saved payment methods from being accessed if someone else has your device.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Set up now</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1880,10 +1895,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Unlock your device</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Unlock to use stored credit card information</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Unlock to use stored credit card information</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Unlock to use saved payment methods</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Unlock to use saved payment methods</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Add address</string>
     <!-- Title of the "Edit address" screen -->
@@ -1891,11 +1906,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Manage addresses</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">First Name</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">First Name</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Middle Name</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Middle Name</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Last Name</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Last Name</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Name</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Street Address</string>
     <!-- The header for the city of an address -->
@@ -1920,9 +1937,9 @@
     <string name="addressess_delete_address_button">Delete address</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Are you sure you want to delete this address?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Are you sure you want to delete this address?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Delete this address?</string>
+    <string name="addressess_confirm_dialog_message_2">Delete this address?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Delete</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2020,49 +2037,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Edit</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Are you sure you want to delete this login?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Are you sure you want to delete this login?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Are you sure you want to delete this password?</string>
+    <string name="login_deletion_confirmation_2">Are you sure you want to delete this password?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Delete</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancel</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Login options</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Login options</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Password options</string>
+    <string name="login_options_menu_2">Password options</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">The editable text field for the web address of the login.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">The editable text field for the web address of the login.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">The editable text field for the web site address.</string>
+    <string name="saved_login_hostname_description_3">The editable text field for the web site address.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">The editable text field for the username of the login.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">The editable text field for the username of the login.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">The editable text field for the username.</string>
+    <string name="saved_login_username_description_3">The editable text field for the username.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">The editable text field for the password of the login.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">The editable text field for the password of the login.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">The editable text field for the password.</string>
+    <string name="saved_login_password_description_2">The editable text field for the password.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Save changes to login.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Save changes to login.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Save changes.</string>
+    <string name="save_changes_to_login_2">Save changes.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Edit</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Edit</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Edit password</string>
+    <string name="edit_2">Edit password</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Add new login</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Add new login</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Add password</string>
+    <string name="add_login_2">Add password</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Password required</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Password required</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Enter a password</string>
+    <string name="saved_login_password_required_2">Enter a password</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Username required</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Username required</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Enter a username</string>
+    <string name="saved_login_username_required_2">Enter a username</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hostname required</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2174,7 +2191,7 @@
     <string name="radio_preference_info_content_description">Click for more details</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Navigate up</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Navigate up</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Close</string>
@@ -2215,8 +2232,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Adjusted rating</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Unreliable reviews removed</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Based on reliable reviews</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Highlights from recent reviews</string>
@@ -2272,10 +2287,6 @@
     <string name="review_quality_check_product_availability_warning_body">If you see this product is back in stock, report it and we’ll work on checking the reviews.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Report product is in stock</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Checking review quality</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Checking review quality</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Checking review quality (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2321,13 +2332,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Learn more</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">By selecting “Yes, try it” you agree to %1$s by Mozilla’s %2$s and %3$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">By selecting “Yes, try it” you agree to %1$s by Mozilla’s %2$s and %3$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">By selecting “Yes, try it” you agree to the following from %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">By selecting “Yes, try it” you agree to %1$s’s %2$s and %3$s’s %4$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">By selecting “Yes, try it” you agree to %1$s’s %2$s and %3$s’s %4$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">privacy policy</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">privacy policy</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Privacy policy</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">privacy notice</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">terms of use</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2398,6 +2415,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Translate this page?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Page translated from %1$s to %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Try private translations in %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2410,6 +2431,8 @@
     <string name="translations_bottom_sheet_translate_to">Translate to</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Not now</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Show original</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Done</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2432,6 +2455,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Learn more</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Translating…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Translation Options</string>
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 68be82b68..13f63ac35 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -257,6 +257,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Traducir página</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Página traducida de %1$s a %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Idioma seleccionado</string>
@@ -338,12 +343,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Aviso de privacidad de Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Conocé más en nuestra nota de privacidad</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Nos encanta mantenerte seguro</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Descubrí por qué millones aman Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Navegación segura con más opciones</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Nuestro navegador respaldado sin fines de lucro ayuda a evitar que las empresas te sigan en secreto por la web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Más de 100 millones de personas protegen su privacidad eligiendo un navegador respaldado por una organización sin fines de lucro.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">¿Rastreadores conocidos? Bloqueados automáticamente. Extensiones? Probá las 700. ¿PDFs? Nuestro lector incorporado los hace fáciles de administrar.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Nuestro navegador respaldado sin fines de lucro ayuda a evitar que las empresas te sigan en secreto por la web.\n\nMás información en nuestro aviso de privacidad.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -697,9 +712,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Marcadores</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Inicios de sesión</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Inicios de sesión</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Contraseñas</string>
+    <string name="preferences_sync_logins_2">Contraseñas</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Pestañas abiertas</string>
     <!-- Preference for signing out -->
@@ -727,9 +742,9 @@
     <string name="default_device_name_2">%1$s en %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Tarjetas de crédito</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Tarjetas de crédito</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
+    <string name="preferences_sync_credit_cards_2">Métodos de pago</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Direcciones</string>
 
@@ -1685,13 +1700,13 @@
     <string name="add_to_homescreen_description_2">Podés agregar este sitio a la pantalla de inicio del dispositivo fácilmente para tener acceso instantáneo y navegar más rápido con una experiencia similar a la de una aplicación.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Inicios de sesión y contraseñas</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Inicios de sesión y contraseñas</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Contraseñas</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Contraseñas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Guardar inicios de sesión y contraseñas</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar inicios de sesión y contraseñas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Guardar contraseñas</string>
+    <string name="preferences_passwords_save_logins_2">Guardar contraseñas</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Solicitar guardar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1706,47 +1721,47 @@
     <string name="preferences_android_autofill_description">Completar nombres de usuario y contraseñas en otras aplicaciones de tu dispositivo.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Agregar inicio de sesión</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Agregar inicio de sesión</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Agregar contraseña</string>
+    <string name="preferences_logins_add_login_2">Agregar contraseña</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sincronizar inicios de sesión</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizar contraseñas</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizar inicios de sesión</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Sincronizar contraseñas</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sincronizar inicios de sesión entre dispositivos</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizar inicios de sesión entre dispositivos</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronizar contraseñas entre dispositivos</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Sincronizar contraseñas entre dispositivos</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Inicios de sesión guardados</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Inicios de sesión guardados</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Contraseñas guardadas</string>
+    <string name="preferences_passwords_saved_logins_2">Contraseñas guardadas</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Aquí se van a ver los inicios de sesión que guardes o sincronices con %s.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Aquí se van a ver los inicios de sesión que guardes o sincronices con %s.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Las contraseñas que guardés o sincronicés con %s aparecerán acá. Todas las contraseñas que guardés están encriptadas.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Las contraseñas que guardés o sincronicés con %s aparecerán acá. Todas las contraseñas que guardés están encriptadas.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Conocé más acerca de Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Conocé más acerca de Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Conocé más acerca de la sincronización</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Conocé más acerca de la sincronización</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Excepciones</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Los inicios de sesión y las contraseñas que no se guardan se mostrarán aquí.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Los inicios de sesión y las contraseñas que no se guardan se mostrarán aquí.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s no guardará las contraseñas de los sitios listados acá.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s no guardará las contraseñas de los sitios listados acá.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Los inicios de sesión y las contraseñas no se van a guardar para estos sitios.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Los inicios de sesión y las contraseñas no se van a guardar para estos sitios.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s no guardará las contraseñas de estos sitios.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s no guardará las contraseñas de estos sitios.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eliminar todas las excepciones</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Buscar inicios de sesión</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Buscar inicios de sesión</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Buscar contraseñas</string>
+    <string name="preferences_passwords_saved_logins_search_2">Buscar contraseñas</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sitio</string>
     <!-- The header for the username for a login -->
@@ -1774,17 +1789,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Ocultar contraseña</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Desbloqueá para ver tus inicios de sesión guardados</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloqueá para ver tus inicios de sesión guardados</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desbloqueá para ver las contraseñas guardadas</string>
+    <string name="logins_biometric_prompt_message_2">Desbloqueá para ver las contraseñas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Asegurá inicios de sesión y contraseñas</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Asegurá inicios de sesión y contraseñas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Asegurá tus contraseñas guardadas</string>
+    <string name="logins_warning_dialog_title_2">Asegurá tus contraseñas guardadas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Configurá un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus inicios de sesión y contraseñas guardadas por si alguien más tiene tu dispositivo.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configurá un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus inicios de sesión y contraseñas guardadas por si alguien más tiene tu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Configurá un patrón de bloqueo del dispositivo, PIN o contraseña para proteger el acceso a tus contraseñas guardadas si alguien más tiene tu dispositivo.</string>
+    <string name="logins_warning_dialog_message_2">Configurá un patrón de bloqueo del dispositivo, PIN o contraseña para proteger el acceso a tus contraseñas guardadas si alguien más tiene tu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Más tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1801,10 +1816,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Usado por última vez</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordenar menú de inicio de sesión</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ordenar menú de inicio de sesión</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menú ordenar contraseñas</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menú ordenar contraseñas</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1812,43 +1827,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Direcciones</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Tarjetas de crédito</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Tarjetas de crédito</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
+    <string name="preferences_credit_cards_2">Métodos de pago</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Guardar y autocompletar tarjetas</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar y autocompletar tarjetas</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Guardar y completar métodos de pago</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Guardar y completar métodos de pago</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Los datos están cifrados</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Los datos están cifrados</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s cifra todos los métodos de pago guardados</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s cifra todos los métodos de pago guardados</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar tarjetas entre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sincronizar tarjetas</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Agregar tarjeta de crédito</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Agregar tarjeta de crédito</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Agregar tarjeta</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Agregar tarjeta</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Administrar tarjetas guardadas</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Administrar tarjetas guardadas</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Administrar tarjetas</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Administrar tarjetas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Agregar dirección</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Administrar direcciones</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Guardar y autocompletar direcciones</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar y autocompletar direcciones</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Guardar y completar direcciones</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Guardar y completar direcciones</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Incluir información como números, correos electrónicos y direcciones de envíos</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Incluir información como números, correos electrónicos y direcciones de envíos</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Incluye números de teléfono y direcciones de correo electrónico</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Incluye números de teléfono y direcciones de correo electrónico</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Agregar tarjeta</string>
@@ -1869,9 +1884,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Borrar tarjeta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">¿Estás seguro de querer borrar esta tarjeta de crédito?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">¿Estás seguro de querer borrar esta tarjeta de crédito?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">¿Borrar tarjeta?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">¿Borrar tarjeta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Borrar</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1885,25 +1900,25 @@
     <string name="credit_cards_saved_cards">Tarjetas guardadas</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Ingresá un número de tarjeta de crédito válido</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ingresá un número de tarjeta de crédito válido</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Ingresá un número de tarjeta válido</string>
+    <string name="credit_cards_number_validation_error_message_2">Ingresá un número de tarjeta válido</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Se debe completar este campo</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Se debe completar este campo</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Agregar un nombre</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Agregar un nombre</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloqueá para ver las tarjetas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Asegurá tus tarjetas de crédito</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Asegurá tus tarjetas de crédito</string>
 
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Asegurá tus métodos de pago guardados</string>
+    <string name="credit_cards_warning_dialog_title_2">Asegurá tus métodos de pago guardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Configurá un patrón de bloqueo del dispositivo, PIN o contraseña para proteger el acceso a tus tarjetas de crédito guardadas si alguien más tiene tu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configurá un patrón de bloqueo del dispositivo, PIN o contraseña para proteger el acceso a tus tarjetas de crédito guardadas si alguien más tiene tu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Configurá un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus métodos de pago guardados por si otra persona accede a tu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message_3">Configurá un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus métodos de pago guardados por si otra persona accede a tu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1912,10 +1927,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Desbloqueá tu dispositivo</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Desbloquear para usar la información almacenada de la tarjeta de crédito</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquear para usar la información almacenada de la tarjeta de crédito</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desbloquear para usar los métodos de pago guardados</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Desbloquear para usar los métodos de pago guardados</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Agregar dirección</string>
     <!-- Title of the "Edit address" screen -->
@@ -1923,11 +1938,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Administrar direcciones</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Primer Nombre</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Primer Nombre</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Segundo nombre</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Segundo nombre</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Apellido</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Apellido</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nombre</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Dirección</string>
     <!-- The header for the city of an address -->
@@ -1952,9 +1969,9 @@
     <string name="addressess_delete_address_button">Borrar dirección</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">¿Estás seguro de querer borrar esta dirección?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">¿Estás seguro de querer borrar esta dirección?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">¿Borrar esta dirección?</string>
+    <string name="addressess_confirm_dialog_message_2">¿Borrar esta dirección?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Borrar</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2054,49 +2071,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Editar</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">¿Estás seguro de que querés eliminar este inicio de sesión?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">¿Estás seguro de que querés eliminar este inicio de sesión?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">¿Estás seguro de que querés eliminar esta contraseña?</string>
+    <string name="login_deletion_confirmation_2">¿Estás seguro de que querés eliminar esta contraseña?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Eliminar</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancelar</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Opciones de inicio de sesión</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Opciones de inicio de sesión</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opciones de contraseña</string>
+    <string name="login_options_menu_2">Opciones de contraseña</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">El campo de texto editable para la dirección web del inicio de sesión.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">El campo de texto editable para la dirección web del inicio de sesión.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">El campo de texto editable para la dirección del sitio web.</string>
+    <string name="saved_login_hostname_description_3">El campo de texto editable para la dirección del sitio web.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">El campo de texto editable para el nombre de usuario del inicio de sesión.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario del inicio de sesión.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario.</string>
+    <string name="saved_login_username_description_3">El campo de texto editable para el nombre de usuario.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">El campo de texto editable para la contraseña del inicio de sesión.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">El campo de texto editable para la contraseña del inicio de sesión.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">El campo de texto editable para la contraseña.</string>
+    <string name="saved_login_password_description_2">El campo de texto editable para la contraseña.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Guardar cambios para el inicio de sesión.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar cambios para el inicio de sesión.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Guardar cambios.</string>
+    <string name="save_changes_to_login_2">Guardar cambios.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Editar</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Editar</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Editar contraseña</string>
+    <string name="edit_2">Editar contraseña</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Agregar nuevo inicio de sesión</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Agregar nuevo inicio de sesión</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Agregar contraseña</string>
+    <string name="add_login_2">Agregar contraseña</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Se necesita contraseña</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Se necesita contraseña</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Ingresar una contraseña</string>
+    <string name="saved_login_password_required_2">Ingresar una contraseña</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Se requiere nombre de usuario</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Se requiere nombre de usuario</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Ingresar un nombre de usuario</string>
+    <string name="saved_login_username_required_2">Ingresar un nombre de usuario</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Se requiere nombre de host</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2210,7 +2227,7 @@
     <string name="radio_preference_info_content_description">Hacer clic aquí para más detalles</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Navegar hacia arriba</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Navegar hacia arriba</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Cerrar</string>
@@ -2251,8 +2268,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Calificación ajustada</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Revisiones no confiables eliminadas</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Basado en revisiones confiables</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Destacados de revisiones recientes</string>
@@ -2308,10 +2323,6 @@
     <string name="review_quality_check_product_availability_warning_body">Si ves que este producto está nuevamente en stock, informanos y trabajaremos en verificar las revisiones.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Informar que el producto está en stock</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Verificando la calidad de la revisión</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Verificando la calidad de la revisión</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Verificando la calidad de la revisión (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2357,13 +2368,15 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Conocer más</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Al seleccionar “Si, probarlo” Estás de acuerdo con %1$s de Mozilla %2$s y %3$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Al seleccionar “Si, probarlo” Estás de acuerdo con %1$s de Mozilla %2$s y %3$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Al seleccionar “Sí, probarlo” aceptás lo siguiente de %1$s:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">política de privacidad</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">política de privacidad</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Política de privacidad</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">nota de privacidad</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">términos de uso</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2434,6 +2447,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">¿Traducir esta página?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Página traducida de %1$s a %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Probar traducciones privadas en %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2446,6 +2463,8 @@
     <string name="translations_bottom_sheet_translate_to">Traducir a</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">No ahora</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Mostrar el original</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Listo</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2468,6 +2487,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Conocer más</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Traduciendo…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opciones de traducción</string>
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index db20b1724..0b24998b0 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -253,6 +253,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Traducir página</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Página traducida de %1$s a %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Idioma seleccionado</string>
@@ -330,12 +335,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Aviso de privacidad de Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Aprende más en nuestra política de privacidad</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Nos encanta mantenerte a salvo</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Averigua por qué millones de personas aman Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Navegación segura con más opciones</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Nuestro navegador respaldado por una organización sin fines de lucro ayuda a evitar que las empresas te sigan en secreto por la web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Más de 100 millones de personas protegen su privacidad eligiendo un navegador respaldado por una organización sin fines de lucro.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">¿Rastreadores conocidos? Bloqueados automáticamente. ¿Extensiones? Prueba las 700. ¿PDF? Nuestro lector incorporado los hace fáciles de administrar.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Nuestro navegador respaldado por una organización sin fines de lucro ayuda a evitar que las empresas te sigan en secreto en la web.\n\nObtén más información en nuestro aviso de privacidad.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -690,9 +705,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Marcadores</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Credenciales</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Credenciales</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Contraseñas</string>
+    <string name="preferences_sync_logins_2">Contraseñas</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Pestañas abiertas</string>
     <!-- Preference for signing out -->
@@ -718,9 +733,9 @@
     <string name="default_device_name_2">%1$s en %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Tarjetas de crédito</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Tarjetas de crédito</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
+    <string name="preferences_sync_credit_cards_2">Métodos de pago</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Direcciones</string>
 
@@ -1658,13 +1673,13 @@
     <string name="add_to_homescreen_description_2">Puedes añadir fácilmente este sitio web a tu pantalla de inicio de tu dispositivo para tener acceso instantáneo y navegar rápidamente, consiguiendo una experiencia similar a la de una aplicación real.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Credenciales y contraseñas</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Credenciales y contraseñas</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Contraseñas</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Contraseñas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Guardar credenciales y contraseñas</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar credenciales y contraseñas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Guardar contraseñas</string>
+    <string name="preferences_passwords_save_logins_2">Guardar contraseñas</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Preguntar si guardar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1679,48 +1694,48 @@
     <string name="preferences_android_autofill_description">Completa los nombres de usuario y contraseñas en otras aplicaciones de tu dispositivo.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Añadir conexión</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Añadir conexión</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Añadir contraseña</string>
+    <string name="preferences_logins_add_login_2">Añadir contraseña</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sincronizar credenciales</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizar contraseñas</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizar credenciales</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Sincronizar contraseñas</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sincronizar credenciales en todos los dispositivos</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizar credenciales en todos los dispositivos</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronizar contraseñas entre dispositivos</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Sincronizar contraseñas entre dispositivos</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Credenciales guardadas</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Credenciales guardadas</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Contraseñas guardadas</string>
+    <string name="preferences_passwords_saved_logins_2">Contraseñas guardadas</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Las credenciales que guardas o sincronizas con %s serán mostradas aquí.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Las credenciales que guardas o sincronizas con %s serán mostradas aquí.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Las contraseñas que guardes o sincronices con %s aparecerán aquí. Todas las contraseñas que guardes quedan cifradas.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Las contraseñas que guardes o sincronices con %s aparecerán aquí. Todas las contraseñas que guardes quedan cifradas.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Aprender más acerca de Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Aprender más acerca de Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Aprende más acerca de la sincronización</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Aprende más acerca de la sincronización</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Excepciones</string>
 
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Las credenciales y contraseñas que no son guardadas serán mostradas aquí.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Las credenciales y contraseñas que no son guardadas serán mostradas aquí.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s no guardará las contraseñas de los sitios listados aquí.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s no guardará las contraseñas de los sitios listados aquí.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Las credenciales y contraseñas no serán guardadas para estos sitios.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Las credenciales y contraseñas no serán guardadas para estos sitios.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s no guardará las contraseñas para estos sitios.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s no guardará las contraseñas para estos sitios.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eliminar todas las excepciones</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Buscar credenciales</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Buscar credenciales</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Buscar contraseñas</string>
+    <string name="preferences_passwords_saved_logins_search_2">Buscar contraseñas</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sitio</string>
     <!-- The header for the username for a login -->
@@ -1748,17 +1763,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Ocultar contraseña</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Desbloquea para ver tus credenciales guardadas</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquea para ver tus credenciales guardadas</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desbloquea para ver tus contraseñas guardadas</string>
+    <string name="logins_biometric_prompt_message_2">Desbloquea para ver tus contraseñas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Asegura tus credenciales y contraseñas</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Asegura tus credenciales y contraseñas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Asegura tus contraseñas guardadas</string>
+    <string name="logins_warning_dialog_title_2">Asegura tus contraseñas guardadas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus credenciales y contraseñas guardadas, y así no sean accedidas si alguien más tiene tu dispositivo.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus credenciales y contraseñas guardadas, y así no sean accedidas si alguien más tiene tu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus contraseñas guardadas, y así no sean accedidas si alguien más tiene tu dispositivo.</string>
+    <string name="logins_warning_dialog_message_2">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus contraseñas guardadas, y así no sean accedidas si alguien más tiene tu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Más tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1776,10 +1791,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Último uso</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menú para ordenar credenciales</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Menú para ordenar credenciales</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menú ordenar contraseñas</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menú ordenar contraseñas</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1787,43 +1802,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Direcciones</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Tarjetas de crédito</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Tarjetas de crédito</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
+    <string name="preferences_credit_cards_2">Métodos de pago</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Guardar y autocompletar tarjetas</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar y autocompletar tarjetas</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Guardar y completar métodos de pago</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Guardar y completar métodos de pago</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Los datos están encriptados</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Los datos están encriptados</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s cifra todos los métodos de pago que guardas</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s cifra todos los métodos de pago que guardas</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar tarjetas entre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sincronizar tarjetas</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Añadir tarjeta de crédito</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Añadir tarjeta de crédito</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Añadir tarjeta</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Añadir tarjeta</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Gestionar tarjetas guardadas</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Gestionar tarjetas guardadas</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gestionar tarjetas</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Gestionar tarjetas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Añadir dirección</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Administrar direcciones</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Guardar y autocompletar direcciones</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar y autocompletar direcciones</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Guardar y completar direcciones</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Guardar y completar direcciones</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Incluye información como números, correos electrónicos y direcciones</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Incluye información como números, correos electrónicos y direcciones</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Incluye números de teléfono y direcciones de correo electrónico</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Incluye números de teléfono y direcciones de correo electrónico</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Añadir tarjeta</string>
@@ -1844,9 +1859,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Eliminar tarjeta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">¿De verdad quieres eliminar esta tarjeta de crédito?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">¿De verdad quieres eliminar esta tarjeta de crédito?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">¿Eliminar tarjeta?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">¿Eliminar tarjeta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Eliminar</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1860,24 +1875,24 @@
     <string name="credit_cards_saved_cards">Tarjetas guardadas</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Por favor, ingresa un número de tarjeta de crédito válido</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Por favor, ingresa un número de tarjeta de crédito válido</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Ingresa un número de tarjeta válido</string>
+    <string name="credit_cards_number_validation_error_message_2">Ingresa un número de tarjeta válido</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Complete este campo</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Complete este campo</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Añadir un nombre</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Añadir un nombre</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloquea para ver tus tarjetas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Asegura tus tarjetas de crédito</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Asegura tus tarjetas de crédito</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Asegura tus métodos de pago guardados</string>
+    <string name="credit_cards_warning_dialog_title_2">Asegura tus métodos de pago guardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus tarjetas de crédito guardadas, y así no sean accedidas si alguien más tiene tu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus tarjetas de crédito guardadas, y así no sean accedidas si alguien más tiene tu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus métodos de pago guardados, y así no sean accedidos si alguien más tiene tu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message_3">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus métodos de pago guardados, y así no sean accedidos si alguien más tiene tu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1885,10 +1900,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Desbloquea tu dispositivo</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Desbloquea para usar información de la tarjeta de crédito almacenada</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquea para usar información de la tarjeta de crédito almacenada</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desbloquea para usar métodos de pago guardados</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Desbloquea para usar métodos de pago guardados</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Añadir dirección</string>
     <!-- Title of the "Edit address" screen -->
@@ -1896,11 +1911,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Administrar direcciones</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Primer nombre</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Primer nombre</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Segundo nombre</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Segundo nombre</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Apellidos</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Apellidos</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nombre</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Dirección</string>
     <!-- The header for the city of an address -->
@@ -1925,9 +1942,9 @@
     <string name="addressess_delete_address_button">Eliminar dirección</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">¿De verdad quieres eliminar esta dirección?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">¿De verdad quieres eliminar esta dirección?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">¿Eliminar esta dirección?</string>
+    <string name="addressess_confirm_dialog_message_2">¿Eliminar esta dirección?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Eliminar</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2025,49 +2042,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Editar</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">¿De verdad quieres eliminar esta conexión?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">¿De verdad quieres eliminar esta conexión?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">¿Estas seguro de eliminar esta contraseña?</string>
+    <string name="login_deletion_confirmation_2">¿Estas seguro de eliminar esta contraseña?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Eliminar</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancelar</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Opciones de credenciales</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Opciones de credenciales</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opciones de contraseña</string>
+    <string name="login_options_menu_2">Opciones de contraseña</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">El campo de texto editable para la dirección web de la credencial.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">El campo de texto editable para la dirección web de la credencial.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">El campo de texto editable para la dirección del sitio web.</string>
+    <string name="saved_login_hostname_description_3">El campo de texto editable para la dirección del sitio web.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">El campo de texto editable para el nombre de usuario de la credencial.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario de la credencial.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario.</string>
+    <string name="saved_login_username_description_3">El campo de texto editable para el nombre de usuario.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">El campo de texto editable para la contraseña de la credencial.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">El campo de texto editable para la contraseña de la credencial.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">El campo de texto editable para la contraseña.</string>
+    <string name="saved_login_password_description_2">El campo de texto editable para la contraseña.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Guardar cambios a la credencial.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar cambios a la credencial.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Guardar cambios.</string>
+    <string name="save_changes_to_login_2">Guardar cambios.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Editar</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Editar</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Editar contraseña</string>
+    <string name="edit_2">Editar contraseña</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Añadir nueva credencial</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Añadir nueva credencial</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Añadir contraseña</string>
+    <string name="add_login_2">Añadir contraseña</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Contraseña requerida</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Contraseña requerida</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Ingresar una contraseña</string>
+    <string name="saved_login_password_required_2">Ingresar una contraseña</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Nombre de usuario requerido</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Nombre de usuario requerido</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Ingresar un nombre de usuario</string>
+    <string name="saved_login_username_required_2">Ingresar un nombre de usuario</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Nombre de servidor requerido</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2179,7 +2196,7 @@
     <string name="radio_preference_info_content_description">Clic para más detalles</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Navegar hacia arriba</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Navegar hacia arriba</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Cerrar</string>
@@ -2220,8 +2237,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Calificación ajustada</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Se eliminaron las reseñas poco confiables</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Basado en revisiones confiables</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Aspectos destacados de reseñas recientes</string>
@@ -2278,10 +2293,6 @@
     <string name="review_quality_check_product_availability_warning_body">Si ves que este producto vuelve a estar disponible, infórmalo y trabajaremos para verificar las reseñas.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Informar que el producto está en stock</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Comprobando la calidad de la reseña</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Comprobando la calidad de la reseña</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Comprobando la calidad de la reseña (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2327,13 +2338,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Aprender más</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Al seleccionar “Sí, probarlo”, aceptas la %2$s y %3$s de %1$s de Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Al seleccionar “Sí, probarlo”, aceptas la %2$s y %3$s de %1$s de Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Al seleccionar &quot;Sí, probarlo&quot;, aceptas lo siguiente de %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Al seleccionar “Sí, probarlo”, aceptas la %2$s de %1$s y los %4$s de %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Al seleccionar “Sí, probarlo”, aceptas la %2$s de %1$s y los %4$s de %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">política de privacidad</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">política de privacidad</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Política de privacidad</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">política de privacidad</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">términos de uso</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2404,6 +2421,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">¿Traducir esta página?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Página traducida de %1$s a %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Prueba traducciones privadas en %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2416,6 +2437,8 @@
     <string name="translations_bottom_sheet_translate_to">Traducir a</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Ahora no</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Mostrar original</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Hecho</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2438,6 +2461,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Aprender más</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Traduciendo…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opciones de traducción</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 2ca2abadd..2a7dfbb83 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -258,6 +258,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Käännä sivu</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Sivu käännetty kielestä %1$s kielelle %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valittu kieli</string>
@@ -336,12 +341,20 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefoxin tietosuojakäytäntö</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Lue lisää tietosuojakäytännöstämme</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Turvaamisesi on tärkeää meille</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Ota selvää, miksi miljoonat rakastavat Firefoxia</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Turvallista selausta ja enemmän vaihtoehtoja</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Voittoa tavoittelemattoman tahon tukema selaimemme auttaa estämään yrityksiä seuraamasta sinua salaa verkossa.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Tunnetut seuraimet? Estetty automaattisesti. Laajennukset? Kokeile kaikkia 700:aa. PDF-tiedostoja? Sisäänrakennettu lukija tekee niistä helposti hallittavia.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Voittoa tavoittelemattoman tahon tukema selaimemme auttaa estämään yrityksiä seuraamasta sinua salaa verkossa.\n\nLisätietoja on tietosuojakäytännössämme.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -698,9 +711,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Kirjanmerkit</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Kirjautumistiedot</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Kirjautumistiedot</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Salasanat</string>
+    <string name="preferences_sync_logins_2">Salasanat</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Avoimet välilehdet</string>
     <!-- Preference for signing out -->
@@ -726,9 +739,9 @@
     <string name="default_device_name_2">%1$s laitteella %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Luottokortit</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Luottokortit</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Maksutavat</string>
+    <string name="preferences_sync_credit_cards_2">Maksutavat</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Osoitteet</string>
 
@@ -1681,13 +1694,13 @@
     <string name="add_to_homescreen_description_2">Voit lisätä tämän sivuston laitteesi aloitusnäytölle, jolloin sivuston käyttö onnistuu nopeasti ja tarjoaa sovelluksen kaltaisen kokemuksen.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Käyttäjätunnukset ja salasanat</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Käyttäjätunnukset ja salasanat</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Salasanat</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Salasanat</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Tallenna käyttäjätunnukset ja salasanat</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Tallenna käyttäjätunnukset ja salasanat</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Tallenna salasanat</string>
+    <string name="preferences_passwords_save_logins_2">Tallenna salasanat</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Kysy tallennusta</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1703,47 +1716,47 @@
     <string name="preferences_android_autofill_description">Täytä käyttäjätunnukset ja salasanat muissa laitteesi sovelluksissa.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Lisää kirjautumistieto</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Lisää kirjautumistieto</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Lisää salasana</string>
+    <string name="preferences_logins_add_login_2">Lisää salasana</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Synkronoi kirjautumistiedot</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synkronoi salasanat</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Synkronoi kirjautumistiedot</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Synkronoi salasanat</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Synkronoi kirjautumistiedot laitteiden välillä</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Synkronoi kirjautumistiedot laitteiden välillä</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synkronoi salasanat eri laitteiden välillä</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Synkronoi salasanat eri laitteiden välillä</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Tallennetut kirjautumistiedot</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Tallennetut kirjautumistiedot</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Tallennetut salasanat</string>
+    <string name="preferences_passwords_saved_logins_2">Tallennetut salasanat</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">%siin tallentamasi tai synkronoimasi kirjautumistiedot näkyvät täällä.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">%siin tallentamasi tai synkronoimasi kirjautumistiedot näkyvät täällä.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">%siin tallentamasi tai synkronoimasi salasanat näkyvät tässä. Kaikki tallentamasi salasanat ovat salattuja.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">%siin tallentamasi tai synkronoimasi salasanat näkyvät tässä. Kaikki tallentamasi salasanat ovat salattuja.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Lue lisää Syncista.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Lue lisää Syncista.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Lisätietoja synkronoinnista</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Lisätietoja synkronoinnista</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Poikkeukset</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Käyttäjätunnukset ja salanat, joita ei tallenneta, näytetään täällä.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Käyttäjätunnukset ja salanat, joita ei tallenneta, näytetään täällä.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s ei tallenna tässä lueteltujen sivustojen salasanoja.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s ei tallenna tässä lueteltujen sivustojen salasanoja.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Käyttäjätunnuksia ja salasanoja ei tallenneta näille sivustoille.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Käyttäjätunnuksia ja salasanoja ei tallenneta näille sivustoille.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s ei tallenna näiden sivustojen salasanoja.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s ei tallenna näiden sivustojen salasanoja.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Poista kaikki poikkeukset</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Etsi kirjautumistiedoista</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Etsi kirjautumistiedoista</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Etsi salasanoja</string>
+    <string name="preferences_passwords_saved_logins_search_2">Etsi salasanoja</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sivusto</string>
     <!-- The header for the username for a login -->
@@ -1771,17 +1784,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Piilota salasana</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Avaa lukitus nähdäksesi tallennetut kirjautumistiedot</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Avaa lukitus nähdäksesi tallennetut kirjautumistiedot</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Avaa lukitus nähdäksesi tallennetut salasanat</string>
+    <string name="logins_biometric_prompt_message_2">Avaa lukitus nähdäksesi tallennetut salasanat</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Suojaa käyttäjätunnuksesi ja salasanasi</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Suojaa käyttäjätunnuksesi ja salasanasi</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Suojaa tallennetut salasanat</string>
+    <string name="logins_warning_dialog_title_2">Suojaa tallennetut salasanat</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Aseta laitteen avaukseen tarkoitettu kuvio, PIN-koodi tai salasana suojataksesi tallennetut kirjautumistiedot ja salasanat siltä varalta, että joku saa laitteesi haltuunsa.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Aseta laitteen avaukseen tarkoitettu kuvio, PIN-koodi tai salasana suojataksesi tallennetut kirjautumistiedot ja salasanat siltä varalta, että joku saa laitteesi haltuunsa.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Määritä laitteen lukituskuvio, PIN-koodi tai salasana suojataksesi tallennettuja salasanojasi, jos laitteesi on jollain toisella.</string>
+    <string name="logins_warning_dialog_message_2">Määritä laitteen lukituskuvio, PIN-koodi tai salasana suojataksesi tallennettuja salasanojasi, jos laitteesi on jollain toisella.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Myöhemmin</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1799,10 +1812,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Viimeksi käytetty</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Järjestä kirjautumistietojen valikko</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Järjestä kirjautumistietojen valikko</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Salasanojen järjestysvalikko</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Salasanojen järjestysvalikko</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1810,43 +1823,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Osoitteet</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Luottokortit</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Luottokortit</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Maksutavat</string>
+    <string name="preferences_credit_cards_2">Maksutavat</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Tallenna ja täytä kortit automaattisesti</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Tallenna ja täytä kortit automaattisesti</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Tallenna ja täytä maksutavat</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Tallenna ja täytä maksutavat</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Tiedot on salattu</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Tiedot on salattu</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s salaa kaikki tallentamasi maksutavat</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s salaa kaikki tallentamasi maksutavat</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synkronoi kortit laitteiden välillä</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Synkronoi kortit</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Lisää luottokortti</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Lisää luottokortti</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Lisää kortti</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Lisää kortti</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Hallinnoi tallennettuja kortteja</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Hallinnoi tallennettuja kortteja</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Hallitse kortteja</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Hallitse kortteja</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Lisää osoite</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Hallitse osoitteita</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Tallenna ja täytä osoitteet automaattisesti</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Tallenna ja täytä osoitteet automaattisesti</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Tallenna ja täytä osoitteet</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Tallenna ja täytä osoitteet</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Sisällytä tiedot kuten numerot, sähköpostiosoitteet ja toimitusosoitteet</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Sisällytä tiedot kuten numerot, sähköpostiosoitteet ja toimitusosoitteet</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Sisältää puhelinnumerot ja sähköpostiosoitteet</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Sisältää puhelinnumerot ja sähköpostiosoitteet</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Lisää kortti</string>
@@ -1867,9 +1880,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Poista kortti</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Haluatko varmasti poistaa tämän luottokortin?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Haluatko varmasti poistaa tämän luottokortin?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Poistetaanko kortti?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Poistetaanko kortti?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Poista</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1883,24 +1896,24 @@
     <string name="credit_cards_saved_cards">Tallennetut kortit</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Kirjoita kelvollinen luottokortin numero</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Kirjoita kelvollinen luottokortin numero</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Anna kelvollinen kortin numero</string>
+    <string name="credit_cards_number_validation_error_message_2">Anna kelvollinen kortin numero</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Täytä tämä kenttä</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Täytä tämä kenttä</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Lisää nimi</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Lisää nimi</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Avaa lukitus nähdäksesi tallennetut kortit</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Suojaa luottokorttisi</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Suojaa luottokorttisi</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Suojaa tallennetut maksutavat</string>
+    <string name="credit_cards_warning_dialog_title_2">Suojaa tallennetut maksutavat</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Aseta laitteen avaukseen tarkoitettu kuvio, PIN-koodi tai salasana suojataksesi tallennetut luottokorttitiedot siltä varalta, että joku saa laitteesi haltuunsa.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Aseta laitteen avaukseen tarkoitettu kuvio, PIN-koodi tai salasana suojataksesi tallennetut luottokorttitiedot siltä varalta, että joku saa laitteesi haltuunsa.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Määritä laitteen lukituskuvio, PIN-koodi tai salasana suojataksesi tallennettuja maksutapojasi, jos laitteesi on jollain toisella.</string>
+    <string name="credit_cards_warning_dialog_message_3">Määritä laitteen lukituskuvio, PIN-koodi tai salasana suojataksesi tallennettuja maksutapojasi, jos laitteesi on jollain toisella.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Aseta nyt</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1909,10 +1922,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Avaa laitteen lukitus</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Avaa lukitus käyttääksesi tallennettuja luottokorttitietoja</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Avaa lukitus käyttääksesi tallennettuja luottokorttitietoja</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Avaa lukitus käyttääksesi tallennettuja maksutapoja</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Avaa lukitus käyttääksesi tallennettuja maksutapoja</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Lisää osoite</string>
     <!-- Title of the "Edit address" screen -->
@@ -1920,11 +1933,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Hallitse osoitteita</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Etunimi</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Etunimi</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Toinen nimi</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Toinen nimi</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Sukunimi</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Sukunimi</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nimi</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Katuosoite</string>
     <!-- The header for the city of an address -->
@@ -1949,9 +1964,9 @@
     <string name="addressess_delete_address_button">Poista osoite</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Haluatko varmasti poistaa tämän osoitteen?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Haluatko varmasti poistaa tämän osoitteen?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Poistetaanko tämä osoite?</string>
+    <string name="addressess_confirm_dialog_message_2">Poistetaanko tämä osoite?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Poista</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2050,49 +2065,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Muokkaa</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Haluatko varmasti poistaa tämän kirjautumistiedon?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Haluatko varmasti poistaa tämän kirjautumistiedon?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Haluatko varmasti poistaa tämän salasanan?</string>
+    <string name="login_deletion_confirmation_2">Haluatko varmasti poistaa tämän salasanan?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Poista</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Peruuta</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Kirjautumistietojen valinnat</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Kirjautumistietojen valinnat</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Salasanojen asetukset</string>
+    <string name="login_options_menu_2">Salasanojen asetukset</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Muokattava tekstikenttä kirjautumisen verkkosivua varten.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Muokattava tekstikenttä kirjautumisen verkkosivua varten.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Verkkosivuston muokattava tekstikenttä.</string>
+    <string name="saved_login_hostname_description_3">Verkkosivuston muokattava tekstikenttä.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Muokattava tekstikenttä kirjautumisen käyttäjätunnusta varten.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Muokattava tekstikenttä kirjautumisen käyttäjätunnusta varten.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Käyttäjätunnuksen muokattava tekstikenttä.</string>
+    <string name="saved_login_username_description_3">Käyttäjätunnuksen muokattava tekstikenttä.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Muokattava tekstikenttä kirjautumisen salasanaa varten.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Muokattava tekstikenttä kirjautumisen salasanaa varten.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Salasanan muokattava tekstikenttä.</string>
+    <string name="saved_login_password_description_2">Salasanan muokattava tekstikenttä.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Tallenna muutokset kirjautumistietoihin.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Tallenna muutokset kirjautumistietoihin.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Tallenna muutokset.</string>
+    <string name="save_changes_to_login_2">Tallenna muutokset.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Muokkaa</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Muokkaa</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Muokkaa salasanaa</string>
+    <string name="edit_2">Muokkaa salasanaa</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Lisää uusi kirjautumistieto</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Lisää uusi kirjautumistieto</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Lisää salasana</string>
+    <string name="add_login_2">Lisää salasana</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Salasana vaaditaan</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Salasana vaaditaan</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Kirjoita salasana</string>
+    <string name="saved_login_password_required_2">Kirjoita salasana</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Käyttäjätunnus vaaditaan</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Käyttäjätunnus vaaditaan</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Kirjoita käyttäjätunnus</string>
+    <string name="saved_login_username_required_2">Kirjoita käyttäjätunnus</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Isäntänimi vaaditaan</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2205,7 +2220,7 @@
     <string name="radio_preference_info_content_description">Napsauta saadaksesi lisätietoja</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Liiku ylöspäin</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Liiku ylöspäin</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Sulje</string>
@@ -2246,8 +2261,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Oikaistu arvosana</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Epäluotettavat arvostelut poistettu</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Luotettavien arvostelujen pohjalta</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Kohokohdat viimeaikaisista arvosteluista</string>
@@ -2299,10 +2312,6 @@
     <string name="review_quality_check_product_availability_warning_body">Jos huomaat, että tämä tuote on jälleen varastossa, ilmoita siitä, niin tarkistamme arvostelut.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Ilmoita, että tuoteta on varastossa</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Tarkistetaan arvostelun laatua</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Tarkistetaan arvostelun laatua</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Tarkistetaan arvostelun laatua (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2410,6 +2419,10 @@
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Käännetäänkö sivu?</string>
 
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Sivu käännetty kielestä %1$s kielelle %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Kokeile yksityisiä käännöksiä %1$sissa</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2422,6 +2435,8 @@
     <string name="translations_bottom_sheet_translate_to">Käännä kielelle</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Ei nyt</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Näytä alkuperäinen</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Valmis</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2445,6 +2460,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Lue lisää</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Käännetään…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Käännösasetukset</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a99ae4fe9..a8bba84ea 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -336,12 +336,18 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Politique de confidentialité de Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">En savoir plus dans notre politique de confidentialité</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Votre protection compte pour nous</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Découvrez pourquoi des millions de personnes aiment Firefox</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Notre navigateur soutenu par une organisation à but non lucratif empêche les entreprises de vous suivre secrètement sur le Web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Plus de 100 millions de personnes protègent leur vie privée en choisissant un navigateur soutenu par une organisation à but non lucratif.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Notre navigateur soutenu par une organisation à but non lucratif empêche les entreprises de vous suivre secrètement sur le Web.\n\nPour en savoir plus, consultez notre politique de confidentialité.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -697,9 +703,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Marque-pages</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Identifiants</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Identifiants</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Mots de passe</string>
+    <string name="preferences_sync_logins_2">Mots de passe</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Onglets ouverts</string>
     <!-- Preference for signing out -->
@@ -725,9 +731,9 @@
     <string name="default_device_name_2">%1$s sur %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Cartes bancaires</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Cartes bancaires</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Moyens de paiement</string>
+    <string name="preferences_sync_credit_cards_2">Moyens de paiement</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresses</string>
 
@@ -1695,13 +1701,13 @@
     <string name="add_to_homescreen_description_2">Vous pouvez facilement ajouter ce site à l’écran d’accueil de votre appareil pour y avoir accès directement et naviguer plus rapidement, comme si vous utilisiez une application.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Identifiants et mots de passe</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Identifiants et mots de passe</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Mots de passe</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Mots de passe</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Enregistrer les identifiants et les mots de passe</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Enregistrer les identifiants et les mots de passe</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Enregistrer les mots de passe</string>
+    <string name="preferences_passwords_save_logins_2">Enregistrer les mots de passe</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Demander pour enregistrer</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1717,47 +1723,47 @@
     <string name="preferences_android_autofill_description">Remplit les noms d’utilisateur et les mots de passe dans d’autres applications sur votre appareil.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Ajouter un identifiant</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Ajouter un identifiant</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Ajouter un mot de passe</string>
+    <string name="preferences_logins_add_login_2">Ajouter un mot de passe</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Synchroniser les identifiants</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synchroniser les mots de passe</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Synchroniser les identifiants</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Synchroniser les mots de passe</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Synchroniser les identifiants entre vos appareils</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Synchroniser les identifiants entre vos appareils</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synchronisez les mots de passe entre vos appareils</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Synchronisez les mots de passe entre vos appareils</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Identifiants enregistrés</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Identifiants enregistrés</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Mots de passe enregistrés</string>
+    <string name="preferences_passwords_saved_logins_2">Mots de passe enregistrés</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Les identifiants que vous enregistrez ou synchronisez avec %s s’afficheront ici.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Les identifiants que vous enregistrez ou synchronisez avec %s s’afficheront ici.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Les mots de passe que vous enregistrez ou synchronisez avec %s seront répertoriés ici. Tous les mots de passe que vous enregistrez sont chiffrés.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Les mots de passe que vous enregistrez ou synchronisez avec %s seront répertoriés ici. Tous les mots de passe que vous enregistrez sont chiffrés.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">En savoir plus sur Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">En savoir plus sur Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">En savoir plus sur la synchronisation</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">En savoir plus sur la synchronisation</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Exceptions</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Les identifiants et les mots de passe qui ne sont pas enregistrés seront affichés ici.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Les identifiants et les mots de passe qui ne sont pas enregistrés seront affichés ici.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s n’enregistrera pas les mots de passe pour les sites listés ici.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s n’enregistrera pas les mots de passe pour les sites listés ici.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Les identifiants et les mots de passe ne seront pas enregistrés pour ces sites.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Les identifiants et les mots de passe ne seront pas enregistrés pour ces sites.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s n’enregistrera pas les mots de passe pour ces sites.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s n’enregistrera pas les mots de passe pour ces sites.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Supprimer toutes les exceptions</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Rechercher des identifiants</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Rechercher des identifiants</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Rechercher des mots de passe</string>
+    <string name="preferences_passwords_saved_logins_search_2">Rechercher des mots de passe</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Site</string>
     <!-- The header for the username for a login -->
@@ -1785,17 +1791,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Masquer le mot de passe</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Déverrouillez pour afficher vos identifiants enregistrés</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Déverrouillez pour afficher vos identifiants enregistrés</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Déverrouillez pour afficher vos mots de passe enregistrés</string>
+    <string name="logins_biometric_prompt_message_2">Déverrouillez pour afficher vos mots de passe enregistrés</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Protégez vos identifiants et mots de passe</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Protégez vos identifiants et mots de passe</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Sécurisez les mots de passe enregistrés</string>
+    <string name="logins_warning_dialog_title_2">Sécurisez les mots de passe enregistrés</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos identifiants de connexion et mots de passe enregistrés pour le cas où quelqu’un accède à votre appareil.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos identifiants de connexion et mots de passe enregistrés pour le cas où quelqu’un accède à votre appareil.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos mots de passe enregistrés si jamais quelqu’un accède à votre appareil.</string>
+    <string name="logins_warning_dialog_message_2">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos mots de passe enregistrés si jamais quelqu’un accède à votre appareil.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Plus tard</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1812,10 +1818,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Dernière utilisation</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menu de tri des identifiants</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Menu de tri des identifiants</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu de tri des mots de passe</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menu de tri des mots de passe</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1823,43 +1829,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adresses</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Cartes bancaires</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Cartes bancaires</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Moyens de paiement</string>
+    <string name="preferences_credit_cards_2">Moyens de paiement</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Enregistrer et remplir automatiquement les cartes</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Enregistrer et remplir automatiquement les cartes</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Enregistrer et renseigner les moyens de paiement</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Enregistrer et renseigner les moyens de paiement</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Les données sont chiffrées</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Les données sont chiffrées</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s chiffre tous les moyens de paiement que vous enregistrez</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s chiffre tous les moyens de paiement que vous enregistrez</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synchroniser les cartes entre vos appareils</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Synchroniser les cartes</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Ajouter une carte bancaire</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Ajouter une carte bancaire</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Ajouter une carte</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Ajouter une carte</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Gérer les cartes enregistrées</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Gérer les cartes enregistrées</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gérer les cartes</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Gérer les cartes</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Ajouter une adresse</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Gérer les adresses</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Enregistrer et remplir automatiquement les adresses</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Enregistrer et remplir automatiquement les adresses</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Enregistrer et remplir automatiquement les adresses</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Enregistrer et remplir automatiquement les adresses</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Cela comprend des informations telles que des numéros, des adresses e-mail et des adresses d’expédition</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Cela comprend des informations telles que des numéros, des adresses e-mail et des adresses d’expédition</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Y compris les numéros de téléphone et les adresses e-mail</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Y compris les numéros de téléphone et les adresses e-mail</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Ajouter une carte</string>
@@ -1880,9 +1886,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Supprimer la carte</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Voulez-vous vraiment supprimer cette carte bancaire ?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Voulez-vous vraiment supprimer cette carte bancaire ?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Supprimer la carte ?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Supprimer la carte ?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Supprimer</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1896,24 +1902,24 @@
     <string name="credit_cards_saved_cards">Cartes enregistrées</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Veuillez saisir un numéro de carte bancaire valide</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Veuillez saisir un numéro de carte bancaire valide</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Saisissez un numéro de carte valide</string>
+    <string name="credit_cards_number_validation_error_message_2">Saisissez un numéro de carte valide</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Veuillez compléter ce champ</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Veuillez compléter ce champ</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Ajouter un nom</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Ajouter un nom</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Déverrouillez pour afficher vos cartes enregistrées</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Protégez vos cartes bancaires</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Protégez vos cartes bancaires</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Sécurisez vos moyens de paiement enregistrés</string>
+    <string name="credit_cards_warning_dialog_title_2">Sécurisez vos moyens de paiement enregistrés</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos cartes bancaires enregistrées si jamais quelqu’un accède à votre appareil.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos cartes bancaires enregistrées si jamais quelqu’un accède à votre appareil.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos moyens de paiement enregistrés si jamais quelqu’un accède à votre appareil.</string>
+    <string name="credit_cards_warning_dialog_message_3">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos moyens de paiement enregistrés si jamais quelqu’un accède à votre appareil.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurer maintenant</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1921,10 +1927,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Déverrouillez votre appareil</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Déverrouillez pour utiliser les informations de cartes bancaires enregistrées</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Déverrouillez pour utiliser les informations de cartes bancaires enregistrées</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Déverrouillez pour utiliser des moyens de paiement enregistrés</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Déverrouillez pour utiliser des moyens de paiement enregistrés</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Ajouter une adresse</string>
     <!-- Title of the "Edit address" screen -->
@@ -1932,11 +1938,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Gérer les adresses</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Prénom</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Prénom</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Deuxième prénom</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Deuxième prénom</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Nom de famille</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Nom de famille</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nom complet</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Adresse postale</string>
     <!-- The header for the city of an address -->
@@ -1961,9 +1969,9 @@
     <string name="addressess_delete_address_button">Supprimer l’adresse</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Voulez-vous vraiment supprimer cette adresse ?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Voulez-vous vraiment supprimer cette adresse ?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Supprimer cette adresse ?</string>
+    <string name="addressess_confirm_dialog_message_2">Supprimer cette adresse ?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Supprimer</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2061,49 +2069,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Modifier</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Voulez-vous vraiment supprimer cet identifiant ?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Voulez-vous vraiment supprimer cet identifiant ?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Voulez-vous vraiment supprimer ce mot de passe ?</string>
+    <string name="login_deletion_confirmation_2">Voulez-vous vraiment supprimer ce mot de passe ?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Supprimer</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Annuler</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Options de l’identifiant</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Options de l’identifiant</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Options de mot de passe</string>
+    <string name="login_options_menu_2">Options de mot de passe</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Le champ de texte modifiable pour l’adresse web de l’identifiant.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Le champ de texte modifiable pour l’adresse web de l’identifiant.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Le champ de texte modifiable pour l’adresse du site web.</string>
+    <string name="saved_login_hostname_description_3">Le champ de texte modifiable pour l’adresse du site web.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Le champ de texte modifiable pour le nom d’utilisateur de l’identifiant.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Le champ de texte modifiable pour le nom d’utilisateur de l’identifiant.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Le champ de texte modifiable pour le nom d’utilisateur.</string>
+    <string name="saved_login_username_description_3">Le champ de texte modifiable pour le nom d’utilisateur.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Le champ de texte modifiable pour le mot de passe de l’identifiant.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Le champ de texte modifiable pour le mot de passe de l’identifiant.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Le champ de texte modifiable pour le mot de passe.</string>
+    <string name="saved_login_password_description_2">Le champ de texte modifiable pour le mot de passe.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Enregistrez les modifications de l’identifiant.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Enregistrez les modifications de l’identifiant.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Enregistrer les modifications.</string>
+    <string name="save_changes_to_login_2">Enregistrer les modifications.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Modifier</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Modifier</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Modifier le mot de passe</string>
+    <string name="edit_2">Modifier le mot de passe</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Ajouter un nouvel identifiant</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Ajouter un nouvel identifiant</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Ajouter un mot de passe</string>
+    <string name="add_login_2">Ajouter un mot de passe</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Mot de passe requis</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Mot de passe requis</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Saisissez un mot de passe</string>
+    <string name="saved_login_password_required_2">Saisissez un mot de passe</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Le nom d’utilisateur doit être renseigné.</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Le nom d’utilisateur doit être renseigné.</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Saisissez un nom d’utilisateur</string>
+    <string name="saved_login_username_required_2">Saisissez un nom d’utilisateur</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Le nom d’hôte est requis</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2216,7 +2224,7 @@
     <string name="radio_preference_info_content_description">Cliquez pour plus de précisions</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Remonter</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Remonter</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Fermer</string>
@@ -2257,8 +2265,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Évaluation corrigée</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Avis non fiables supprimés</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Sur la base d’avis fiables</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Points essentiels des avis récents</string>
@@ -2315,10 +2321,6 @@
     <string name="review_quality_check_product_availability_warning_body">Si vous constatez le retour de ce produit en stock, signalez-le et nous travaillerons à évaluer les avis.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Signaler que le produit est en stock</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Évaluation de la qualité des avis</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Évaluation de la qualité des avis</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Évaluation de la qualité des avis (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2364,13 +2366,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">En savoir plus</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">En sélectionnant « Oui, l’essayer », vous acceptez la %2$s et les %3$s de %1$s par Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">En sélectionnant « Oui, l’essayer », vous acceptez la %2$s et les %3$s de %1$s par Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">En sélectionnant « Oui, l’essayer » vous acceptez les éléments suivants de %1$s :</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">En sélectionnant « Oui, l’essayer », vous acceptez la %2$s de %1$s et la %4$s de %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">En sélectionnant « Oui, l’essayer », vous acceptez la %2$s de %1$s et la %4$s de %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">politique de confidentialité</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">politique de confidentialité</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Politique de confidentialité</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">politique de confidentialité</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">conditions d’utilisation</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2454,6 +2462,8 @@
     <string name="translations_bottom_sheet_translate_to">Langue cible :</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Plus tard</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Afficher la page d’origine</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Terminé</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2476,6 +2486,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">En savoir plus</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Traduction…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Options de traduction</string>
diff --git a/app/src/main/res/values-hsb/strings.xml b/app/src/main/res/values-hsb/strings.xml
index a43969e12..399f0453b 100644
--- a/app/src/main/res/values-hsb/strings.xml
+++ b/app/src/main/res/values-hsb/strings.xml
@@ -254,6 +254,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Stronu přełožić</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Strona je so z rěče %1$s do rěče %2$s přełožiła.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Wubrana rěč</string>
@@ -330,12 +335,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Zdźělenka priwatnosće Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Zhońće wjace w našej zdźělence priwatnosće</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Škitamy was rady</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Wuslědźće, čehodla miliony ludźi Firefox lubuja</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Wěste přehladowanje z wjace wuběrami</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Naš powšitkownosći wužitny wobhladowak zadźěwa tomu, zo předewzaća wam skradźu po interneće slěduja.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Wjace hač 100 milionow ludźi škita swoju priwatnosć, hdyž wobhladowak wuběraće, kotryž so wot njekomercielneje organizacije podpěruje.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Znate přesćěhowaki? Blokuja so awtomatisce. Rozšěrjenja? Wupruwujće wšě 700. PDF? Naš zatwarjeny čitak wosnadnja je rjadować.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Naš powšitkownosći wužitny wobhladowak tomu zadźěwa, zo předewzaća wam skradźu po interneće slěduja.\n\nDalše informacije w našej zdźělence priwatnosće.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -690,9 +705,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Zapołožki</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Přizjewjenja</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Přizjewjenja</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Hesła</string>
+    <string name="preferences_sync_logins_2">Hesła</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Wočinjene rajtarki</string>
     <!-- Preference for signing out -->
@@ -719,9 +734,9 @@
     <string name="default_device_name_2">%1$s wot %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Kreditne karty</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditne karty</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Płaćenske metody</string>
+    <string name="preferences_sync_credit_cards_2">Płaćenske metody</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresy</string>
 
@@ -1667,13 +1682,13 @@
     <string name="add_to_homescreen_description_2">Móžeće startowej wobrazowce swojeho grata tute websydło lochko přidać, zo byšće direktny přistup měł a spěšnišo z dožiwjenjom nałoženja přehladował.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Přizjewjenja a hesła</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Přizjewjenja a hesła</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Hesła</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Hesła</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Přizjewjenja a hesła składować</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Přizjewjenja a hesła składować</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Hesła składować</string>
+    <string name="preferences_passwords_save_logins_2">Hesła składować</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Před składowanjom so prašeć</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1689,47 +1704,47 @@
     <string name="preferences_android_autofill_description">Wužiwarske mjena a hesła w druhich nałoženjach na wašim graće zasadźić.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Přizjewjenje přidać</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Přizjewjenje přidać</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Hesło přidać</string>
+    <string name="preferences_logins_add_login_2">Hesło přidać</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Přizjewjenja synchronizować</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Hesła synchronizować</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Přizjewjenja synchronizować</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Hesła synchronizować</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Přizjewjenja mjez gratami synchronizować</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Přizjewjenja mjez gratami synchronizować</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Hesła přez graty synchronizować</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Hesła přez graty synchronizować</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Składowane přizjewjenja</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Składowane přizjewjenja</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Składowane hesła</string>
+    <string name="preferences_passwords_saved_logins_2">Składowane hesła</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Přizjewjenja, kotrež składujeće abo z %s synchronizujeće, so tu pokazaja.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Přizjewjenja, kotrež składujeće abo z %s synchronizujeće, so tu pokazaja.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Hesła, kotrež składujeće abo z %s synchronizujeće, so tu nalistuja. Wšě hesła, kotrež składujeće, so zaklučuja.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Hesła, kotrež składujeće abo z %s synchronizujeće, so tu nalistuja. Wšě hesła, kotrež składujeće, so zaklučuja.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Zhońće wjace wo Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Zhońće wjace wo Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Zhońće wjace wo sync</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Zhońće wjace wo sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Wuwzaća</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Přizjewjenja a hesła, kotrež so njeskładuja, so tu pokazaja.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Přizjewjenja a hesła, kotrež so njeskładuja, so tu pokazaja.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s hesła za sydła njeskładuje, kotrež su tu nalistowane.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s hesła za sydła njeskładuje, kotrež su tu nalistowane.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Přizjewjenja a hesła so za tute sydła njeskładuja.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Přizjewjenja a hesła so za tute sydła njeskładuja.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s hesła za tute sydła njeskładuje.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s hesła za tute sydła njeskładuje.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Wšě wuwzaća zhašeć</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Přizjewjenja pytać</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Přizjewjenja pytać</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Hesła přepytać</string>
+    <string name="preferences_passwords_saved_logins_search_2">Hesła přepytać</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sydło</string>
     <!-- The header for the username for a login -->
@@ -1757,17 +1772,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Hesło schować</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Za zwobraznjenje wašich składowanych přizjewjenjow wotewrěć</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Za zwobraznjenje wašich składowanych přizjewjenjow wotewrěć</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Za zwobraznjenje wašich składowanych hesłow wotewrěć</string>
+    <string name="logins_biometric_prompt_message_2">Za zwobraznjenje wašich składowanych hesłow wotewrěć</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Zawěsćće swoje přizjewjenja a hesła</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Zawěsćće swoje přizjewjenja a hesła</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Zawěsćće swoje składowane hesła</string>
+    <string name="logins_warning_dialog_title_2">Zawěsćće swoje składowane hesła</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym přizjewjenjam a hesłam zadźěwał, jeli něchtó druhi waš grat ma.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym přizjewjenjam a hesłam zadźěwał, jeli něchtó druhi waš grat ma.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym hesłam zadźěwał, jeli něchtó druhi waš grat ma.</string>
+    <string name="logins_warning_dialog_message_2">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym hesłam zadźěwał, jeli něchtó druhi waš grat ma.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Pozdźišo</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1786,10 +1801,10 @@
     <string name="saved_logins_sort_strategy_last_used">Poslednim wužiću</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Meni přizjewjenskich datow sortěrować</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Meni přizjewjenskich datow sortěrować</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Meni „Hesła sortěrować“</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Meni „Hesła sortěrować“</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1797,43 +1812,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adresy</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Kreditne karty</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditne karty</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Płaćenske metody</string>
+    <string name="preferences_credit_cards_2">Płaćenske metody</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Karty składować a awtomatisce wupjelnić</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Karty składować a awtomatisce wupjelnić</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Płaćenske metody składować a wupjelnić</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Płaćenske metody składować a wupjelnić</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Daty su zaklučowane</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Daty su zaklučowane</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s wšě płaćenske metody zaklučuje, kotrež składujeće</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s wšě płaćenske metody zaklučuje, kotrež składujeće</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Karty přez graty synchronizować</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Karty synchronizować</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Kreditnu kartu přidać</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditnu kartu přidać</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Kartu přidać</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Kartu přidać</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Składowane karty rjadować</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Składowane karty rjadować</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Karty rjadować</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Karty rjadować</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adresu přidać</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Adresy rjadować</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Adresy składować a awtomatisce wupjelnić</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Adresy składować a awtomatisce wupjelnić</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Adresy składować a wupjelnić</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Adresy składować a wupjelnić</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Informacije kaž ličby, e-mejlowe a rozsyłanske adresy zapřijeć</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Informacije kaž ličby, e-mejlowe a rozsyłanske adresy zapřijeć</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Wobsahuje telefonowe čisła a e-mejlowe adresy</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Wobsahuje telefonowe čisła a e-mejlowe adresy</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Kartu přidać</string>
@@ -1854,9 +1869,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Kartu zhašeć</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Chceće woprawdźe tutu kreditnu kartu zhašeć?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Chceće woprawdźe tutu kreditnu kartu zhašeć?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Kartu zhašeć?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Kartu zhašeć?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Zhašeć</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1870,24 +1885,24 @@
     <string name="credit_cards_saved_cards">Składowane karty</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Prošu zapodajće płaćiwe čisło kreditneje karty</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Prošu zapodajće płaćiwe čisło kreditneje karty</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Zapodajće płaćiwe kartowe čisło</string>
+    <string name="credit_cards_number_validation_error_message_2">Zapodajće płaćiwe kartowe čisło</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Prošu wupjelńće tute polo</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Prošu wupjelńće tute polo</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Přidajće mjeno</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Přidajće mjeno</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Za zwobraznjenje wašich składowanych kartow wotewrěć</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Waše kreditne karty zawěsćić</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Waše kreditne karty zawěsćić</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Zawěsćće swoje składowane płaćenske metody</string>
+    <string name="credit_cards_warning_dialog_title_2">Zawěsćće swoje składowane płaćenske metody</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym kreditnym kartam zadźěwał, jeli něchtó druhi waš grat ma.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym kreditnym kartam zadźěwał, jeli něchtó druhi waš grat ma.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym płácenskim metodam zadźěwał, jeli něchtó druhi waš grat ma.</string>
+    <string name="credit_cards_warning_dialog_message_3">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym płácenskim metodam zadźěwał, jeli něchtó druhi waš grat ma.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Nětko konfigurować</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1896,10 +1911,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Wotewriće swój grat</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Blokowanje zběhnyć, zo bychu so składowane informacije kreditneje karty wužiwali</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Blokowanje zběhnyć, zo bychu so składowane informacije kreditneje karty wužiwali</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Wotewrěć, zo byšće składowane płaćenske metody wužiwał</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Wotewrěć, zo byšće składowane płaćenske metody wužiwał</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adresu přidać</string>
     <!-- Title of the "Edit address" screen -->
@@ -1907,11 +1922,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Adresy rjadować</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Předmjeno</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Předmjeno</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Druhe předmjeno</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Druhe předmjeno</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Swójbne mjeno</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Swójbne mjeno</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Mjeno</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Dróhowa adresa</string>
     <!-- The header for the city of an address -->
@@ -1936,9 +1953,9 @@
     <string name="addressess_delete_address_button">Adresu zhašeć</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Chceće woprawdźe tutu adresu zhašeć?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Chceće woprawdźe tutu adresu zhašeć?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Tutu adresu zhašeć?</string>
+    <string name="addressess_confirm_dialog_message_2">Tutu adresu zhašeć?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Zhašeć</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2037,49 +2054,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Wobdźěłać</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Chceće woprawdźe tute přizjewjenje zhašeć?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Chceće woprawdźe tute přizjewjenje zhašeć?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Chceće woprawdźe tute hesło zhašeć?</string>
+    <string name="login_deletion_confirmation_2">Chceće woprawdźe tute hesło zhašeć?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Zhašeć</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Přetorhnyć</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Přizjewjenske nastajenja</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Přizjewjenske nastajenja</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Hesłowe nastajenja</string>
+    <string name="login_options_menu_2">Hesłowe nastajenja</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Wobdźěłujomne tekstowe polo za webadresu přizjewjenja.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Wobdźěłujomne tekstowe polo za webadresu přizjewjenja.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Wobdźěłujomne tekstowe polo za adresu websydła.</string>
+    <string name="saved_login_hostname_description_3">Wobdźěłujomne tekstowe polo za adresu websydła.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Wobdźěłujomne tekstowe polo za wužiwarske mjeno přizjewjenja.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Wobdźěłujomne tekstowe polo za wužiwarske mjeno přizjewjenja.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Wobdźěłujomne tekstowe polo za wužiwarske mjeno.</string>
+    <string name="saved_login_username_description_3">Wobdźěłujomne tekstowe polo za wužiwarske mjeno.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Wobdźěłujomne tekstowe polo za hesło přizjewjenja.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Wobdźěłujomne tekstowe polo za hesło přizjewjenja.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Wobdźěłujomne tekstowe polo za hesło.</string>
+    <string name="saved_login_password_description_2">Wobdźěłujomne tekstowe polo za hesło.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Změny přizjewjenja składować</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Změny přizjewjenja składować</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Změny składować.</string>
+    <string name="save_changes_to_login_2">Změny składować.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Wobdźěłać</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Wobdźěłać</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Hesło wobdźěłać</string>
+    <string name="edit_2">Hesło wobdźěłać</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Nowe přizjewjenje přidać</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Nowe přizjewjenje přidać</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Hesło přidać</string>
+    <string name="add_login_2">Hesło přidać</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Hesło trěbne</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Hesło trěbne</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Hesło zapodać</string>
+    <string name="saved_login_password_required_2">Hesło zapodać</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Wužiwarske mjeno trěbne</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Wužiwarske mjeno trěbne</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Wužiwarske mjeno zapodać</string>
+    <string name="saved_login_username_required_2">Wužiwarske mjeno zapodać</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hostmjeno trěbne</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2191,7 +2208,7 @@
     <string name="radio_preference_info_content_description">Klikńće za dalše podrobnosće</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Horje</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Horje</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Začinić</string>
@@ -2232,8 +2249,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Přiměrjene hódnoćenje</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Njespušćomne pohódnoćenja wotstronjene</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Bazuje na spušćomnych pohódnoćenjach</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Wjerški z najnowšich pohódnoćenjow</string>
@@ -2290,10 +2305,6 @@ To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produk
     <string name="review_quality_check_product_availability_warning_body">Jeli widźiće, zo tutón produkt je zaso na składźe, zdźělće to a budźemy na kontrolowanju pohódnoćenjow dźěłać.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Zdźělić, zo produkt je na składźe</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Kontrola kwalitu pohódnoćenjow</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Kontrola kwalitu pohódnoćenjow</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Kontrola kwalitu pohódnoćenjow (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2339,13 +2350,19 @@ To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produk
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Dalše informacije</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Hdyž „Haj, wupruwować“ wuběraće, zwoliće do %2$s a %3$s Mozilla za %1$s. </string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Hdyž „Haj, wupruwować“ wuběraće, zwoliće do %2$s a %3$s Mozilla za %1$s. </string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Hdyž „Haj, wupruwować“ wuběraće, zwoliće do slědowaceho wot %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Hdyž „Haj, wupruwować“ wuběraće, zwoliće do %2$s %1$s a %4$s %3$s </string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Hdyž „Haj, wupruwować“ wuběraće, zwoliće do %2$s %1$s a %4$s %3$s </string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">prawidła priwatnosće</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">prawidła priwatnosće</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Prawidła priwatnosće</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">zdźělenka priwatnosće</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">wužiwanske wuměnjenja</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2417,6 +2434,10 @@ To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produk
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Tutu stronu přełožować?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Strona je so z rěče %1$s do rěče %2$s přełožiła</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Priwatne přełožki w %1$s testować</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2429,6 +2450,8 @@ To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produk
     <string name="translations_bottom_sheet_translate_to">Cilowa rěč</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Nic nětko</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Original pokazać</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Dokónčene</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2451,6 +2474,9 @@ To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produk
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Dalše informacije</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Přełožuje so…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Přełožowanske nastajenja</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 38ba20bd6..e08b93131 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -255,6 +255,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Oldal fordítása</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Az oldal lefordítva %1$s nyelvről %2$s nyelvre.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Kiválasztott nyelv</string>
@@ -333,12 +338,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox adatvédelmi nyilatkozat</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">További információk az adatvédelmi nyilatkozatunkban</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Szeretjük biztonságban tartani Önt</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Tudja meg, hogy miért szeretik milliók a Firefoxot</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Biztonságos böngészés, több választási lehetőséggel</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">A nonprofit szervezet által támogatott böngészőnk segít megakadályozni, hogy a cégek titokban kövessék Önt a weben.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Több mint 100 millió ember védi a magánszféráját azzal, hogy egy nonprofit szervezet által támogatott böngészőt választ.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Ismert követők? Automatikusan blokkolva. Kiegészítők? Próbálja ki mind a 700-at. PDF-ek? A beépített olvasónk megkönnyíti a kezelésüket.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">A nonprofit szervezet által támogatott böngészőnk segít megakadályozni, hogy a cégek titokban nyomon kövessék Önt az interneten.\n\nTovábbi információk az adatvédelmi nyilatkozatban találhatók.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -694,9 +709,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Könyvjelzők</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Bejelentkezések</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Bejelentkezések</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Jelszavak</string>
+    <string name="preferences_sync_logins_2">Jelszavak</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Nyitott lapok</string>
     <!-- Preference for signing out -->
@@ -722,9 +737,9 @@
     <string name="default_device_name_2">%1$s ezen: %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Bankkártyák</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Bankkártyák</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Fizetési módok</string>
+    <string name="preferences_sync_credit_cards_2">Fizetési módok</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Címek</string>
 
@@ -1674,13 +1689,13 @@
     <string name="add_to_homescreen_description_2">Könnyedén hozzáadhatja ezt a weboldalt az eszköze Kezdőképernyőhöz, és azonnal elérheti azt, így gyorsabban böngészve, miközben alkalmazásszerű élményt kap.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Bejelentkezések és jelszavak</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Bejelentkezések és jelszavak</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Jelszavak</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Jelszavak</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Bejelentkezések és jelszavak mentése</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Bejelentkezések és jelszavak mentése</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Jelszavak mentése</string>
+    <string name="preferences_passwords_save_logins_2">Jelszavak mentése</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Kérdés mentés előtt</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1695,47 +1710,47 @@
     <string name="preferences_android_autofill_description">Felhasználónevek és jelszavak kitöltése más alkalmazásokban az eszközén.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Bejelentkezés hozzáadása</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Bejelentkezés hozzáadása</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Jelszó hozzáadása</string>
+    <string name="preferences_logins_add_login_2">Jelszó hozzáadása</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Bejelentkezések szinkronizálása</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Jelszavak szinkronizálása</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Bejelentkezések szinkronizálása</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Jelszavak szinkronizálása</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Bejelentkezések szinkronizálása az eszközök között</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Bejelentkezések szinkronizálása az eszközök között</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Jelszavak szinkronizálása az eszközök közt</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Jelszavak szinkronizálása az eszközök közt</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Mentett bejelentkezések</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Mentett bejelentkezések</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Mentett jelszavak</string>
+    <string name="preferences_passwords_saved_logins_2">Mentett jelszavak</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Itt jelennek meg a mentett vagy a %s böngészővel szinkronizált bejelentkezések.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Itt jelennek meg a mentett vagy a %s böngészővel szinkronizált bejelentkezések.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Itt jelennek meg a %sba mentett vagy szinkronizált jelszavak. Az összes mentett jelszó titkosítva van.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Itt jelennek meg a %sba mentett vagy szinkronizált jelszavak. Az összes mentett jelszó titkosítva van.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Tudjon meg többet a Syncről.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Tudjon meg többet a Syncről.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Tudjon meg többet a szinkronizálásról</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Tudjon meg többet a szinkronizálásról</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Kivételek</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Itt jelennek meg a nem mentett bejelentkezések és jelszavak.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Itt jelennek meg a nem mentett bejelentkezések és jelszavak.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">A %s nem menti el a jelszavakat az itt felsorolt webhelyektől.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">A %s nem menti el a jelszavakat az itt felsorolt webhelyektől.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">A bejelentkezéseket és a jelszavak nem lesznek elmentve ezeknél a webhelyeknél.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">A bejelentkezéseket és a jelszavak nem lesznek elmentve ezeknél a webhelyeknél.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">A %s nem menti el a jelszavakat ezekről a webhelyektől.</string>
+    <string name="preferences_passwords_exceptions_description_2">A %s nem menti el a jelszavakat ezekről a webhelyektől.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Összes kivétel törlése</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Bejelentkezések keresése</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Bejelentkezések keresése</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Jelszavak keresése</string>
+    <string name="preferences_passwords_saved_logins_search_2">Jelszavak keresése</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Webhely</string>
     <!-- The header for the username for a login -->
@@ -1763,17 +1778,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Jelszó elrejtése</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Feloldás a mentett bejelentkezések megtekintéshez</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Feloldás a mentett bejelentkezések megtekintéshez</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Feloldás a mentett jelszavak megtekintéshez</string>
+    <string name="logins_biometric_prompt_message_2">Feloldás a mentett jelszavak megtekintéshez</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Helyezze biztonságba bejelentkezéseit és jelszavait</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Helyezze biztonságba bejelentkezéseit és jelszavait</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Helyezze biztonságba a mentett jelszavait</string>
+    <string name="logins_warning_dialog_title_2">Helyezze biztonságba a mentett jelszavait</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett bejelentkezéseit és jelszavait, ha valaki hozzáfér az eszközéhez.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett bejelentkezéseit és jelszavait, ha valaki hozzáfér az eszközéhez.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett jelszavait, ha valaki hozzáfér az eszközéhez.</string>
+    <string name="logins_warning_dialog_message_2">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett jelszavait, ha valaki hozzáfér az eszközéhez.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Később</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1790,10 +1805,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Legutóbbi használat</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Bejelentkezések menü rendezése</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Bejelentkezések menü rendezése</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Jelszavak rendezése menü</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Jelszavak rendezése menü</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1801,44 +1816,44 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Címek</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Bankkártyák</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Bankkártyák</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Fizetési módok</string>
+    <string name="preferences_credit_cards_2">Fizetési módok</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Kártyák mentése és automatikus kitöltése</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kártyák mentése és automatikus kitöltése</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Fizetési módok mentése és kitöltése</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Fizetési módok mentése és kitöltése</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Az adatok titkosítottak</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Az adatok titkosítottak</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">A %s titkosítja az összes elmentett fizetési módot</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">A %s titkosítja az összes elmentett fizetési módot</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Kártyák szinkronizálása az eszközök közt</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Kártyák szinkronizálása</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Bankkártya hozzáadása</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Bankkártya hozzáadása</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Kártya hozzáadása</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Kártya hozzáadása</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Mentett kártyák kezelése</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Mentett kártyák kezelése</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Kártyák kezelése</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Kártyák kezelése</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Cím hozzáadása</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Címek kezelése</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Címek mentése és automatikus kitöltése</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Címek mentése és automatikus kitöltése</string>
 
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Címek mentése és kitöltése</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Címek mentése és kitöltése</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Olyan információk belevétele, mint a számok, e-mail-címek és szállítási címek</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Olyan információk belevétele, mint a számok, e-mail-címek és szállítási címek</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Telefonszámok és e-mail-címek belevétele</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Telefonszámok és e-mail-címek belevétele</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Kártya hozzáadása</string>
@@ -1859,9 +1874,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Kártya törlése</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Biztos, hogy törli ezt a bankkártyát?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Biztos, hogy törli ezt a bankkártyát?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Törli a kártyát?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Törli a kártyát?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Törlés</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1875,24 +1890,24 @@
     <string name="credit_cards_saved_cards">Mentett kártyák</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Adjon meg egy érvényes bankkártyaszámot</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Adjon meg egy érvényes bankkártyaszámot</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Adjon meg egy érvényes kártyaszámot</string>
+    <string name="credit_cards_number_validation_error_message_2">Adjon meg egy érvényes kártyaszámot</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Töltse ki ezt a mezőt</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Töltse ki ezt a mezőt</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Adjon hozzá egy nevet</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Adjon hozzá egy nevet</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Feloldás a mentett kártyák megtekintéshez</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Biztosítsa bankkártyáit</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Biztosítsa bankkártyáit</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Helyezze biztonságba a fizetési módjait</string>
+    <string name="credit_cards_warning_dialog_title_2">Helyezze biztonságba a fizetési módjait</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett bankkártyáit, ha valaki hozzáfér az eszközéhez.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett bankkártyáit, ha valaki hozzáfér az eszközéhez.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett fizetési módjait, ha valaki hozzáfér az eszközéhez.</string>
+    <string name="credit_cards_warning_dialog_message_3">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett fizetési módjait, ha valaki hozzáfér az eszközéhez.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Beállítás most</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1901,10 +1916,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Eszköz feloldása</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Oldja fel, hogy a tárolt bankkártya-információkat használja</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Oldja fel, hogy a tárolt bankkártya-információkat használja</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Oldja fel a zárolást a mentett fizetési módok használatához</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Oldja fel a zárolást a mentett fizetési módok használatához</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Cím hozzáadása</string>
     <!-- Title of the "Edit address" screen -->
@@ -1912,11 +1927,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Címek kezelése</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Utónév</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Utónév</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Egyéb név</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Egyéb név</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Vezetéknév</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Vezetéknév</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Név</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Utca, házszám</string>
     <!-- The header for the city of an address -->
@@ -1941,9 +1958,9 @@
     <string name="addressess_delete_address_button">Cím törlése</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Biztos, hogy törli ezt a címet?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Biztos, hogy törli ezt a címet?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Törli ezt a címet?</string>
+    <string name="addressess_confirm_dialog_message_2">Törli ezt a címet?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Törlés</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2041,49 +2058,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Szerkesztés</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Biztos, hogy törölni szeretné ezt a bejelentkezést?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Biztos, hogy törölni szeretné ezt a bejelentkezést?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Biztos, hogy törli ezt a jelszót?</string>
+    <string name="login_deletion_confirmation_2">Biztos, hogy törli ezt a jelszót?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Törlés</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Mégse</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Bejelentkezési lehetőségek</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Bejelentkezési lehetőségek</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Jelszóbeállítások</string>
+    <string name="login_options_menu_2">Jelszóbeállítások</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">A bejelentkezés webcíméhéz használandó szerkeszthető szövegmező.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">A bejelentkezés webcíméhéz használandó szerkeszthető szövegmező.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">A webhely címének szerkeszthető szövegmezője.</string>
+    <string name="saved_login_hostname_description_3">A webhely címének szerkeszthető szövegmezője.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">A bejelentkezés felhasználónevéhez használandó szerkeszthető szövegmező.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">A bejelentkezés felhasználónevéhez használandó szerkeszthető szövegmező.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">A felhasználónév szerkeszthető szövegmezője.</string>
+    <string name="saved_login_username_description_3">A felhasználónév szerkeszthető szövegmezője.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">A bejelentkezés jelszavához használandó szerkeszthető szövegmező.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">A bejelentkezés jelszavához használandó szerkeszthető szövegmező.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">A jelszó szerkeszthető szövegmezője.</string>
+    <string name="saved_login_password_description_2">A jelszó szerkeszthető szövegmezője.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Módosítások mentése a bejelentkezéshez.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Módosítások mentése a bejelentkezéshez.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Változások mentése.</string>
+    <string name="save_changes_to_login_2">Változások mentése.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Szerkesztés</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Szerkesztés</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Jelszó szerkesztése</string>
+    <string name="edit_2">Jelszó szerkesztése</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Új bejelentkezés hozzáadása</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Új bejelentkezés hozzáadása</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Jelszó hozzáadása</string>
+    <string name="add_login_2">Jelszó hozzáadása</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Jelszó szükséges</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Jelszó szükséges</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Adjon meg egy jelszót</string>
+    <string name="saved_login_password_required_2">Adjon meg egy jelszót</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Felhasználónév szükséges</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Felhasználónév szükséges</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Adjon meg egy felhasználónevet</string>
+    <string name="saved_login_username_required_2">Adjon meg egy felhasználónevet</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Gépnév szükséges</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2196,7 +2213,7 @@
     <string name="radio_preference_info_content_description">Kattintson a további részletekért</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Navigálás fel</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Navigálás fel</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Bezárás</string>
@@ -2237,8 +2254,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Módosított értékelés</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">A nem megbízható értékelések eltávolítva</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Megbízható értékelések alapján</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Kiemelések a legutóbbi értékelésekből</string>
@@ -2296,10 +2311,6 @@
     <string name="review_quality_check_product_availability_warning_body">Ha úgy látja, hogy a termék újra raktáron van, akkor jelentse, és akkor dolgozni fogunk az értékelések ellenőrzésén.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Jelentés, hogy a termék raktáron van</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Értékelési minőség ellenőrzése</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Értékelési minőség ellenőrzése</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Értékelési minőség ellenőrzése (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2347,13 +2358,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">További tudnivalók</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Az „Igen, kipróbálom” kiválasztásával elfogadja a következőt: a %1$s by Mozilla %2$s és %3$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Az „Igen, kipróbálom” kiválasztásával elfogadja a következőt: a %1$s by Mozilla %2$s és %3$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Az „Igen, kipróbálás” kiválasztásával elfogadja a %1$s dokumentumait:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Az „Igen, kipróbálom” kiválasztásával elfogadja a következőket: a %1$s %2$s és a %3$s %4$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Az „Igen, kipróbálom” kiválasztásával elfogadja a következőket: a %1$s %2$s és a %3$s %4$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">adatvédelmi irányelvei</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">adatvédelmi irányelvei</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Adatvédelmi irányelvek</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">adatvédelmi nyilatkozatota</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">felhasználási feltételei</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2426,6 +2443,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Lefordítja az oldalt?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Az oldal lefordítva %1$s nyelvről %2$s nyelvre</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Próbálja ki a privát fordításokat a %1$sban</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2438,6 +2459,8 @@
     <string name="translations_bottom_sheet_translate_to">Fordítás erre:</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Most nem</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Eredeti megjelenítése</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Kész</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2460,6 +2483,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">További tudnivalók</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Fordítás…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Fordítási beállítások</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 46dd967e5..8975bc760 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -253,6 +253,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Þýða síðu</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Síða þýdd úr %1$s yfir í %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valið tungumál</string>
@@ -330,12 +335,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Meðferð persónuupplýsinga í Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Sjáðu nánar í persónuverndaryfirlýsingu okkar</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Við fáum kikk út úr því að halda þér öruggum</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Sjáðu hvers vegna milljónum manns líkar við Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Öruggt vafur með fleiri valmöguleikum</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Vafrinn okkar, sem ekki er rekinn í hagnaðarskyni, hjálpar til við að koma í veg fyrir að fyrirtæki laumist til að fylgjast með þér á ferðum þínum um vefinn.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Meira en 100 milljónir manna vernda friðhelgi sína með því að velja vafra sem er studdur af félagasamtökum án hagnaðarmarkmiða.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Þekktir rekjarar? Lokað sjálfkrafa á þá. Forritsaukar? Prófaðu alla þessa 700. PDF-skjöl? Innbyggði lesarinn okkar gerir auðvelt að stjórna þeim.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Vafrinn okkar, sem ekki er rekinn í hagnaðarskyni, hjálpar til við að koma í veg fyrir að fyrirtæki laumist til að fylgjast með ferðum þínum um vefinn.\n\nFrekari upplýsingar má sjá í persónuverndaryfirlýsingu okkar.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -690,9 +705,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Bókamerki</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Innskráningar</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Innskráningar</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Lykilorð</string>
+    <string name="preferences_sync_logins_2">Lykilorð</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Opnir flipar</string>
     <!-- Preference for signing out -->
@@ -718,9 +733,9 @@
     <string name="default_device_name_2">%1$s á %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Greiðslukort</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Greiðslukort</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Greiðslumátar</string>
+    <string name="preferences_sync_credit_cards_2">Greiðslumátar</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Vistföng</string>
 
@@ -1656,13 +1671,13 @@
     <string name="add_to_homescreen_description_2">Þú getur á auðveldan hátt bætt þessu vefsvæði á upphafsskjáinn þinn fyrir auðveldara aðgengi og hraðara vafur.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Innskráning og lykilorð</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Innskráning og lykilorð</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Lykilorð</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Lykilorð</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Vista innskráningu og lykilorð</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Vista innskráningu og lykilorð</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Vista lykilorð</string>
+    <string name="preferences_passwords_save_logins_2">Vista lykilorð</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Biðja um að vista</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1677,49 +1692,49 @@
     <!-- Description for the preference for autofilling logins from Fenix in other apps (e.g. autofilling the Twitter app) -->
     <string name="preferences_android_autofill_description">Fylltu út notendanöfn og lykilorð í öðrum forritum á tækinu þínu.</string>
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Bæta við innskráningu</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Bæta við innskráningu</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Bæta við lykilorði</string>
+    <string name="preferences_logins_add_login_2">Bæta við lykilorði</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Samstilla innskráningar</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Samstilla lykilorð</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Samstilla innskráningar</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Samstilla lykilorð</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Samstilla innskráningar milli tækja</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Samstilla innskráningar milli tækja</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Samstilla lykilorð milli tækja</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Samstilla lykilorð milli tækja</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Vistaðar innskráningar</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Vistaðar innskráningar</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Vistuð lykilorð</string>
+    <string name="preferences_passwords_saved_logins_2">Vistuð lykilorð</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Innskráningarnar sem þú vistar eða samstillir við %s birtast hér.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Innskráningarnar sem þú vistar eða samstillir við %s birtast hér.</string>
 
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Lykilorðin sem þú vistar eða samstillir við %s verða skráð hér. Öll lykilorð sem þú vistar eru dulrituð.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Lykilorðin sem þú vistar eða samstillir við %s verða skráð hér. Öll lykilorð sem þú vistar eru dulrituð.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Læra meira um samstillingu.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Læra meira um samstillingu.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Frekari upplýsingar um samstillingu</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Frekari upplýsingar um samstillingu</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Undanþágur</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Innskráningar og lykilorð sem ekki eru vistuð sjást hér.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Innskráningar og lykilorð sem ekki eru vistuð sjást hér.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s mun ekki vista lykilorð fyrir vefsvæði sem skráð eru hér.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s mun ekki vista lykilorð fyrir vefsvæði sem skráð eru hér.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Innskráningar og lykilorð verða ekki vistuð fyrir þessi vefsvæði.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Innskráningar og lykilorð verða ekki vistuð fyrir þessi vefsvæði.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s mun ekki vista lykilorð fyrir þessi vefsvæði.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s mun ekki vista lykilorð fyrir þessi vefsvæði.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eyða öllum undantekningum</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Leita að innskráningu</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Leita að innskráningu</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Leita að lykilorðum</string>
+    <string name="preferences_passwords_saved_logins_search_2">Leita að lykilorðum</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Vefsvæði</string>
     <!-- The header for the username for a login -->
@@ -1747,17 +1762,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Fela lykilorð</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Aflæstu til að skoða vistaðar innskráningar</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Aflæstu til að skoða vistaðar innskráningar</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Aflæstu til að skoða vistuð lykilorð</string>
+    <string name="logins_biometric_prompt_message_2">Aflæstu til að skoða vistuð lykilorð</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Verndaðu innskráningar þínar og lykilorð</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Verndaðu innskráningar þínar og lykilorð</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Tryggðu öryggi vistuðu lykilorðanna þinna</string>
+    <string name="logins_warning_dialog_title_2">Tryggðu öryggi vistuðu lykilorðanna þinna</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Settu upp læsimynstur, PIN eða lykilorð til að vernda vistaðar innskráningar og lykilorð ef ske kynni að einhver annar komist yfir tækið þitt.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Settu upp læsimynstur, PIN eða lykilorð til að vernda vistaðar innskráningar og lykilorð ef ske kynni að einhver annar komist yfir tækið þitt.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Settu upp læsimynstur, PIN-númer eða lykilorð til að vernda vistuðu lykilorðin þín ef ske kynni að einhver annar komist yfir tækið þitt.</string>
+    <string name="logins_warning_dialog_message_2">Settu upp læsimynstur, PIN-númer eða lykilorð til að vernda vistuðu lykilorðin þín ef ske kynni að einhver annar komist yfir tækið þitt.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Síðar</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1775,10 +1790,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Síðast notað</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Raða innskráningarvalmyndinni</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Raða innskráningarvalmyndinni</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Raða lykilorðavalmynd</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Raða lykilorðavalmynd</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1786,42 +1801,42 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Tölvupóstföng</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Greiðslukort</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Greiðslukort</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Greiðslumátar</string>
+    <string name="preferences_credit_cards_2">Greiðslumátar</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Vista og fylla sjálfkrafa út í greiðslukort</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Vista og fylla sjálfkrafa út í greiðslukort</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Vista og fylla út greiðslumáta</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Vista og fylla út greiðslumáta</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Gögn eru dulrituð</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Gögn eru dulrituð</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s dulritar alla greiðslumáta sem þú vistar</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s dulritar alla greiðslumáta sem þú vistar</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Samstilla greiðslukort milli tækja</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Samstilla kort</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Bæta við greiðslukorti</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Bæta við greiðslukorti</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Bæta við korti</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Bæta við korti</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Sýsla með vistuð greiðslukort</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Sýsla með vistuð greiðslukort</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Sýsla með greiðslukort</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Sýsla með greiðslukort</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Bæta við tölvupóstfangi</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Sýsla með tölvupóstföng</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Vista og fylla sjálfkrafa út heimilisföng</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Vista og fylla sjálfkrafa út heimilisföng</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Vista og fylla út í heimilisföng</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Vista og fylla út í heimilisföng</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Láta upplýsingar eins og símanúmer, tölvupóstföng og heimilisföng fylgja með</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Láta upplýsingar eins og símanúmer, tölvupóstföng og heimilisföng fylgja með</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Þar með talin símanúmer og tölvupóstföng</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Þar með talin símanúmer og tölvupóstföng</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Bæta við korti</string>
@@ -1843,9 +1858,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Eyða korti</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Ertu viss um að þú viljir eyða þessu greiðslukorti?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Ertu viss um að þú viljir eyða þessu greiðslukorti?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Eyða korti?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Eyða korti?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Eyða</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1857,23 +1872,23 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Vistuð greiðslukort</string>
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Settu inn gilt kortanúmer</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Settu inn gilt kortanúmer</string>
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Settu inn gilt kortanúmer</string>
+    <string name="credit_cards_number_validation_error_message_2">Settu inn gilt kortanúmer</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Fylltu út í þennan reit</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Fylltu út í þennan reit</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Bættu við nafni</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Bættu við nafni</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Aflæsa til að skoða vistuð greiðslukort</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Haltu kreditkortunum þínum öruggum</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Haltu kreditkortunum þínum öruggum</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Tryggðu öryggi vistuðu greiðslumátanna þinna</string>
+    <string name="credit_cards_warning_dialog_title_2">Tryggðu öryggi vistuðu greiðslumátanna þinna</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Settu upp læsimynstur, PIN-númer eða lykilorð til að vernda vistuðu greiðslukortin þín ef ske kynni að einhver annar komist yfir tækið þitt.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Settu upp læsimynstur, PIN-númer eða lykilorð til að vernda vistuðu greiðslukortin þín ef ske kynni að einhver annar komist yfir tækið þitt.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Settu upp læsimynstur, PIN-númer eða lykilorð til að vernda vistuðu greiðslumátana þína ef ske kynni að einhver annar komist yfir tækið þitt.</string>
+    <string name="credit_cards_warning_dialog_message_3">Settu upp læsimynstur, PIN-númer eða lykilorð til að vernda vistuðu greiðslumátana þína ef ske kynni að einhver annar komist yfir tækið þitt.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Setja upp núna</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1881,10 +1896,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Aflæstu tækinu þínu</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Aflæstu til að nota geymdar kreditkortaupplýsingar</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Aflæstu til að nota geymdar kreditkortaupplýsingar</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Aflæstu til að nota vistaða greiðslumáta</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Aflæstu til að nota vistaða greiðslumáta</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Bæta við tölvupóstfangi</string>
     <!-- Title of the "Edit address" screen -->
@@ -1892,11 +1907,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Sýsla með tölvupóstföng</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Skírnarnafn</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Skírnarnafn</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Millinafn</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Millinafn</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Eftirnafn</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Eftirnafn</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nafn</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Heimilisfang</string>
     <!-- The header for the city of an address -->
@@ -1921,9 +1938,9 @@
     <string name="addressess_delete_address_button">Eyða heimilisfangi</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Ertu viss um að þú viljir eyða þessu póstfangi?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ertu viss um að þú viljir eyða þessu póstfangi?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Eyða þessu heimilisfangi?</string>
+    <string name="addressess_confirm_dialog_message_2">Eyða þessu heimilisfangi?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Eyða</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2022,49 +2039,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Breyta</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Ertu viss um að þú viljir eyða þessari innskráningu?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Ertu viss um að þú viljir eyða þessari innskráningu?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Ertu viss um að þú viljir eyða þessu lykilorði?</string>
+    <string name="login_deletion_confirmation_2">Ertu viss um að þú viljir eyða þessu lykilorði?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Eyða</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Hætta við</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Innskráningarvalkostir</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Innskráningarvalkostir</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Valkostir lykilorðs</string>
+    <string name="login_options_menu_2">Valkostir lykilorðs</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Breytilegi textareiturinn fyrir veffang þessarar innskráningarinnar.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Breytilegi textareiturinn fyrir veffang þessarar innskráningarinnar.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Breytanlegi textareiturinn fyrir vistfang vefsvæðisins.</string>
+    <string name="saved_login_hostname_description_3">Breytanlegi textareiturinn fyrir vistfang vefsvæðisins.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Breytilegi textareiturinn fyrir notandanafn innskráningarinnar.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Breytilegi textareiturinn fyrir notandanafn innskráningarinnar.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Breytanlegi textareiturinn fyrir notandanafnið.</string>
+    <string name="saved_login_username_description_3">Breytanlegi textareiturinn fyrir notandanafnið.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Breytilegi textareiturinn fyrir lykilorð innskráningarinnar.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Breytilegi textareiturinn fyrir lykilorð innskráningarinnar.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Breytanlegi textareiturinn fyrir lykilorðið.</string>
+    <string name="saved_login_password_description_2">Breytanlegi textareiturinn fyrir lykilorðið.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Vista breytingar á innskráningu.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Vista breytingar á innskráningu.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Vista breytingar.</string>
+    <string name="save_changes_to_login_2">Vista breytingar.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Breyta</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Breyta</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Breyta lykilorði</string>
+    <string name="edit_2">Breyta lykilorði</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Bæta við nýrri innskráningu</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Bæta við nýrri innskráningu</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Bæta við lykilorði</string>
+    <string name="add_login_2">Bæta við lykilorði</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Lykilorðs krafist</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Lykilorðs krafist</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Settu inn lykilorð</string>
+    <string name="saved_login_password_required_2">Settu inn lykilorð</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Notandanafn er nauðsynlegt</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Notandanafn er nauðsynlegt</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Settu inn notandanafn</string>
+    <string name="saved_login_username_required_2">Settu inn notandanafn</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hýsingarheiti er nauðsynlegt</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2176,7 +2193,7 @@
     <string name="radio_preference_info_content_description">Smelltu til að fá frekari upplýsingar</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Flakka upp</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Flakka upp</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Loka</string>
@@ -2217,8 +2234,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Aðlöguð einkunn</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Óáreiðanlegar umsagnir fjarlægðar</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Byggt á áreiðanlegum umsögnum</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Hápunktar úr nýlegum umsögnum</string>
@@ -2276,10 +2291,6 @@
     <string name="review_quality_check_product_availability_warning_body">Ef þú sérð að þessi vara er aftur komin á lager skaltu tilkynna það til okkar og við munum vinna að því að uppfæra greininguna.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Tilkynna þegar vara er til á lager</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Athugar gæði umsagna</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Athugar gæði umsagna</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Athugar gæði umsagna (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2325,13 +2336,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Frekari upplýsingar</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Með því að velja „Já, prófum það“ samþykkir þú %2$s og %3$s hjá %1$s frá Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Með því að velja „Já, prófum það“ samþykkir þú %2$s og %3$s hjá %1$s frá Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Með því að velja „Já, prófa það“ samþykkir þú eftirfarandi frá %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Með því að velja „Já, prófum það“ samþykkir þú %2$s frá %1$s og %4$s frá %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Með því að velja „Já, prófum það“ samþykkir þú %2$s frá %1$s og %4$s frá %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">persónuverndarstefnu</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">persónuverndarstefnu</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Meðferð persónuupplýsinga</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">persónuverndaryfirlýsing</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">notkunarskilmála</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2402,6 +2419,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Þýða þessa síðu?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Síða þýdd úr %1$s yfir í %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Prófaðu einkaþýðingar í %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2414,6 +2435,8 @@
     <string name="translations_bottom_sheet_translate_to">Þýða á</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Ekki núna</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Sýna upprunalegt</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Lokið</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2436,6 +2459,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Kanna nánar</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Þýðing…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Valkostir þýðinga</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a7bbe317c..c594721e0 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -258,6 +258,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Traduci pagina</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Pagina tradotta da %1$s a %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Lingua selezionata</string>
@@ -336,12 +341,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Informativa sulla privacy di Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Ulteriori informazioni nella nostra informativa sulla privacy</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Ci piace mantenerti al sicuro</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Scopri perché milioni di persone amano Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Navigazione sicura con più scelta</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Il nostro browser, supportato da un’organizzazione senza fini di lucro, blocca automaticamente le società che, di nascosto, cercano di seguire le tue attività sul Web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Più di 100 milioni di persone proteggono la propria privacy scegliendo un browser supportato da un’organizzazione senza fini di lucro.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Elementi traccianti conosciuti? Bloccati automaticamente. Estensioni? Provale tutte, ce ne sono più di 700. PDF? Facili da gestire grazie al lettore integrato.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Il nostro browser, supportato da un’organizzazione senza fini di lucro, blocca automaticamente le società che, di nascosto, cercano di seguire le tue attività sul Web.\n\nScopri ulteriori informazioni nella nostra informativa sulla privacy.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -701,9 +716,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Segnalibri</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Credenziali</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Credenziali</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Password</string>
+    <string name="preferences_sync_logins_2">Password</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Schede aperte</string>
     <!-- Preference for signing out -->
@@ -729,9 +744,9 @@
     <string name="default_device_name_2">%1$s su %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Carte di credito</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Carte di credito</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Metodi di pagamento</string>
+    <string name="preferences_sync_credit_cards_2">Metodi di pagamento</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Indirizzi</string>
 
@@ -1700,13 +1715,13 @@
     <string name="add_to_homescreen_description_2">È possibile aggiungere questo sito web alla schermata principale del dispositivo per accedervi più rapidamente, come se si trattasse di un’app.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Credenziali e password</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Credenziali e password</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Password</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Password</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Salva credenziali e password</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Salva credenziali e password</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Salva password</string>
+    <string name="preferences_passwords_save_logins_2">Salva password</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Chiedi prima di salvare</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1722,47 +1737,47 @@
     <string name="preferences_android_autofill_description">Compila nomi utente e password nelle altre app del tuo dispositivo.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Aggiungi credenziali</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Aggiungi credenziali</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Aggiungi password</string>
+    <string name="preferences_logins_add_login_2">Aggiungi password</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sincronizza le credenziali</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizza password</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizza le credenziali</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Sincronizza password</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sincronizza credenziali tra dispositivi</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizza credenziali tra dispositivi</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronizza le password tra i tuoi dispositivi</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Sincronizza le password tra i tuoi dispositivi</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Credenziali salvate</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Credenziali salvate</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Password salvate</string>
+    <string name="preferences_passwords_saved_logins_2">Password salvate</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Le credenziali salvate o sincronizzate in %s verranno visualizzate qui.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Le credenziali salvate o sincronizzate in %s verranno visualizzate qui.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Le password salvate o sincronizzate con %s verranno visualizzate qui. Tutte le password salvate sono crittate.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Le password salvate o sincronizzate con %s verranno visualizzate qui. Tutte le password salvate sono crittate.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Ulteriori informazioni su Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Ulteriori informazioni su Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Ulteriori informazioni sulla sincronizzazione</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Ulteriori informazioni sulla sincronizzazione</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Eccezioni</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Le credenziali e le password non salvate verranno mostrate qui.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Le credenziali e le password non salvate verranno mostrate qui.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s non salverà le password per i siti elencati qui.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s non salverà le password per i siti elencati qui.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Le credenziali e le password non verranno salvate per questi siti.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Le credenziali e le password non verranno salvate per questi siti.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s non salverà le password per questi siti.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s non salverà le password per questi siti.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Elimina tutte le eccezioni</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Cerca credenziali</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Cerca credenziali</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Cerca nelle password</string>
+    <string name="preferences_passwords_saved_logins_search_2">Cerca nelle password</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sito</string>
     <!-- The header for the username for a login -->
@@ -1790,17 +1805,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Nascondi password</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Sblocca per visualizzare le credenziali salvate</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Sblocca per visualizzare le credenziali salvate</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Sblocca per visualizzare le password salvate</string>
+    <string name="logins_biometric_prompt_message_2">Sblocca per visualizzare le password salvate</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Proteggi le credenziali di accesso</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Proteggi le credenziali di accesso</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Proteggi le password salvate</string>
+    <string name="logins_warning_dialog_title_2">Proteggi le password salvate</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare le tue credenziali.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare le tue credenziali.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare le password salvate.</string>
+    <string name="logins_warning_dialog_message_2">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare le password salvate.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Più tardi</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1818,10 +1833,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Ultimo utilizzo</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordina il menu delle credenziali di accesso</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ordina il menu delle credenziali di accesso</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu per ordinare le password</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menu per ordinare le password</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1829,43 +1844,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Indirizzi</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Carte di credito</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Carte di credito</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Metodi di pagamento</string>
+    <string name="preferences_credit_cards_2">Metodi di pagamento</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Salvare e compilare automaticamente le carte</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Salvare e compilare automaticamente le carte</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Salva e compila i metodi di pagamento</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Salva e compila i metodi di pagamento</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">I dati sono crittati</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">I dati sono crittati</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s critta tutti i metodi di pagamento salvati</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s critta tutti i metodi di pagamento salvati</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizza le carte tra più dispositivi</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sincronizza carte di credito</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Aggiungi una carta di credito</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Aggiungi una carta di credito</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Aggiungi carta</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Aggiungi carta</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Gestione carte salvate</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Gestione carte salvate</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gestisci carte</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Gestisci carte</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Aggiungi indirizzo</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Gestione indirizzi</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Salvare e compilare automaticamente gli indirizzi</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Salvare e compilare automaticamente gli indirizzi</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Salva e compila indirizzi</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Salva e compila indirizzi</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Includere informazioni come numeri, email e indirizzi di spedizione</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Includere informazioni come numeri, email e indirizzi di spedizione</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Include numeri di telefono e indirizzi email</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Include numeri di telefono e indirizzi email</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Aggiungi carta</string>
@@ -1887,9 +1902,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Elimina carta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Eliminare questa carta di credito?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Eliminare questa carta di credito?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Eliminare la carta?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Eliminare la carta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Elimina</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1903,24 +1918,24 @@
     <string name="credit_cards_saved_cards">Carte salvate</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Inserire un numero di carta di credito valido</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Inserire un numero di carta di credito valido</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Inserisci un numero di carta valido</string>
+    <string name="credit_cards_number_validation_error_message_2">Inserisci un numero di carta valido</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Compilare questo campo</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Compilare questo campo</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Aggiungi un nome</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Aggiungi un nome</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Sblocca per visualizzare le carte di credito salvate</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Proteggi le tue carte di credito</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Proteggi le tue carte di credito</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Proteggi i metodi di pagamento salvati</string>
+    <string name="credit_cards_warning_dialog_title_2">Proteggi i metodi di pagamento salvati</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare le carte di credito salvate.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare le carte di credito salvate.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare i metodi di pagamento salvati.</string>
+    <string name="credit_cards_warning_dialog_message_3">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare i metodi di pagamento salvati.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Imposta adesso</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1929,10 +1944,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Sblocca il dispositivo</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Sblocca per utilizzare le informazioni delle carte di credito salvate</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Sblocca per utilizzare le informazioni delle carte di credito salvate</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Sblocca per utilizzare i metodi di pagamento salvati</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Sblocca per utilizzare i metodi di pagamento salvati</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Aggiungi indirizzo</string>
     <!-- Title of the "Edit address" screen -->
@@ -1940,11 +1955,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Gestione indirizzi</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Nome</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Nome</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Secondo nome</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Secondo nome</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Cognome</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Cognome</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nome</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Indirizzo</string>
     <!-- The header for the city of an address -->
@@ -1970,9 +1987,9 @@
     <string name="addressess_delete_address_button">Elimina indirizzo</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Eliminare questo indirizzo?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Eliminare questo indirizzo?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Eliminare questo indirizzo?</string>
+    <string name="addressess_confirm_dialog_message_2">Eliminare questo indirizzo?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Elimina</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2070,49 +2087,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Modifica</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Rimuovere queste credenziali?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Rimuovere queste credenziali?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Eliminare questa password?</string>
+    <string name="login_deletion_confirmation_2">Eliminare questa password?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Rimuovi</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Annulla</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Opzioni credenziali</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Opzioni credenziali</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opzioni password</string>
+    <string name="login_options_menu_2">Opzioni password</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Il campo di testo modificabile per l’indirizzo web delle credenziali</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Il campo di testo modificabile per l’indirizzo web delle credenziali</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Il campo di testo modificabile per l’indirizzo del sito web.</string>
+    <string name="saved_login_hostname_description_3">Il campo di testo modificabile per l’indirizzo del sito web.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Il campo di testo modificabile per il nome utente delle credenziali</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Il campo di testo modificabile per il nome utente delle credenziali</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Il campo di testo modificabile per il nome utente.</string>
+    <string name="saved_login_username_description_3">Il campo di testo modificabile per il nome utente.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Il campo di testo modificabile per la password delle credenziali</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Il campo di testo modificabile per la password delle credenziali</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Il campo di testo modificabile per la password.</string>
+    <string name="saved_login_password_description_2">Il campo di testo modificabile per la password.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Salva le modifiche alle credenziali.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Salva le modifiche alle credenziali.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Salva modifiche.</string>
+    <string name="save_changes_to_login_2">Salva modifiche.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Modifica</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Modifica</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Modifica password</string>
+    <string name="edit_2">Modifica password</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Aggiungi nuove credenziali</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Aggiungi nuove credenziali</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Aggiungi password</string>
+    <string name="add_login_2">Aggiungi password</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Password obbligatoria</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Password obbligatoria</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Inserisci una password</string>
+    <string name="saved_login_password_required_2">Inserisci una password</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Nome utente obbligatorio</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Nome utente obbligatorio</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Inserisci un nome utente</string>
+    <string name="saved_login_username_required_2">Inserisci un nome utente</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Nome server obbligatorio</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2226,7 +2243,7 @@
     <string name="radio_preference_info_content_description">Fare clic per ulteriori dettagli</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Vai su</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Vai su</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Chiudi</string>
@@ -2267,8 +2284,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Valutazione rettificata</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Recensioni inaffidabili rimosse</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Basato su recensioni affidabili</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">In evidenza dalle recensioni recenti</string>
@@ -2326,10 +2341,6 @@
 
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Segnala che il prodotto è disponibile</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Verifica qualità recensioni</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Verifica qualità recensioni</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Verifica qualità recensioni (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2377,13 +2388,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Ulteriori informazioni</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Selezionando “Sì, provala” accetti l’%2$s e i %3$s di %1$s by Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Selezionando “Sì, provala” accetti l’%2$s e i %3$s di %1$s by Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Selezionando “Sì, provalo” accetti le condizioni di %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Selezionando “Sì, provala” accetti l’%2$s di %1$s e le %4$s di %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Selezionando “Sì, provala” accetti l’%2$s di %1$s e le %4$s di %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">informativa sulla privacy</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">informativa sulla privacy</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Informativa sulla privacy</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">informativa sulla privacy</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">condizioni di utilizzo del servizio</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2454,6 +2471,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Tradurre questa pagina?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Pagina tradotta da %1$s a %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Prova le traduzioni riservate di %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2466,6 +2487,8 @@
     <string name="translations_bottom_sheet_translate_to">Traduci in</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Non ora</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Mostra originale</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Fatto</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2488,6 +2511,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Ulteriori informazioni</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Traduzione…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opzioni di traduzione</string>
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index acd6830c3..fae15c712 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -251,6 +251,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Парақты аудару</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Бет %1$s тілінен %2$s тіліне аударылды.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Таңдалған тіл</string>
@@ -329,9 +334,13 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox жекелік ескертуі</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Біздің жекелік ескертуімізден көбірек біліңіз</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Біз сіздің қауіпсіздігіңізді қамтамасыз етуді жақсы көреміз</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Миллиондаған адам неге Firefox-ты жақсы көретінін біліңіз</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Коммерциялық емес ұйымы қолдауымен жасалатын біздің браузер компанияларды интернетте сізді жасырын түрде бақылауын автоматты түрде тоқтатуға көмектеседі.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
@@ -690,9 +699,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Бетбелгілер</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Логиндер</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Логиндер</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Парольдер</string>
+    <string name="preferences_sync_logins_2">Парольдер</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Ашық беттер</string>
     <!-- Preference for signing out -->
@@ -717,9 +726,9 @@
     <string name="default_device_name_2">%1$s, %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Несиелік карталар</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Несиелік карталар</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Төлем әдістері</string>
+    <string name="preferences_sync_credit_cards_2">Төлем әдістері</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Адрестер</string>
 
@@ -1659,13 +1668,13 @@
     <string name="add_to_homescreen_description_2">Бұл веб-сайтты жылдам қатынау және қолданба тектес режимде жылдам шолу мақсатымен құрылғыңыздың үй бетіңізге қосуға болады.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Логиндер және парольдер</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Логиндер және парольдер</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Парольдер</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Парольдер</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Логиндер және парольдерді сақтау</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Логиндер және парольдерді сақтау</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Парольдерді сақтау</string>
+    <string name="preferences_passwords_save_logins_2">Парольдерді сақтау</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Сақтау алдында сұрау</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1682,47 +1691,47 @@
     <string name="preferences_android_autofill_description">Құрылғыңыздағы басқа қолданбаларда пайдаланушы аттары мен парольдерін толтыру.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Логинді қосу</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Логинді қосу</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Парольді қосу</string>
+    <string name="preferences_logins_add_login_2">Парольді қосу</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Логиндерді синхрондау</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Парольдерді синхрондау</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Логиндерді синхрондау</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Парольдерді синхрондау</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Логиндерді құрылғылар арасында синхрондау</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Логиндерді құрылғылар арасында синхрондау</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Парольдерді құрылғылар арасында синхрондау</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Парольдерді құрылғылар арасында синхрондау</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Сақталған логиндер</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Сақталған логиндер</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Сақталған парольдер</string>
+    <string name="preferences_passwords_saved_logins_2">Сақталған парольдер</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Сіз %s ішінде сақтаған немесе синхрондаған логиндер осында көрсетіледі.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Сіз %s ішінде сақтаған немесе синхрондаған логиндер осында көрсетіледі.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Сіз %s ішіне сақтаған немесе синхрондаған парольдер осында тізіліп көрсетіледі. Сіз сақтаған барлық парольдер шифрленген.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Сіз %s ішіне сақтаған немесе синхрондаған парольдер осында тізіліп көрсетіледі. Сіз сақтаған барлық парольдер шифрленген.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Синхрондау туралы көбірек біліңіз.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Синхрондау туралы көбірек біліңіз.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Синхрондау туралы көбірек біліңіз</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Синхрондау туралы көбірек біліңіз</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Ережеден бөлек</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Сақталмаған логиндер мен парольдер осында көрсетіледі.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Сақталмаған логиндер мен парольдер осында көрсетіледі.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s осы жерде тізімделген сайттар үшін парольдерді сақтамайтын болады.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s осы жерде тізімделген сайттар үшін парольдерді сақтамайтын болады.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Бұл сайттар үшін логиндер мен парольдер сақталмайды.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Бұл сайттар үшін логиндер мен парольдер сақталмайды.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s бұл сайттар үшін парольдерді сақтамайтын болады.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s бұл сайттар үшін парольдерді сақтамайтын болады.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Барлық ережеден тыс жағдайларды өшіру</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Логиндерден іздеу</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Логиндерден іздеу</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Парольдерді іздеу</string>
+    <string name="preferences_passwords_saved_logins_search_2">Парольдерді іздеу</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Сайт</string>
     <!-- The header for the username for a login -->
@@ -1750,17 +1759,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Парольді жасыру</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Сақталған логиндеріңізді көру үшін бұғаттауын ашыңыз</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Сақталған логиндеріңізді көру үшін бұғаттауын ашыңыз</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Сақталған парольдеріңізді көру үшін бұғаттауын ашыңыз</string>
+    <string name="logins_biometric_prompt_message_2">Сақталған парольдеріңізді көру үшін бұғаттауын ашыңыз</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Логиндер және парольдерді қорғаңыз</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Логиндер және парольдерді қорғаңыз</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Сақталған парольдерді қорғаңыз</string>
+    <string name="logins_warning_dialog_title_2">Сақталған парольдерді қорғаңыз</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Бөтен адам сіздің құрылғыңызда болса, одан сақталған логиндер мен парольдерді қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Бөтен адам сіздің құрылғыңызда болса, одан сақталған логиндер мен парольдерді қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Бөтен адам сіздің құрылғыңызда болса, одан сақталған парольдеріңізді қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
+    <string name="logins_warning_dialog_message_2">Бөтен адам сіздің құрылғыңызда болса, одан сақталған парольдеріңізді қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Кейінірек</string>
 
@@ -1777,10 +1786,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Соңғы қолданылған</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Логиндерді сұрыптау мәзірі</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Логиндерді сұрыптау мәзірі</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Парольдерді сұрыптау мәзірі</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Парольдерді сұрыптау мәзірі</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1788,43 +1797,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Адрестер</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Несиелік карталар</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Несиелік карталар</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Төлем әдістері</string>
+    <string name="preferences_credit_cards_2">Төлем әдістері</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Карталарды сақтау және автотолтыру</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Карталарды сақтау және автотолтыру</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Төлем әдістерін сақтау және толтыру</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Төлем әдістерін сақтау және толтыру</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Деректер шифрленген</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Деректер шифрленген</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s сіз сақтаған барлық төлем әдістерін шифрлейді</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s сіз сақтаған барлық төлем әдістерін шифрлейді</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Карталарды құрылғылар арасында синхрондау</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Карталарды синхрондау</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Несиелік картаны қосу</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Несиелік картаны қосу</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Картаны қосу</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Картаны қосу</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Сақталған карталарды басқару</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Сақталған карталарды басқару</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Карталарды басқару</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Карталарды басқару</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Адресті қосу</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Адрестерді басқару</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Адрестерді сақтау және автотолтыру</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Адрестерді сақтау және автотолтыру</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Адрестерді сақтау және толтыру</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Адрестерді сақтау және толтыру</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Нөмірлер, эл. пошта және жеткізу адрестері сияқты ақпаратты қосу</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Нөмірлер, эл. пошта және жеткізу адрестері сияқты ақпаратты қосу</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Телефон нөмірлері мен электрондық пошта адрестерін қамтиды</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Телефон нөмірлері мен электрондық пошта адрестерін қамтиды</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Картаны қосу</string>
@@ -1845,9 +1854,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Картаны өшіру</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Бұл несие картасын өшіруді шынымен қалайсыз ба?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Бұл несие картасын өшіруді шынымен қалайсыз ба?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Картаны өшіру керек пе?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Картаны өшіру керек пе?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Өшіру</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1861,24 +1870,24 @@
     <string name="credit_cards_saved_cards">Сақталған карталар</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Несиелік картаның жарамды нөмірін енгізіңіз</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Несиелік картаның жарамды нөмірін енгізіңіз</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Жарамды карта нөмірін енгізіңіз</string>
+    <string name="credit_cards_number_validation_error_message_2">Жарамды карта нөмірін енгізіңіз</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Бұл өрісті толтырыңыз</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Бұл өрісті толтырыңыз</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Атын қосыңыз</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Атын қосыңыз</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Сақталған карталарыңызды көру үшін бұғаттауын ашыңыз</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Несиелік карталарыңызды қорғаңыз</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Несиелік карталарыңызды қорғаңыз</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Сақталған төлем әдістерін қорғаңыз</string>
+    <string name="credit_cards_warning_dialog_title_2">Сақталған төлем әдістерін қорғаңыз</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Бөтен адам сіздің құрылғыңызда болса, одан сақталған несиелік карталарды қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Бөтен адам сіздің құрылғыңызда болса, одан сақталған несиелік карталарды қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Бөтен адам сіздің құрылғыңызда болса, одан сақталған төлем әдістерін қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
+    <string name="credit_cards_warning_dialog_message_3">Бөтен адам сіздің құрылғыңызда болса, одан сақталған төлем әдістерін қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Қазір баптау</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1887,10 +1896,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Құрылғының бұғаттауын ашыңыз</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Сақталған несиелік карта ақпаратын қолдану үшін бұғаттауын ашыңыз</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Сақталған несиелік карта ақпаратын қолдану үшін бұғаттауын ашыңыз</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Сақталған төлем әдістерін қолдану үшін құлыптан босатыңыз</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Сақталған төлем әдістерін қолдану үшін құлыптан босатыңыз</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Адресті қосу</string>
     <!-- Title of the "Edit address" screen -->
@@ -1898,11 +1907,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Адрестерді басқару</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Аты</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Аты</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Әкесінің аты</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Әкесінің аты</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Тегi</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Тегi</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Аты</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Көше адресі</string>
     <!-- The header for the city of an address -->
@@ -1928,9 +1939,9 @@
     <string name="addressess_delete_address_button">Адресті өшіру</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Бұл адресті өшіруді шынымен қалайсыз ба?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Бұл адресті өшіруді шынымен қалайсыз ба?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Бұл адресті өшіру керек пе?</string>
+    <string name="addressess_confirm_dialog_message_2">Бұл адресті өшіру керек пе?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Өшіру</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2027,50 +2038,50 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Түзету</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Бұл логинді өшіруді қалайсыз ба?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Бұл логинді өшіруді қалайсыз ба?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Бұл парольді өшіруді шынымен қалайсыз ба?</string>
+    <string name="login_deletion_confirmation_2">Бұл парольді өшіруді шынымен қалайсыз ба?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Өшіру</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Бас тарту</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Логин баптаулары</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Логин баптаулары</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Пароль опциялары</string>
+    <string name="login_options_menu_2">Пароль опциялары</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Логиннің веб-адресі үшін түзетуге болатын мәтіндік өрісі.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Логиннің веб-адресі үшін түзетуге болатын мәтіндік өрісі.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Веб-сайт адресі үшін түзетуге болатын мәтіндік өрісі.</string>
+    <string name="saved_login_hostname_description_3">Веб-сайт адресі үшін түзетуге болатын мәтіндік өрісі.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Логиннің пайдаланушы аты үшін түзетуге болатын мәтіндік өрісі.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Логиннің пайдаланушы аты үшін түзетуге болатын мәтіндік өрісі.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Пайдаланушы аты үшін түзетуге болатын мәтіндік өрісі.</string>
+    <string name="saved_login_username_description_3">Пайдаланушы аты үшін түзетуге болатын мәтіндік өрісі.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Логиннің паролі үшін түзетуге болатын мәтіндік өрісі.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Логиннің паролі үшін түзетуге болатын мәтіндік өрісі.</string>
 
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Пароль үшін түзетуге болатын мәтіндік өрісі.</string>
+    <string name="saved_login_password_description_2">Пароль үшін түзетуге болатын мәтіндік өрісі.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Логин өзгерістерін сақтау.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Логин өзгерістерін сақтау.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Өзгерістерді сақтау.</string>
+    <string name="save_changes_to_login_2">Өзгерістерді сақтау.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Түзету</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Түзету</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Парольді түзету</string>
+    <string name="edit_2">Парольді түзету</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Жаңа логинді қосу</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Жаңа логинді қосу</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Парольді қосу</string>
+    <string name="add_login_2">Парольді қосу</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Пароль керек</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Пароль керек</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Парольді енгізіңіз</string>
+    <string name="saved_login_password_required_2">Парольді енгізіңіз</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Пайдаланушы аты керек</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Пайдаланушы аты керек</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Пайдаланушы атын енгізіңіз</string>
+    <string name="saved_login_username_required_2">Пайдаланушы атын енгізіңіз</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Хост атауы керек</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2182,7 +2193,7 @@
     <string name="radio_preference_info_content_description">Көбірек білу үшін шертіңіз</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Жоғары жылжу</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Жоғары жылжу</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Жабу</string>
@@ -2223,8 +2234,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Түзетілген рейтинг</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Сенімсіз пікірлер өшірілді</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Сенімді пікірлерге негізделген</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Соңғы пікірлердің маңызды сәттері</string>
@@ -2280,10 +2289,6 @@
     <string name="review_quality_check_product_availability_warning_body">Бұл өнімнің қоймаға қайта оралғанын көрсеңіз, оны бізге хабарлаңыз, біз пікірлерді тексереміз.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Өнімнің қоймада бар болғанын хабарлау</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Пікір сапасын тексеру</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Пікір сапасын тексеру</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Пікір сапасын тексеру (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2329,11 +2334,11 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Көбірек білу</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">&quot;Иә, қолданып көру&quot; опциясын таңдау арқылы сіз Mozilla ұсынған %1$s қолданбасының %2$s және %3$s шарттарымен келісесіз.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">&quot;Иә, қолданып көру&quot; опциясын таңдау арқылы сіз Mozilla ұсынған %1$s қолданбасының %2$s және %3$s шарттарымен келісесіз.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">&quot;Иә, қолданып көру&quot; опциясын таңдау арқылы сіз %1$s ұсынған келесімен келісесіз:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">жекелік саясаты</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">жекелік саясаты</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Жекелік саясаты</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index c327340f9..b05f0fb1d 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -261,6 +261,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">페이지 번역</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">페이지가 %1$s에서 %2$s로 번역되었습니다.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">선택된 언어</string>
@@ -339,12 +344,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox 개인정보처리방침</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">개인정보 보호정책에서 자세히 알아보기</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">우리는 사용자를 안전하게 지키는 것을 좋아합니다</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">수백만 명이 Firefox를 좋아하는 이유를 알아보세요</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">더 많은 선택으로 안전한 브라우징</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">당사의 비영리 지원 브라우저는 회사가 웹에서 비밀리에 사용자를 추적하는 것을 방지하는 데 도움이 됩니다.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">1억 명 이상의 사람들이 비영리 단체가 지원하는 브라우저를 선택하여 개인 정보를 보호합니다.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">알려진 추적기? 자동으로 차단됩니다. 확장기능? 700개 모두 사용해 보세요. PDF? 내장된 리더를 사용하면 쉽게 관리할 수 있습니다.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">당사의 비영리 지원 브라우저는 회사가 웹에서 비밀리에 사용자를 추적하는 것을 방지하는 데 도움이 됩니다.\n\n개인정보처리방침에서 더 알아보세요.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -703,9 +718,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">북마크</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">로그인</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">로그인</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">비밀번호</string>
+    <string name="preferences_sync_logins_2">비밀번호</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">열린 탭</string>
     <!-- Preference for signing out -->
@@ -731,9 +746,9 @@
     <string name="default_device_name_2">%2$s %3$s의 %1$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">신용 카드</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">신용 카드</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">결제 방법</string>
+    <string name="preferences_sync_credit_cards_2">결제 방법</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">주소</string>
 
@@ -1710,13 +1725,13 @@
     <string name="add_to_homescreen_description_2">이 웹 사이트를 기기의 홈 화면에 쉽게 추가하여 앱과 같은 경험을 통해 즉시 액세스하고 더 빠르게 탐색 할 수 있습니다.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">로그인과 비밀번호</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">로그인과 비밀번호</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">비밀번호</string>
+    <string name="preferences_passwords_logins_and_passwords_2">비밀번호</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">로그인과 비밀번호 저장</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">로그인과 비밀번호 저장</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">비밀번호 저장</string>
+    <string name="preferences_passwords_save_logins_2">비밀번호 저장</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">저장할지 묻기</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1732,47 +1747,47 @@
     <string name="preferences_android_autofill_description">기기의 다른 앱에서 사용자 이름과 비밀번호를 채웁니다.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">로그인 추가</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">로그인 추가</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">비밀번호 추가</string>
+    <string name="preferences_logins_add_login_2">비밀번호 추가</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sync 로그인</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">비밀번호 동기화</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sync 로그인</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">비밀번호 동기화</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">기기 간에 로그인 동기화</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">기기 간에 로그인 동기화</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">기기 간에 비밀번호 동기화</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">기기 간에 비밀번호 동기화</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">저장된 로그인</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">저장된 로그인</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">저장된 비밀번호</string>
+    <string name="preferences_passwords_saved_logins_2">저장된 비밀번호</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">%s에 저장하거나 동기화한 로그인이 여기에 표시됩니다.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">%s에 저장하거나 동기화한 로그인이 여기에 표시됩니다.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">%s에 저장하거나 동기화한 비밀번호는 여기에 나열됩니다. 저장한 모든 비밀번호는 암호화됩니다.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">%s에 저장하거나 동기화한 비밀번호는 여기에 나열됩니다. 저장한 모든 비밀번호는 암호화됩니다.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Sync에 대해 더 알아보기.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Sync에 대해 더 알아보기.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">동기화에 대해 더 알아보기</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">동기화에 대해 더 알아보기</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">예외 목록</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">저장되지 않은 로그인과 비밀번호가 여기에 표시됩니다.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">저장되지 않은 로그인과 비밀번호가 여기에 표시됩니다.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s는 여기에 나열된 사이트의 비밀번호를 저장하지 않습니다.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s는 여기에 나열된 사이트의 비밀번호를 저장하지 않습니다.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">이 사이트에 대한 로그인과 비밀번호는 저장되지 않습니다.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">이 사이트에 대한 로그인과 비밀번호는 저장되지 않습니다.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s는 이 사이트의 비밀번호를 저장하지 않습니다.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s는 이 사이트의 비밀번호를 저장하지 않습니다.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">모든 예외 삭제</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">로그인 검색</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">로그인 검색</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">비밀번호 검색</string>
+    <string name="preferences_passwords_saved_logins_search_2">비밀번호 검색</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">사이트</string>
     <!-- The header for the username for a login -->
@@ -1800,17 +1815,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">비밀번호 숨기기</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">저장된 로그인을 보려면 잠금 해제하세요</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">저장된 로그인을 보려면 잠금 해제하세요</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">저장된 비밀번호를 보려면 잠금 해제하세요</string>
+    <string name="logins_biometric_prompt_message_2">저장된 비밀번호를 보려면 잠금 해제하세요</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">로그인과 비밀번호 보안</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">로그인과 비밀번호 보안</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">저장된 비밀번호를 보호하세요</string>
+    <string name="logins_warning_dialog_title_2">저장된 비밀번호를 보호하세요</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">다른 사람이 내 기기를 가지고 있는 경우, 저장된 로그인과 비밀번호에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">다른 사람이 내 기기를 가지고 있는 경우, 저장된 로그인과 비밀번호에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">다른 사람이 내 기기를 가지고 있는 경우, 저장된 비밀번호에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
+    <string name="logins_warning_dialog_message_2">다른 사람이 내 기기를 가지고 있는 경우, 저장된 비밀번호에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">나중에</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1828,10 +1843,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">마지막 사용</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">로그인 정렬 메뉴</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">로그인 정렬 메뉴</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">비밀번호 정렬 메뉴</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">비밀번호 정렬 메뉴</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1839,44 +1854,44 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">주소</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">신용 카드</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">신용 카드</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">결제 방법</string>
+    <string name="preferences_credit_cards_2">결제 방법</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">카드 저장 및 자동 채우기</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">카드 저장 및 자동 채우기</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">결제 방법 저장 및 채우기</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">결제 방법 저장 및 채우기</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">데이터가 암호화됨</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">데이터가 암호화됨</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s는 저장한 모든 결제 방법을 암호화합니다</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s는 저장한 모든 결제 방법을 암호화합니다</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">기기 간에 카드 동기화</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">카드 동기화</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">신용 카드 추가</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">신용 카드 추가</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">카드 추가</string>
+    <string name="preferences_credit_cards_add_credit_card_2">카드 추가</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">저장된 카드 관리</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">저장된 카드 관리</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">카드 관리</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">카드 관리</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">주소 추가</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">주소 관리</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">주소 저장 및 자동 채우기</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">주소 저장 및 자동 채우기</string>
 
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">주소 저장 및 채우기</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">주소 저장 및 채우기</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">숫자, 이메일 및 배송 주소와 같은 정보 포함</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">숫자, 이메일 및 배송 주소와 같은 정보 포함</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">전화번호와 이메일 주소가 포함됩니다</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">전화번호와 이메일 주소가 포함됩니다</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">카드 추가</string>
@@ -1898,9 +1913,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">카드 삭제</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">이 신용 카드를 삭제하시겠습니까?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">이 신용 카드를 삭제하시겠습니까?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">카드를 삭제하시겠습니까?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">카드를 삭제하시겠습니까?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">삭제</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1914,24 +1929,24 @@
     <string name="credit_cards_saved_cards">저장된 카드</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">유효한 신용 카드 번호를 입력해 주세요</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">유효한 신용 카드 번호를 입력해 주세요</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">유효한 카드 번호를 입력하세요</string>
+    <string name="credit_cards_number_validation_error_message_2">유효한 카드 번호를 입력하세요</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">이 항목을 입력하세요.</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">이 항목을 입력하세요.</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">이름 추가</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">이름 추가</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">저장된 카드를 보려면 잠금 해제하세요</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">신용 카드 보안</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">신용 카드 보안</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">저장된 결제 방법을 보호하세요</string>
+    <string name="credit_cards_warning_dialog_title_2">저장된 결제 방법을 보호하세요</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">다른 사람이 내 기기를 가지고 있는 경우, 저장된 신용 카드에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">다른 사람이 내 기기를 가지고 있는 경우, 저장된 신용 카드에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">다른 사람이 내 기기를 가지고 있는 경우, 저장된 결제 방법에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
+    <string name="credit_cards_warning_dialog_message_3">다른 사람이 내 기기를 가지고 있는 경우, 저장된 결제 방법에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">지금 설정</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1940,10 +1955,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">기기 잠금 해제</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">저장된 신용 카드 정보를 사용하려면 잠금 해제하세요</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">저장된 신용 카드 정보를 사용하려면 잠금 해제하세요</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">저장된 결제 방법을 사용하려면 잠금 해제하세요</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">저장된 결제 방법을 사용하려면 잠금 해제하세요</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">주소 추가</string>
     <!-- Title of the "Edit address" screen -->
@@ -1951,11 +1966,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">주소 관리</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">이름</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">이름</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">중간 이름</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">중간 이름</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">성</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">성</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">이름</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">도로 주소</string>
     <!-- The header for the city of an address -->
@@ -1980,9 +1997,9 @@
     <string name="addressess_delete_address_button">주소 삭제</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">이 주소를 삭제하시겠습니까?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">이 주소를 삭제하시겠습니까?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">이 주소를 삭제하시겠습니까?</string>
+    <string name="addressess_confirm_dialog_message_2">이 주소를 삭제하시겠습니까?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">삭제</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2081,49 +2098,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">편집</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">이 로그인을 삭제하시겠습니까?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">이 로그인을 삭제하시겠습니까?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">이 비밀번호를 삭제하시겠습니까?</string>
+    <string name="login_deletion_confirmation_2">이 비밀번호를 삭제하시겠습니까?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">삭제</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">취소</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">로그인 옵션</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">로그인 옵션</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">비밀번호 옵션</string>
+    <string name="login_options_menu_2">비밀번호 옵션</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">로그인 웹 주소의 편집 가능한 텍스트 필드입니다.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">로그인 웹 주소의 편집 가능한 텍스트 필드입니다.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">웹 사이트 주소에 대한 편집 가능한 텍스트 필드입니다.</string>
+    <string name="saved_login_hostname_description_3">웹 사이트 주소에 대한 편집 가능한 텍스트 필드입니다.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">로그인 사용자 이름의 편집 가능한 텍스트 필드입니다.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">로그인 사용자 이름의 편집 가능한 텍스트 필드입니다.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">사용자 이름에 대한 편집 가능한 텍스트 필드입니다.</string>
+    <string name="saved_login_username_description_3">사용자 이름에 대한 편집 가능한 텍스트 필드입니다.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">로그인 비밀번호의 편집 가능한 텍스트 필드입니다.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">로그인 비밀번호의 편집 가능한 텍스트 필드입니다.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">비밀번호에 대한 편집 가능한 텍스트 필드입니다.</string>
+    <string name="saved_login_password_description_2">비밀번호에 대한 편집 가능한 텍스트 필드입니다.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">변경 내용을 로그인에 저장.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">변경 내용을 로그인에 저장.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">변경 내용 저장.</string>
+    <string name="save_changes_to_login_2">변경 내용 저장.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">편집</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">편집</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">비밀번호 수정</string>
+    <string name="edit_2">비밀번호 수정</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">새 로그인 추가</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">새 로그인 추가</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">비밀번호 추가</string>
+    <string name="add_login_2">비밀번호 추가</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">비밀번호 필요</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">비밀번호 필요</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">비밀번호 입력</string>
+    <string name="saved_login_password_required_2">비밀번호 입력</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">사용자 이름은 필수입니다</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">사용자 이름은 필수입니다</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">사용자 이름 입력</string>
+    <string name="saved_login_username_required_2">사용자 이름 입력</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">호스트 이름은 필수입니다</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2237,7 +2254,7 @@
     <string name="radio_preference_info_content_description">상세 정보</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">위로 이동</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">위로 이동</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">닫기</string>
@@ -2278,8 +2295,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">조정된 평점</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">신뢰할 수 없는 리뷰는 삭제됨</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">신뢰할 수 있는 리뷰에 바탕</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">최근 리뷰의 하이라이트</string>
@@ -2335,10 +2350,6 @@
     <string name="review_quality_check_product_availability_warning_body">이 제품이 재입고된 것을 확인하시면, 보고해 주시면 리뷰를 확인하도록 하겠습니다.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">제품 재고가 있다고 보고</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">리뷰 품질 확인 중</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">리뷰 품질 확인 중</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">리뷰 품질 확인 중 (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2384,13 +2395,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">더 알아보기</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">&quot;사용해보기&quot;를 선택하면 Mozilla %2$s 및 %3$s의 %1$s에 동의하게 됩니다.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">&quot;사용해보기&quot;를 선택하면 Mozilla %2$s 및 %3$s의 %1$s에 동의하게 됩니다.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">&quot;사용해보기&quot;를 선택하면 %1$s의 다음 사항에 동의하게 됩니다:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">“사용해보기”를 선택하면 %1$s의 %2$s와 %3$s의 %4$s에 동의하게 됩니다.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">“사용해보기”를 선택하면 %1$s의 %2$s와 %3$s의 %4$s에 동의하게 됩니다.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">개인정보처리방침</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">개인정보처리방침</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">개인정보처리방침</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">개인 정보 보호 정책</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">사용 약관</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2462,6 +2479,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">이 페이지를 번역할까요?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">페이지가 %1$s에서 %2$s로 번역되었습니다.</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">%1$s에서 개인 정보가 보호되는 번역을 사용해 보세요</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2474,6 +2495,8 @@
     <string name="translations_bottom_sheet_translate_to">대상 언어:</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">나중에</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">원본 보기</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">완료</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2496,6 +2519,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">더 알아보기</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">번역 중…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">번역 옵션</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index bd4b73655..ad34c41c7 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -254,6 +254,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Oversett siden</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Siden er oversatt fra %1$s til %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valgt språk</string>
@@ -332,12 +337,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox personvernerklæring</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Les mer i vår personvernerklæring</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Vi beskytter deg gjerne</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Finn ut hvorfor millioner elsker Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Sikker surfing med flere valg</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Vår ideelle nettleser forhindrer selskaper i å spore aktiviteten din i hemmelighet på nettet.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Mer enn 100 millioner mennesker beskytter personvernet sitt ved å velge en nettleser som er støttet av en ideell organisasjon.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Kjente sporere? Blokkert automatisk. Utvidelser? Prøv alle 700. PDF-filer? Vår innebygde leser gjør dem enkle å administrere.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Vår ideelle nettleser forhindrer selskaper i å spore aktiviteten din i hemmelighet på nettet.\n\nLes mer i personvernerklæringen vår.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -691,9 +706,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Bokmerker</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Innlogginger</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Innlogginger</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Passord</string>
+    <string name="preferences_sync_logins_2">Passord</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Åpne faner</string>
     <!-- Preference for signing out -->
@@ -719,9 +734,9 @@
     <string name="default_device_name_2">%1$s på %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Betalingskort</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Betalingskort</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Betalingsmåter</string>
+    <string name="preferences_sync_credit_cards_2">Betalingsmåter</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresser</string>
 
@@ -1668,13 +1683,13 @@
     <string name="add_to_homescreen_description_2">Du kan enkelt legge til dette nettstedet på enhetens startskjerm for å få øyeblikkelig tilgang og surfe raskere med en app-lignende opplevelse.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Innlogginger og passord</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Innlogginger og passord</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Passord</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Passord</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Lagre innlogginger og passord</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Lagre innlogginger og passord</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Lagre passord</string>
+    <string name="preferences_passwords_save_logins_2">Lagre passord</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Spør om å lagre</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1690,48 +1705,48 @@
     <string name="preferences_android_autofill_description">Fyll inn brukernavn og passord i andre apper på enheten din.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Legg til innlogging</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Legg til innlogging</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Legg til passord</string>
+    <string name="preferences_logins_add_login_2">Legg til passord</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Synkroniser innlogginger</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synkroniser passord</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Synkroniser innlogginger</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Synkroniser passord</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Synkroniser innlogginger på tvers av enheter</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Synkroniser innlogginger på tvers av enheter</string>
 
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synkroniser passord på tvers av enheter</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Synkroniser passord på tvers av enheter</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Lagrede innlogginger</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Lagrede innlogginger</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Lagrede passord</string>
+    <string name="preferences_passwords_saved_logins_2">Lagrede passord</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">De innlogginger du lagrer eller synkroniserer til %s vil vises her.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">De innlogginger du lagrer eller synkroniserer til %s vil vises her.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Passordene du lagrer eller synkroniserer med %s vil bli oppført her. Alle passord du lagrer er kryptert.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Passordene du lagrer eller synkroniserer med %s vil bli oppført her. Alle passord du lagrer er kryptert.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Les mer om Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Les mer om Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Les mer om synkronisering</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Les mer om synkronisering</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Unntak</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Innlogginger og passord som ikke er lagret vil vises her.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Innlogginger og passord som ikke er lagret vil vises her.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s vil ikke lagre passord for nettsteder som er oppført her.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s vil ikke lagre passord for nettsteder som er oppført her.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Innlogginger og passord vil ikke bli lagret for disse nettstedene.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Innlogginger og passord vil ikke bli lagret for disse nettstedene.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s vil ikke lagre passord for disse nettstedene.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s vil ikke lagre passord for disse nettstedene.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Slett alle unntak</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Søk innlogginger</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Søk innlogginger</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Søk etter passord</string>
+    <string name="preferences_passwords_saved_logins_search_2">Søk etter passord</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Nettsted</string>
     <!-- The header for the username for a login -->
@@ -1760,17 +1775,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Skjul passord</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Lås opp for å se dine lagrede innlogginger</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Lås opp for å se dine lagrede innlogginger</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Lås opp for å se dine lagrede passord</string>
+    <string name="logins_biometric_prompt_message_2">Lås opp for å se dine lagrede passord</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Sikre dine innlogginger og passord</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Sikre dine innlogginger og passord</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Sikre dine lagrede passord</string>
+    <string name="logins_warning_dialog_title_2">Sikre dine lagrede passord</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Konfigurer en PIN-kode, et passord eller et låsemønster for å forhindre at andre mennesker får tilgang de lagrede innloggingene og passordene dine, hvis de har adgang til din enhet.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Konfigurer en PIN-kode, et passord eller et låsemønster for å forhindre at andre mennesker får tilgang de lagrede innloggingene og passordene dine, hvis de har adgang til din enhet.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Konfigurer en PIN-kode, et passord eller et låsemønster for å beskytte dine lagrede passord om noen andre skulle få tak i enheten din.</string>
+    <string name="logins_warning_dialog_message_2">Konfigurer en PIN-kode, et passord eller et låsemønster for å beskytte dine lagrede passord om noen andre skulle få tak i enheten din.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Senere</string>
 
@@ -1790,10 +1805,10 @@
     <string name="saved_logins_sort_strategy_last_used">Sist brukt</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sorter innlogginger-meny</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Sorter innlogginger-meny</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Sorter passord-menyen</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Sorter passord-menyen</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1801,43 +1816,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adresser</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Betalingskort</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Betalingskort</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Betalingsmåter</string>
+    <string name="preferences_credit_cards_2">Betalingsmåter</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Lagre og fyll ut kort automatisk</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Lagre og fyll ut kort automatisk</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Lagre og fyll inn betalingsmåter</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Lagre og fyll inn betalingsmåter</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data er kryptert</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Data er kryptert</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s krypterer alle betalingsmåter du lagrer</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s krypterer alle betalingsmåter du lagrer</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synkroniser kort på tvers av enheter</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Synkroniser kort</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Legg til betalingskort</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Legg til betalingskort</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Legg til kort</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Legg til kort</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Behandle lagrede kort</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Behandle lagrede kort</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Behandle kort</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Behandle kort</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Legg til adresse</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Behandle adresser</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Lagre og autoutfyll adresser</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Lagre og autoutfyll adresser</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Lagre og fyll ut adresser</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Lagre og fyll ut adresser</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Inkluderer informasjon som telefonnummer, e-post og leveringsadresser</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Inkluderer informasjon som telefonnummer, e-post og leveringsadresser</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Inkluderer telefonnumre og e-postadresser</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Inkluderer telefonnumre og e-postadresser</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Legg til kort</string>
@@ -1858,9 +1873,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Slett kort</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Er du sikker på at du vil slette dette bankkortet?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Er du sikker på at du vil slette dette bankkortet?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Slett kort?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Slett kort?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Slett</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1873,24 +1888,24 @@
     <string name="credit_cards_saved_cards">Lagrede kort</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Oppgi et gyldig betalingskortnummer</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Oppgi et gyldig betalingskortnummer</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Skriv inn et gyldig kortnummer</string>
+    <string name="credit_cards_number_validation_error_message_2">Skriv inn et gyldig kortnummer</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Fyll ut dette feltet</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Fyll ut dette feltet</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Legg til et navn</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Legg til et navn</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Lås opp for å se dine lagrede betalingskort</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Sikre dine betalingskort</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Sikre dine betalingskort</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Sikre dine lagrede betalingsmåter</string>
+    <string name="credit_cards_warning_dialog_title_2">Sikre dine lagrede betalingsmåter</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Konfigurer en PIN-kode, et passord eller et låsemønster for å beskytte de lagrede betalingskortene dine om noen andre skulle få tak i enheten din.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Konfigurer en PIN-kode, et passord eller et låsemønster for å beskytte de lagrede betalingskortene dine om noen andre skulle få tak i enheten din.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Konfigurer en PIN-kode, et passord eller et låsemønster for å beskytte dine lagrede betalingsmåter om noen andre skulle få tak i enheten din.</string>
+    <string name="credit_cards_warning_dialog_message_3">Konfigurer en PIN-kode, et passord eller et låsemønster for å beskytte dine lagrede betalingsmåter om noen andre skulle få tak i enheten din.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Konfigurer nå</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1899,10 +1914,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Lås opp enheten din</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Lås opp for å bruke lagret betalingskortinformasjon</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Lås opp for å bruke lagret betalingskortinformasjon</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Lås opp for å bruke lagrede betalingsmåter</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Lås opp for å bruke lagrede betalingsmåter</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Legg til adresse</string>
     <!-- Title of the "Edit address" screen -->
@@ -1910,11 +1925,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Behandle adresser</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Fornavn</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Fornavn</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Mellomnavn</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Mellomnavn</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Etternavn</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Etternavn</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Navn</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Gateadresse</string>
     <!-- The header for the city of an address -->
@@ -1939,9 +1956,9 @@
     <string name="addressess_delete_address_button">Slett adresse</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Er du sikker på at du vil slette denne adressen?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Er du sikker på at du vil slette denne adressen?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Slette denne adressen?</string>
+    <string name="addressess_confirm_dialog_message_2">Slette denne adressen?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Slett</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2041,49 +2058,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Rediger</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Er du sikker på at du ønsker å slette denne innloggingen?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Er du sikker på at du ønsker å slette denne innloggingen?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Er du sikker på at du ønsker å slette dette passordet?</string>
+    <string name="login_deletion_confirmation_2">Er du sikker på at du ønsker å slette dette passordet?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Slett</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Avbryt</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Innloggingsalternativer</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Innloggingsalternativer</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Passordalternativer</string>
+    <string name="login_options_menu_2">Passordalternativer</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Det redigerbare tekstfeltet for innloggingens nettadresse.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Det redigerbare tekstfeltet for innloggingens nettadresse.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Det redigerbare tekstfeltet for nettstedsadressen.</string>
+    <string name="saved_login_hostname_description_3">Det redigerbare tekstfeltet for nettstedsadressen.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Det redigerbare tekstfeltet for innloggingens brukernavn.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Det redigerbare tekstfeltet for innloggingens brukernavn.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Det redigerbare tekstfeltet for brukernavnet.</string>
+    <string name="saved_login_username_description_3">Det redigerbare tekstfeltet for brukernavnet.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Det redigerbare tekstfeltet for innloggingens passord.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Det redigerbare tekstfeltet for innloggingens passord.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Det redigerbare tekstfeltet for passordet.</string>
+    <string name="saved_login_password_description_2">Det redigerbare tekstfeltet for passordet.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Lagre endringer for innlogging.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Lagre endringer for innlogging.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Lagre endringer.</string>
+    <string name="save_changes_to_login_2">Lagre endringer.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Rediger</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Rediger</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Rediger passord</string>
+    <string name="edit_2">Rediger passord</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Legg til ny innlogging</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Legg til ny innlogging</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Legg til passord</string>
+    <string name="add_login_2">Legg til passord</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Passord kreves</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Passord kreves</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Skriv inn et passord</string>
+    <string name="saved_login_password_required_2">Skriv inn et passord</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Brukernavn påkrevd</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Brukernavn påkrevd</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Skriv inn et brukernavn</string>
+    <string name="saved_login_username_required_2">Skriv inn et brukernavn</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Servernavn påkrevd</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2195,7 +2212,7 @@
     <string name="radio_preference_info_content_description">Trykk her for mer informasjon</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Naviger opp</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Naviger opp</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Lukk</string>
@@ -2236,8 +2253,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Justert vurdering</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Upålitelige vuderinger er fjernet</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Basert på pålitelige vurderinger</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Høydepunkter fra nylige vurderinger</string>
@@ -2293,10 +2308,6 @@
     <string name="review_quality_check_product_availability_warning_body">Hvis du ser at dette produktet er tilbake på lager, rapporter det og vi vil jobbe med å sjekke vurderingene.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Rapporter at produktet er på lager</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Kontrollerer kvaliteten på vurderingen</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Kontrollerer kvaliteten på vurderingen</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Kontrollerer kvaliteten på vurderingen (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2342,13 +2353,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Les mer</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Ved å velge «Ja, prøv det» godtar du %1$s fra Mozilla sine %2$s og %3$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Ved å velge «Ja, prøv det» godtar du %1$s fra Mozilla sine %2$s og %3$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Ved å velge «Ja, prøv det» godtar du følgende fra %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Ved å velge «Ja, prøv det» godtar du %1$s sine %2$s og %3$s sine %4$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Ved å velge «Ja, prøv det» godtar du %1$s sine %2$s og %3$s sine %4$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">personvernbestemmelser</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">personvernbestemmelser</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Personvernbestemmelser</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">personvernerklæring</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">vilkår for bruk</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2421,6 +2438,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Oversett denne siden?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Siden er oversatt fra %1$s til %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Prøv private oversettelser i %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2433,6 +2454,8 @@
     <string name="translations_bottom_sheet_translate_to">Oversett til</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Ikke nå</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Vis original</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Ferdig</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2454,6 +2477,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Les mer</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Oversetter…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Oversettelsesinnstillinger</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ad71b6832..763be5a58 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -256,6 +256,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Traduzir página</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Página traduzida de %1$s para %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Selecionar idioma</string>
@@ -334,12 +339,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Aviso de privacidade do Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Saiba mais em nosso aviso de privacidade</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Adoramos manter você seguro</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Descubra por que milhões adoram o Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Navegação segura com mais opções</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Nosso navegador respaldado por uma entidade sem fins lucrativos ajuda a impedir que empresas sigam você secretamente pela web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Mais de 100 milhões de pessoas protegem sua privacidade escolhendo um navegador respaldado por uma organização sem fins lucrativos.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Rastreadores conhecidos? Bloqueados automaticamente. Extensões? Experimente todas as 700. Documentos PDF? Nosso leitor integrado facilita gerenciar.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Nosso navegador respaldado por uma entidade sem fins lucrativos ajuda a impedir que empresas sigam você secretamente pela web.\n\nSaiba mais em nosso aviso de privacidade.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -696,9 +711,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Favoritos</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Contas de acesso</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Contas de acesso</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Senhas</string>
+    <string name="preferences_sync_logins_2">Senhas</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Abas abertas</string>
     <!-- Preference for signing out -->
@@ -724,9 +739,9 @@
     <string name="default_device_name_2">%1$s no %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Cartões de crédito</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Cartões de crédito</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Métodos de pagamento</string>
+    <string name="preferences_sync_credit_cards_2">Métodos de pagamento</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Endereços</string>
 
@@ -1670,13 +1685,13 @@
     <string name="add_to_homescreen_description_2">Você pode facilmente adicionar este site à tela inicial do dispositivo para ter acesso imediato e navegar mais rápido com uma experiência semelhante a um aplicativo.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Contas e senhas</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Contas e senhas</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Senhas</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Senhas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Salvar contas e senhas</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Salvar contas e senhas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Salvar senhas</string>
+    <string name="preferences_passwords_save_logins_2">Salvar senhas</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Perguntar se deve salvar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1691,47 +1706,47 @@
     <string name="preferences_android_autofill_description">Preencher nomes de usuário e senhas em outros aplicativos no dispositivo.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Adicionar conta</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Adicionar conta</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Adicionar senha</string>
+    <string name="preferences_logins_add_login_2">Adicionar senha</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sincronizar contas</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizar senhas</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizar contas</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Sincronizar senhas</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sincronizar contas entre dispositivos</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizar contas entre dispositivos</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronizar senhas entre dispositivos</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Sincronizar senhas entre dispositivos</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Contas salvas</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Contas salvas</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Senhas salvas</string>
+    <string name="preferences_passwords_saved_logins_2">Senhas salvas</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">As contas que você salvar ou sincronizar no %s aparecem aqui.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">As contas que você salvar ou sincronizar no %s aparecem aqui.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">As senhas que você salva ou sincroniza no %s aparecem aqui. Todas as senhas que você salva são criptografadas.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">As senhas que você salva ou sincroniza no %s aparecem aqui. Todas as senhas que você salva são criptografadas.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Saiba mais sobre sincronização.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Saiba mais sobre sincronização.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Saiba mais sobre sincronização</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Saiba mais sobre sincronização</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Exceções</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Contas e senhas que não são salvas são mostradas aqui.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Contas e senhas que não são salvas são mostradas aqui.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">O %s não salva senhas dos sites desta lista.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">O %s não salva senhas dos sites desta lista.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Contas e senhas desses sites não serão salvas.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Contas e senhas desses sites não serão salvas.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">O %s não salva senhas desses sites.</string>
+    <string name="preferences_passwords_exceptions_description_2">O %s não salva senhas desses sites.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Excluir todas as exceções</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Pesquisar contas</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Pesquisar contas</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Procurar senhas</string>
+    <string name="preferences_passwords_saved_logins_search_2">Procurar senhas</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Site</string>
     <!-- The header for the username for a login -->
@@ -1759,18 +1774,18 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Ocultar senha</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Desbloqueie para ver suas contas salvas</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloqueie para ver suas contas salvas</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desbloqueie para ver as senhas salvas</string>
+    <string name="logins_biometric_prompt_message_2">Desbloqueie para ver as senhas salvas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Proteja suas contas e senhas</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Proteja suas contas e senhas</string>
 
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Proteja as senhas salvas</string>
+    <string name="logins_warning_dialog_title_2">Proteja as senhas salvas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a suas contas e senhas salvas, caso outras pessoas usem seu dispositivo.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a suas contas e senhas salvas, caso outras pessoas usem seu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a suas senhas salvas, caso outras pessoas usem seu dispositivo.</string>
+    <string name="logins_warning_dialog_message_2">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a suas senhas salvas, caso outras pessoas usem seu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Mais tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1787,10 +1802,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Data de uso</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menu de ordenação de contas</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Menu de ordenação de contas</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu de ordenação de senhas</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menu de ordenação de senhas</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1798,43 +1813,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Endereços</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Cartões de crédito</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Cartões de crédito</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Métodos de pagamento</string>
+    <string name="preferences_credit_cards_2">Métodos de pagamento</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Salvar e preencher cartões automaticamente</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Salvar e preencher cartões automaticamente</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Salvar e preencher métodos de pagamento</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Salvar e preencher métodos de pagamento</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Os dados são criptografados</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Os dados são criptografados</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">O %s criptografa todos os métodos de pagamento que você salva</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">O %s criptografa todos os métodos de pagamento que você salva</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar cartões entre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sincronizar cartões</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Adicionar cartão de crédito</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Adicionar cartão de crédito</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Adicionar cartão</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Adicionar cartão</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Gerenciar cartões salvos</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Gerenciar cartões salvos</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gerenciar cartões</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Gerenciar cartões</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adicionar endereço</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Gerenciar endereços</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Salvar e preencher endereços automaticamente</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Salvar e preencher endereços automaticamente</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Salvar e preencher endereços</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Salvar e preencher endereços</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Incluir informações como números, email e endereços de entrega</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Incluir informações como números, email e endereços de entrega</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Incluir números de telefone e endereços de email</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Incluir números de telefone e endereços de email</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Adicionar cartão</string>
@@ -1855,9 +1870,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Excluir cartão</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Tem certeza que quer excluir este cartão de crédito?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Tem certeza que quer excluir este cartão de crédito?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Excluir cartão?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Excluir cartão?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Excluir</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1871,24 +1886,24 @@
     <string name="credit_cards_saved_cards">Cartões salvos</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Digite um número de cartão de crédito válido</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Digite um número de cartão de crédito válido</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Digite um número de cartão válido</string>
+    <string name="credit_cards_number_validation_error_message_2">Digite um número de cartão válido</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Preencha este campo</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Preencha este campo</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Adicionar um nome</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Adicionar um nome</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloqueie para ver seus cartões salvos</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Proteja seus cartões de crédito</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Proteja seus cartões de crédito</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Proteja seus métodos de pagamento salvos</string>
+    <string name="credit_cards_warning_dialog_title_2">Proteja seus métodos de pagamento salvos</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a seus cartões de crédito salvos, caso outras pessoas usem seu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a seus cartões de crédito salvos, caso outras pessoas usem seu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a seus métodos de pagamento salvos, caso outras pessoas usem seu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message_3">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a seus métodos de pagamento salvos, caso outras pessoas usem seu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar agora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1897,10 +1912,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Desbloquear dispositivo</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Desbloqueie para usar informações armazenadas de cartões de crédito</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloqueie para usar informações armazenadas de cartões de crédito</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desbloqueie para usar formas de pagamento salvas</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Desbloqueie para usar formas de pagamento salvas</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adicionar endereço</string>
     <!-- Title of the "Edit address" screen -->
@@ -1909,11 +1924,13 @@
     <string name="addresses_manage_addresses">Gerenciar endereços</string>
 
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Primeiro nome</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Primeiro nome</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Nome do meio</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Nome do meio</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Sobrenome</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Sobrenome</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nome</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Endereço</string>
     <!-- The header for the city of an address -->
@@ -1938,9 +1955,9 @@
     <string name="addressess_delete_address_button">Excluir endereço</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Tem certeza que quer excluir este endereço?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Tem certeza que quer excluir este endereço?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Excluir este endereço?</string>
+    <string name="addressess_confirm_dialog_message_2">Excluir este endereço?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Excluir</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2038,49 +2055,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Editar</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Tem certeza que quer excluir esta conta?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Tem certeza que quer excluir esta conta?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Tem certeza que quer excluir esta senha?</string>
+    <string name="login_deletion_confirmation_2">Tem certeza que quer excluir esta senha?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Excluir</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancelar</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Opções da conta</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Opções da conta</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opções de senhas</string>
+    <string name="login_options_menu_2">Opções de senhas</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">O campo de texto editável do endereço web da conta.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">O campo de texto editável do endereço web da conta.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">O campo de texto editável do endereço do site.</string>
+    <string name="saved_login_hostname_description_3">O campo de texto editável do endereço do site.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">O campo de texto editável do nome de usuário da conta.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">O campo de texto editável do nome de usuário da conta.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">O campo de texto editável do nome de usuário.</string>
+    <string name="saved_login_username_description_3">O campo de texto editável do nome de usuário.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">O campo de texto editável da senha da conta.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">O campo de texto editável da senha da conta.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">O campo de texto editável da senha.</string>
+    <string name="saved_login_password_description_2">O campo de texto editável da senha.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Salvar alterações na conta.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Salvar alterações na conta.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Salvar alterações.</string>
+    <string name="save_changes_to_login_2">Salvar alterações.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Editar</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Editar</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Editar senha</string>
+    <string name="edit_2">Editar senha</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Adicionar conta</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Adicionar conta</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Adicionar senha</string>
+    <string name="add_login_2">Adicionar senha</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Senha é obrigatória</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Senha é obrigatória</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Digite uma senha</string>
+    <string name="saved_login_password_required_2">Digite uma senha</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Nome de usuário é obrigatório</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Nome de usuário é obrigatório</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Digite um nome de usuário</string>
+    <string name="saved_login_username_required_2">Digite um nome de usuário</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Nome de servidor é obrigatório</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2194,7 +2211,7 @@
     <string name="radio_preference_info_content_description">Clique para ver mais detalhes</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Ir para o topo</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Ir para o topo</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Fechar</string>
@@ -2235,8 +2252,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Classificação ajustada</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Avaliações não confiáveis removidas</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Baseado em avaliações confiáveis</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Destaques de avaliações recentes</string>
@@ -2294,10 +2309,6 @@
     <string name="review_quality_check_product_availability_warning_body">Se você perceber que tem este produto novamente em estoque, informe para nós e trabalharemos na verificação de avaliações.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Informar que tem o produto em estoque</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Verificando a qualidade das avaliações</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Verificando a qualidade das avaliações</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Verificando a qualidade das avaliações (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2344,13 +2355,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Saiba mais</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Ao selecionar “Sim, experimentar”, você concorda com a %2$s e os %3$s do %1$s da Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Ao selecionar “Sim, experimentar”, você concorda com a %2$s e os %3$s do %1$s da Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Ao selecionar “Sim, experimentar” você declara que concorda com o seguinte da %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Ao selecionar “Sim, experimentar” você declara que concorda com a %2$s do %1$s e os %4$s do %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Ao selecionar “Sim, experimentar” você declara que concorda com a %2$s do %1$s e os %4$s do %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">política de privacidade</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">política de privacidade</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Política de privacidade</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">aviso de privacidade</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">termos de uso</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2422,6 +2439,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Traduzir esta página?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Página traduzida de %1$s para %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Experimente tradução privativa no %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2435,6 +2456,8 @@
     <string name="translations_bottom_sheet_translate_to">Traduzir para</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Agora não</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Mostrar original</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Pronto</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2457,6 +2480,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Saiba mais</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Traduzindo…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opções de tradução</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 374c48d06..a43beb0fa 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -255,6 +255,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Traduzir página</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Página traduzida de %1$s para %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Idioma selecionado</string>
@@ -333,12 +338,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Política de privacidade do Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Saiba mais nas nossas informações de privacidade</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Adoramos mantê-lo(a) seguro(a)</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Descubra porque milhões adoram o Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Navegação segura com mais opções</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">O nosso navegador, apoiado por uma organização sem fins lucrativos, ajuda a impedir que as empresas o sigam secretamente pela Internet.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Mais de 100 milhões de pessoas protegem a sua privacidade ao escolher um navegador apoiado por uma organização sem fins lucrativos.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Rastreadores conhecidos? Bloqueado automaticamente. Extensões? Experimente todos os 700. PDFs? O nosso leitor integrado facilita a gestão.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">O nosso navegador, apoiado por uma organização sem fins lucrativos, ajuda a impedir que as empresas o sigam secretamente pela web.\n\n Saiba mais nas nossas informações de privacidade.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -693,9 +708,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Marcadores</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Credenciais</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Credenciais</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Palavras-passe</string>
+    <string name="preferences_sync_logins_2">Palavras-passe</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Separadores abertos</string>
     <!-- Preference for signing out -->
@@ -721,9 +736,9 @@
     <string name="default_device_name_2">%1$s no %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Cartões de crédito</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Cartões de crédito</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Métodos de pagamento</string>
+    <string name="preferences_sync_credit_cards_2">Métodos de pagamento</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Moradas</string>
 
@@ -1668,14 +1683,14 @@
     <string name="add_to_homescreen_description_2">Pode adicionar facilmente este site ao ecrã inicial do seu dispositivo para ter acesso instantâneo e navegar mais rápido, com uma experiência semelhante ao de uma aplicação.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Credenciais e palavras-passe</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Credenciais e palavras-passe</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Palavras-passe</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Palavras-passe</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Guardar credenciais e palavras-passe</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar credenciais e palavras-passe</string>
 
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Guardar palavras-passe</string>
+    <string name="preferences_passwords_save_logins_2">Guardar palavras-passe</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Pedir para guardar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1690,48 +1705,48 @@
     <string name="preferences_android_autofill_description">Preencher nomes de utilizador e palavras-passe noutras aplicações no seu dispositivo.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Adicionar credenciais</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Adicionar credenciais</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Adicionar palavra-passe</string>
+    <string name="preferences_logins_add_login_2">Adicionar palavra-passe</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sincronização de credenciais</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizar palavras-passe</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronização de credenciais</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Sincronizar palavras-passe</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sincronizar credenciais entre dispositivos</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizar credenciais entre dispositivos</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronize palavras-passe entre dispositivos</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Sincronize palavras-passe entre dispositivos</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Credenciais guardadas</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Credenciais guardadas</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Palavras-passe guardadas</string>
+    <string name="preferences_passwords_saved_logins_2">Palavras-passe guardadas</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">As credenciais que guardar ou sincronizar com o %s serão apresentadas aqui.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">As credenciais que guardar ou sincronizar com o %s serão apresentadas aqui.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">As palavras-passe que guardar ou sincronizar com o %s serão listadas aqui. Todas as palavras-passe que guarda são encriptadas.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">As palavras-passe que guardar ou sincronizar com o %s serão listadas aqui. Todas as palavras-passe que guarda são encriptadas.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Saber mais sobre a sincronização.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Saber mais sobre a sincronização.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Saber mais sobre a sincronização</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Saber mais sobre a sincronização</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Exceções</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">As credenciais e palavras-passe que não estão guardadas serão mostradas aqui.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">As credenciais e palavras-passe que não estão guardadas serão mostradas aqui.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">O %s não irá guardar palavras-passe para sites listados aqui.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">O %s não irá guardar palavras-passe para sites listados aqui.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">As credenciais e palavras-passe não serão guardadas para estes sites.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">As credenciais e palavras-passe não serão guardadas para estes sites.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">O %s não irá guardar as palavras-passe para estes sites.</string>
+    <string name="preferences_passwords_exceptions_description_2">O %s não irá guardar as palavras-passe para estes sites.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eliminar todas as exceções</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Pesquisar credenciais</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Pesquisar credenciais</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Procurar palavras-passe</string>
+    <string name="preferences_passwords_saved_logins_search_2">Procurar palavras-passe</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Site</string>
     <!-- The header for the username for a login -->
@@ -1760,17 +1775,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Ocultar palavra-passe</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Desbloqueie para ver as credenciais guardadas</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloqueie para ver as credenciais guardadas</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desbloqueie para ver as palavras-passe guardadas</string>
+    <string name="logins_biometric_prompt_message_2">Desbloqueie para ver as palavras-passe guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Proteja as suas credenciais e palavras-passe</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Proteja as suas credenciais e palavras-passe</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Proteja as suas palavras-passe guardadas</string>
+    <string name="logins_warning_dialog_title_2">Proteja as suas palavras-passe guardadas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que as suas credenciais e palavras-passe guardadas sejam acedidas por outra pessoa que tenha acesso ao seu dispositivo.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que as suas credenciais e palavras-passe guardadas sejam acedidas por outra pessoa que tenha acesso ao seu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que as suas palavras-passe guardadas sejam acedidas por outra pessoa que tenha acesso ao seu dispositivo.</string>
+    <string name="logins_warning_dialog_message_2">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que as suas palavras-passe guardadas sejam acedidas por outra pessoa que tenha acesso ao seu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Mais tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1787,10 +1802,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Última utilização</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menu de ordenação de credenciais</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Menu de ordenação de credenciais</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu de ordenação de palavras-passe</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menu de ordenação de palavras-passe</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1798,44 +1813,44 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Endereços</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Cartões de crédito</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Cartões de crédito</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Métodos de pagamento</string>
+    <string name="preferences_credit_cards_2">Métodos de pagamento</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Guardar e preencher automaticamente cartões</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar e preencher automaticamente cartões</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Guardar e preencher métodos de pagamento</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Guardar e preencher métodos de pagamento</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Os dados são encriptados</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Os dados são encriptados</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">O %s encripta todos os métodos de pagamento que guarda</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">O %s encripta todos os métodos de pagamento que guarda</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar cartões entre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sincronizar cartões</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Adicionar cartão de crédito</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Adicionar cartão de crédito</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Adicionar cartão</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Adicionar cartão</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Gerir cartões guardados</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Gerir cartões guardados</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gerir cartões</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Gerir cartões</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adicionar endereço</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Gerir endereços</string>
 
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Guardar e preencher automaticamente endereços</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar e preencher automaticamente endereços</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Guardar e preencher endereços</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Guardar e preencher endereços</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Incluir informações como números, e-mail e endereços de entrega</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Incluir informações como números, e-mail e endereços de entrega</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Inclui números de telefone e endereços de e-mail</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Inclui números de telefone e endereços de e-mail</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Adicionar cartão</string>
@@ -1856,9 +1871,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Eliminar cartão</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Tem a certeza de que quer apagar este cartão de crédito?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Tem a certeza de que quer apagar este cartão de crédito?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Eliminar cartão?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Eliminar cartão?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Apagar</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1872,23 +1887,23 @@
     <string name="credit_cards_saved_cards">Cartões guardados</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Por favor, introduza um número de cartão de crédito válido</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Por favor, introduza um número de cartão de crédito válido</string>
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Insira um número de cartão válido</string>
+    <string name="credit_cards_number_validation_error_message_2">Insira um número de cartão válido</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Por favor preencha este campo</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Por favor preencha este campo</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Adicionar um nome</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Adicionar um nome</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloquear para ver os cartões guardados</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Proteja os seus cartões de crédito</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Proteja os seus cartões de crédito</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Proteja os seus métodos de pagamento guardados</string>
+    <string name="credit_cards_warning_dialog_title_2">Proteja os seus métodos de pagamento guardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que os seus cartões de crédito guardados sejam acedidos por outra pessoa que tenha acesso ao seu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que os seus cartões de crédito guardados sejam acedidos por outra pessoa que tenha acesso ao seu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que os seus métodos de pagamento guardados sejam acedidos por outra pessoa que tenha acesso ao seu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message_3">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que os seus métodos de pagamento guardados sejam acedidos por outra pessoa que tenha acesso ao seu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar agora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1896,10 +1911,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Desbloquear o seu dispositivo</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Desbloquear para utilizar as informações de cartão de crédito armazenadas</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquear para utilizar as informações de cartão de crédito armazenadas</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desbloquear para utilizar métodos de pagamento guardados</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Desbloquear para utilizar métodos de pagamento guardados</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adicionar endereço</string>
     <!-- Title of the "Edit address" screen -->
@@ -1907,11 +1922,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Gerir endereços</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Primeiro nome</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Primeiro nome</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Nome do meio</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Nome do meio</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Último nome</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Último nome</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nome</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Endereço da rua</string>
     <!-- The header for the city of an address -->
@@ -1936,9 +1953,9 @@
     <string name="addressess_delete_address_button">Apagar endereço</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Tem a certeza de que quer eliminar este endereço?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Tem a certeza de que quer eliminar este endereço?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Eliminar este endereço?</string>
+    <string name="addressess_confirm_dialog_message_2">Eliminar este endereço?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Apagar</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2037,49 +2054,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Editar</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Tem a certeza que deseja eliminar esta credencial?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Tem a certeza que deseja eliminar esta credencial?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Tem a certeza que quer eliminar esta palavra-passe?</string>
+    <string name="login_deletion_confirmation_2">Tem a certeza que quer eliminar esta palavra-passe?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Eliminar</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancelar</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Opções de credenciais</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Opções de credenciais</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opções de palavra-passe</string>
+    <string name="login_options_menu_2">Opções de palavra-passe</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">O campo de texto editável para o endereço de Internet da credencial.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">O campo de texto editável para o endereço de Internet da credencial.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">O campo de texto editável para o endereço do site.</string>
+    <string name="saved_login_hostname_description_3">O campo de texto editável para o endereço do site.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">O campo de texto editável para o nome de utilizador da credencial.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">O campo de texto editável para o nome de utilizador da credencial.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">O campo de texto editável para o nome de utilizador.</string>
+    <string name="saved_login_username_description_3">O campo de texto editável para o nome de utilizador.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">O campo de texto editável para a palavra-passe da credencial.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">O campo de texto editável para a palavra-passe da credencial.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">O campo de texto editável para a palavra-passe.</string>
+    <string name="saved_login_password_description_2">O campo de texto editável para a palavra-passe.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Guardar alterações na credencial.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar alterações na credencial.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Guardar alterações.</string>
+    <string name="save_changes_to_login_2">Guardar alterações.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Editar</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Editar</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Editar palavra-passe</string>
+    <string name="edit_2">Editar palavra-passe</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Adicionar nova credencial</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Adicionar nova credencial</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Adicionar palavra-passe</string>
+    <string name="add_login_2">Adicionar palavra-passe</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">É necessária uma palavra-passe</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">É necessária uma palavra-passe</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Introduza uma palavra-passe</string>
+    <string name="saved_login_password_required_2">Introduza uma palavra-passe</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">É necessário um nome de utilizador</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">É necessário um nome de utilizador</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Introduza um nome de utilizador</string>
+    <string name="saved_login_username_required_2">Introduza um nome de utilizador</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">É necessário um nome de servidor</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2192,7 +2209,7 @@
     <string name="radio_preference_info_content_description">Clique para mais detalhes</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Navegar para cima</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Navegar para cima</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Fechar</string>
@@ -2233,8 +2250,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Classificação ajustada</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Avaliações não confiáveis removidas</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Baseado em avaliações confiáveis</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Destaques das avaliações recentes</string>
@@ -2290,10 +2305,6 @@
     <string name="review_quality_check_product_availability_warning_body">Se perceber que este produto está novamente em stock, reporte e iremos verificar as avaliações.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Informar que o produto está em stock</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">A verificar a qualidade da avaliação</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">A verificar a qualidade da avaliação</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">A verificar a qualidade da avaliação (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2339,13 +2350,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Saber mais</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Ao selecionar “Sim, experimentar”, concorda com a %2$s e %3$s de %1$s da Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Ao selecionar “Sim, experimentar”, concorda com a %2$s e %3$s de %1$s da Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Ao selecionar “Sim, experimentar”, concorda com o seguinte de %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Ao selecionar “Sim, experimentar” concorda com a %2$s de %1$s e com a %4$s de %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Ao selecionar “Sim, experimentar” concorda com a %2$s de %1$s e com a %4$s de %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">política de privacidade</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">política de privacidade</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Política de privacidade</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">informação de privacidade</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">termos de utilização</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2416,6 +2433,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Traduzir esta página?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Página traduzida de %1$s para %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Experimente as traduções privadas no %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2428,6 +2449,8 @@
     <string name="translations_bottom_sheet_translate_to">Traduzir para</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Agora não</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Mostrar original</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Feito</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2449,6 +2472,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Saber mais</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">A traduzir…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opções de tradução</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 93e9cd3c1..dd9f74980 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -262,6 +262,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Перевести страницу</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Страница переведена с %1$s на %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Текущий язык</string>
@@ -340,12 +345,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Уведомление о конфиденциальности Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Узнайте больше в нашем уведомлении о конфиденциальности</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Нам нравится обеспечивать вашу безопасность</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Узнайте, почему миллионы людей любят Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Безопасный веб-сёрфинг с большим выбором</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Наш браузер, поддерживаемый некоммерческой организацией, помогает не давать компаниям следить за вами в Интернете.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Более 100 миллионов человек защищают свою приватность, выбирая браузер, поддерживаемый некоммерческой организацией.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Известные трекеры? Блокируются автоматически. Расширения? Попробовать все 700. PDF-файлы? Наша встроенная программа чтения позволяет легко ими управлять.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Наш браузер, поддерживаемый некоммерческой организацией, помогает ограничивать компании от слежки за вами в Интернете.\n\nПодробнее читайте в нашем уведомлении о конфиденциальности.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -701,9 +716,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Закладки</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Пароли</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Пароли</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Пароли</string>
+    <string name="preferences_sync_logins_2">Пароли</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Открытые вкладки</string>
     <!-- Preference for signing out -->
@@ -729,9 +744,9 @@
     <string name="default_device_name_2">%1$s на %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Банковские карты</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Банковские карты</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Способы оплаты</string>
+    <string name="preferences_sync_credit_cards_2">Способы оплаты</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Адреса</string>
 
@@ -1693,13 +1708,13 @@
     <string name="add_to_homescreen_description_2">Вы можете легко добавить этот сайт на домашний экран вашего устройства, чтобы иметь к нему мгновенный доступ.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Пароли</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Пароли</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Пароли</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Пароли</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Сохранение паролей</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Сохранение паролей</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Сохранять пароли</string>
+    <string name="preferences_passwords_save_logins_2">Сохранять пароли</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Предлагать сохранить</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1714,48 +1729,48 @@
     <string name="preferences_android_autofill_description">Заполнять имена пользователей и пароли в других приложениях на вашем устройстве.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Добавить логин</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Добавить логин</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Добавить пароль</string>
+    <string name="preferences_logins_add_login_2">Добавить пароль</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Синхронизация логинов</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Синхронизировать пароли</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Синхронизация логинов</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Синхронизировать пароли</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Синхронизировать логины между устройствами</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Синхронизировать логины между устройствами</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Синхронизировать пароли между устройствами</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Синхронизировать пароли между устройствами</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Сохранённые пароли</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Сохранённые пароли</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Сохранённые пароли</string>
+    <string name="preferences_passwords_saved_logins_2">Сохранённые пароли</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Пароли, которые вы сохраняете или синхронизируете в %s, появятся тут.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Пароли, которые вы сохраняете или синхронизируете в %s, появятся тут.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Пароли, которые вы сохраните или синхронизируете в %s, будут показаны здесь. Все сохраняемые вами пароли зашифрованы.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Пароли, которые вы сохраните или синхронизируете в %s, будут показаны здесь. Все сохраняемые вами пароли зашифрованы.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Узнайте больше о синхронизации.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Узнайте больше о синхронизации.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Узнайте больше о синхронизации</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Узнайте больше о синхронизации</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Исключения</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Здесь будут показаны не сохраняемые логины и пароли.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Здесь будут показаны не сохраняемые логины и пароли.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s не будет сохранять пароли для перечисленных здесь сайтов.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s не будет сохранять пароли для перечисленных здесь сайтов.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Логины и пароли для этих сайтов сохраняться не будут.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Логины и пароли для этих сайтов сохраняться не будут.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s не будет сохранять пароли для этих сайтов.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s не будет сохранять пароли для этих сайтов.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Удалить все исключения</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Поиск логинов</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Поиск логинов</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Поиск паролей</string>
+    <string name="preferences_passwords_saved_logins_search_2">Поиск паролей</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Сайт</string>
     <!-- The header for the username for a login -->
@@ -1783,17 +1798,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Скрыть пароль</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Разблокируйте, чтобы просмотреть сохранённые пароли</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Разблокируйте, чтобы просмотреть сохранённые пароли</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Разблокируйте, чтобы просмотреть сохранённые пароли</string>
+    <string name="logins_biometric_prompt_message_2">Разблокируйте, чтобы просмотреть сохранённые пароли</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Защитите свои логины и пароли</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Защитите свои логины и пароли</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Защитите сохранённые пароли</string>
+    <string name="logins_warning_dialog_title_2">Защитите сохранённые пароли</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Настройте графический ключ, Пин-код или пароль для блокировки устройства, чтобы защитить сохранённые пароли, если кто-либо ещё получит доступ к вашему устройству.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Настройте графический ключ, Пин-код или пароль для блокировки устройства, чтобы защитить сохранённые пароли, если кто-либо ещё получит доступ к вашему устройству.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Настройте графический ключ, пин-код или пароль для разблокировки устройства, чтобы защитить сохранённые пароли на случай, если кто-либо ещё получит доступ к вашему устройству.</string>
+    <string name="logins_warning_dialog_message_2">Настройте графический ключ, пин-код или пароль для разблокировки устройства, чтобы защитить сохранённые пароли на случай, если кто-либо ещё получит доступ к вашему устройству.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Позже</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1810,10 +1825,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">По последнему использованию</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Меню сортировки логинов</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Меню сортировки логинов</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Меню сортировки паролей</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Меню сортировки паролей</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1821,43 +1836,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Адреса</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Банковские карты</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Банковские карты</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Способы оплаты</string>
+    <string name="preferences_credit_cards_2">Способы оплаты</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Сохранять и автоматически заполнять данные карт</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Сохранять и автоматически заполнять данные карт</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Сохранить и заполнять способы оплаты</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Сохранить и заполнять способы оплаты</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Данные зашифрованы</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Данные зашифрованы</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s шифрует все сохраняемые вами способы оплаты</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s шифрует все сохраняемые вами способы оплаты</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Синхронизировать карты между различными устройствами</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Синхронизировать карты</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Добавить банковскую карту</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Добавить банковскую карту</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Добавить карту</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Добавить карту</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Управление сохранёнными картами</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Управление сохранёнными картами</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Управление картами</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Управление картами</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Добавить адрес</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Управление адресами</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Сохранять и автоматически заполнять адреса</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Сохранять и автоматически заполнять адреса</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Сохранять и заполнять адреса</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Сохранять и заполнять адреса</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Включая такие сведения, как номера, адреса эл. почты и доставок</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Включая такие сведения, как номера, адреса эл. почты и доставок</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Включает номера телефонов и адреса электронной почты</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Включает номера телефонов и адреса электронной почты</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Добавить карту</string>
@@ -1878,9 +1893,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Удалить карту</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Вы уверены, что хотите удалить эту банковскую карту?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Вы уверены, что хотите удалить эту банковскую карту?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Удалить карту?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Удалить карту?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Удалить</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1893,24 +1908,24 @@
     <string name="credit_cards_saved_cards">Сохранённые карты</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Пожалуйста, введите правильный номер карты</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Пожалуйста, введите правильный номер карты</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Введите корректный номер карты</string>
+    <string name="credit_cards_number_validation_error_message_2">Введите корректный номер карты</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Пожалуйста, заполните это поле</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Пожалуйста, заполните это поле</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Добавьте имя</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Добавьте имя</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Разблокируйте, чтобы просмотреть сохранённые карты</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Защитите свои банковские карты</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Защитите свои банковские карты</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Защитите сохранённые способы оплаты</string>
+    <string name="credit_cards_warning_dialog_title_2">Защитите сохранённые способы оплаты</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Настройте графический ключ, Пин-код или пароль для блокировки устройства, чтобы защитить сохранённые банковские карты, если кто-либо ещё получит доступ к вашему устройству.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Настройте графический ключ, Пин-код или пароль для блокировки устройства, чтобы защитить сохранённые банковские карты, если кто-либо ещё получит доступ к вашему устройству.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Настройте графический ключ, Пин-код или пароль для разблокировки устройства, чтобы защитить сохранённые способы оплаты, на случай, если кто-либо ещё получит доступ к вашему устройству.</string>
+    <string name="credit_cards_warning_dialog_message_3">Настройте графический ключ, Пин-код или пароль для разблокировки устройства, чтобы защитить сохранённые способы оплаты, на случай, если кто-либо ещё получит доступ к вашему устройству.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Настроить сейчас</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1918,10 +1933,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Разблокируйте своё устройство</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Разблокируйте, чтобы использовать сохранённые данные банковской карты</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Разблокируйте, чтобы использовать сохранённые данные банковской карты</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Разблокируйте, чтобы использовать сохранённые способы оплаты</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Разблокируйте, чтобы использовать сохранённые способы оплаты</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Добавить адрес</string>
     <!-- Title of the "Edit address" screen -->
@@ -1929,11 +1944,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Управление адресами</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Имя</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Имя</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Отчество</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Отчество</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Фамилия</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Фамилия</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Название</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Улица</string>
     <!-- The header for the city of an address -->
@@ -1957,9 +1974,9 @@
     <!-- The text for the "Delete address" button for deleting an address -->
     <string name="addressess_delete_address_button">Удалить адрес</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Вы уверены, что хотите удалить этот адрес?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Вы уверены, что хотите удалить этот адрес?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Удалить этот адрес?</string>
+    <string name="addressess_confirm_dialog_message_2">Удалить этот адрес?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Удалить</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2057,49 +2074,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Править</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Вы уверены, что хотите удалить этот пароль?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Вы уверены, что хотите удалить этот пароль?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Вы уверены, что хотите удалить этот пароль?</string>
+    <string name="login_deletion_confirmation_2">Вы уверены, что хотите удалить этот пароль?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Удалить</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Отмена</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Настройки логина</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Настройки логина</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Настройки пароля</string>
+    <string name="login_options_menu_2">Настройки пароля</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Редактируемое текстовое поле для веб-адреса логина.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Редактируемое текстовое поле для веб-адреса логина.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Редактируемое текстовое поле для адреса веб-сайта.</string>
+    <string name="saved_login_hostname_description_3">Редактируемое текстовое поле для адреса веб-сайта.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Редактируемое текстовое поле для имени пользователя логина.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Редактируемое текстовое поле для имени пользователя логина.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Редактируемое текстовое поле для имени пользователя.</string>
+    <string name="saved_login_username_description_3">Редактируемое текстовое поле для имени пользователя.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Редактируемое текстовое поле для пароля логина.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Редактируемое текстовое поле для пароля логина.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Редактируемое текстовое поле для пароля.</string>
+    <string name="saved_login_password_description_2">Редактируемое текстовое поле для пароля.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Сохранить изменения в логине.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Сохранить изменения в логине.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Сохранить изменения.</string>
+    <string name="save_changes_to_login_2">Сохранить изменения.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Правка</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Правка</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Изменить пароль</string>
+    <string name="edit_2">Изменить пароль</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Добавить новый логин</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Добавить новый логин</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Добавить пароль</string>
+    <string name="add_login_2">Добавить пароль</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Требуется пароль</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Требуется пароль</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Введите пароль</string>
+    <string name="saved_login_password_required_2">Введите пароль</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Требуется имя пользователя</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Требуется имя пользователя</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Введите имя пользователя</string>
+    <string name="saved_login_username_required_2">Введите имя пользователя</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Введите имя сервера</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2212,7 +2229,7 @@
     <string name="radio_preference_info_content_description">Нажмите, чтобы узнать больше</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Перейти наверх</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Перейти наверх</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Закрыть</string>
@@ -2253,8 +2270,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Скорректированный рейтинг</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Недостоверные отзывы удалены</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">На основе достоверных отзывов</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Основные моменты из недавних обзоров</string>
@@ -2310,10 +2325,6 @@
     <string name="review_quality_check_product_availability_warning_body">Если вы увидите, что этот товар снова в наличии, сообщите об этом, и мы проверим отзывы.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Сообщить о наличии товара на складе</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Проверяем качество отзывов</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Проверяем качество отзывов</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Проверка качество отзывов (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2359,13 +2370,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Узнать больше</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Выбрав «Да, попробовать», вы соглашаетесь с %1$s принимая %2$s и %3$s от Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Выбрав «Да, попробовать», вы соглашаетесь с %1$s принимая %2$s и %3$s от Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Выбирая «Да, попробовать», вы соглашаетесь со следующим от %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Выбрав «Да, попробовать», вы соглашаетесь с %2$s %1$s и %4$s %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Выбрав «Да, попробовать», вы соглашаетесь с %2$s %1$s и %4$s %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">политику приватности</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">политику приватности</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Политика конфиденциальности</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">уведомление о конфиденциальности</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">условия использования</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2437,6 +2454,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Перевести эту страницу?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Страница переведена с %1$s на %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Попробуйте конфиденциальные переводы в %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2449,6 +2470,8 @@
     <string name="translations_bottom_sheet_translate_to">Перевести на</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Не сейчас</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Показать оригинал</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Готово</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2471,6 +2494,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Узнать больше</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Перевод…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Настройки перевода</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index f718c9bed..9ea2e40bc 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -259,6 +259,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Översätt sida</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Sida översatt från %1$s till %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valt språk</string>
@@ -337,12 +342,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox sekretessmeddelande</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Läs mer i vårt sekretessmeddelande</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Vi älskar att hålla dig säker</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Ta reda på varför miljoner älskar Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Säker surfning med flera val</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Vår icke-vinstdrivande webbläsare hjälper till att hindra företag från att i hemlighet följa dig på webben.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Mer än 100 miljoner människor skyddar sin integritet genom att välja en webbläsare som stöds av en ideell organisation.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Kända spårare? Blockeras automatiskt. Tillägg? Prova alla 700. PDF-filer? Vår inbyggda läsare gör dem enklare att hantera.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Vår icke-vinstdrivande webbläsare hjälper till att hindra företag från att följa dig i hemlighet på webben.\n\nLäs mer i vårt sekretessmeddelande.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -699,9 +714,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Bokmärken</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Inloggningar</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Inloggningar</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Lösenord</string>
+    <string name="preferences_sync_logins_2">Lösenord</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Öppna flikar</string>
     <!-- Preference for signing out -->
@@ -728,9 +743,9 @@
     <string name="default_device_name_2">%1$s på %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Kreditkort</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditkort</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Betalningsmetoder</string>
+    <string name="preferences_sync_credit_cards_2">Betalningsmetoder</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresser</string>
 
@@ -1679,13 +1694,13 @@
     <string name="add_to_homescreen_description_2">Du kan enkelt lägga till den här webbplatsen på enhetens startskärm för att få direktåtkomst och surfa snabbare med en appliknande upplevelse.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Inloggningar och lösenord</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Inloggningar och lösenord</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Lösenord</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Lösenord</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Spara inloggningar och lösenord</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Spara inloggningar och lösenord</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Spara lösenord</string>
+    <string name="preferences_passwords_save_logins_2">Spara lösenord</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Fråga för att spara</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1700,48 +1715,48 @@
     <string name="preferences_android_autofill_description">Fyll i användarnamn och lösenord i andra appar på din enhet.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Lägg till inloggning</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Lägg till inloggning</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Lägg till lösenord</string>
+    <string name="preferences_logins_add_login_2">Lägg till lösenord</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Synkronisera inloggningar</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synkronisera lösenord</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Synkronisera inloggningar</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Synkronisera lösenord</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Synkronisera inloggningar mellan enheter</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Synkronisera inloggningar mellan enheter</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synkronisera lösenord mellan enheter</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Synkronisera lösenord mellan enheter</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Sparade inloggningar</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sparade inloggningar</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Sparade lösenord</string>
+    <string name="preferences_passwords_saved_logins_2">Sparade lösenord</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">De inloggningar som du sparar eller synkroniserar till %s kommer att dyka upp här.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">De inloggningar som du sparar eller synkroniserar till %s kommer att dyka upp här.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Lösenorden du sparar eller synkroniserar till %s kommer att listas här. Alla lösenord du sparar är krypterade.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Lösenorden du sparar eller synkroniserar till %s kommer att listas här. Alla lösenord du sparar är krypterade.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Läs mer om Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Läs mer om Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Läs mer om synkronisering</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Läs mer om synkronisering</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Undantag</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Inloggningar och lösenord som inte sparas visas här.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Inloggningar och lösenord som inte sparas visas här.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s kommer inte att spara lösenord för webbplatser som listas här.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s kommer inte att spara lösenord för webbplatser som listas här.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Inloggningar och lösenord sparas inte för dessa webbplatser.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Inloggningar och lösenord sparas inte för dessa webbplatser.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s kommer inte att spara lösenord för dessa webbplatser.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s kommer inte att spara lösenord för dessa webbplatser.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Ta bort alla undantag</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Sök inloggningar</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Sök inloggningar</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Sök efter lösenord</string>
+    <string name="preferences_passwords_saved_logins_search_2">Sök efter lösenord</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Webbplats</string>
     <!-- The header for the username for a login -->
@@ -1769,17 +1784,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Dölj lösenord</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Lås upp för att se dina sparade inloggningar</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Lås upp för att se dina sparade inloggningar</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Lås upp för att se dina sparade lösenord</string>
+    <string name="logins_biometric_prompt_message_2">Lås upp för att se dina sparade lösenord</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Säkra dina inloggningar och lösenord</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Säkra dina inloggningar och lösenord</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Säkra dina sparade lösenord</string>
+    <string name="logins_warning_dialog_title_2">Säkra dina sparade lösenord</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Konfigurera enhetens låsmönster, PIN eller lösenord för att skydda dina sparade inloggningar och lösenord från åtkomst om någon annan har din enhet.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Konfigurera enhetens låsmönster, PIN eller lösenord för att skydda dina sparade inloggningar och lösenord från åtkomst om någon annan har din enhet.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Konfigurera ett enhetslåsmönster, PIN-kod eller lösenord för att skydda dina sparade lösenord från åtkomst om någon annan använder din enhet.</string>
+    <string name="logins_warning_dialog_message_2">Konfigurera ett enhetslåsmönster, PIN-kod eller lösenord för att skydda dina sparade lösenord från åtkomst om någon annan använder din enhet.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Senare</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1796,10 +1811,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Senast använd</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sortera inloggningsmenyn</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Sortera inloggningsmenyn</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menyn sortera lösenord</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menyn sortera lösenord</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1807,43 +1822,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adresser</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Kreditkort</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditkort</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Betalningsmetoder</string>
+    <string name="preferences_credit_cards_2">Betalningsmetoder</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Spara och fyll i kreditkort automatiskt</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Spara och fyll i kreditkort automatiskt</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Spara och fyll i betalningsmetoder</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Spara och fyll i betalningsmetoder</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data är krypterad</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Data är krypterad</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s krypterar alla betalningsmetoder som du sparar</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s krypterar alla betalningsmetoder som du sparar</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synkronisera kort mellan enheter</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Synkronisera kort</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Lägg till kreditkort</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Lägg till kreditkort</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Lägg till kort</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Lägg till kort</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Hantera sparade kreditkort</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Hantera sparade kreditkort</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Hantera kort</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Hantera kort</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Lägg till adress</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Hantera adresser</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Spara och fyll i adresser automatiskt</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Spara och fyll i adresser automatiskt</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Spara och fyll i adresser</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Spara och fyll i adresser</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Inkludera information som nummer, e-post och leveransadresser</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Inkludera information som nummer, e-post och leveransadresser</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Inkluderar telefonnummer och e-postadresser</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Inkluderar telefonnummer och e-postadresser</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Lägg till kreditkort</string>
@@ -1864,9 +1879,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Ta bort kort</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Är du säker på att du vill ta bort det här kreditkortet?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Är du säker på att du vill ta bort det här kreditkortet?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Ta bort kort?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Ta bort kort?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Ta bort</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1880,24 +1895,24 @@
     <string name="credit_cards_saved_cards">Sparade kreditkort</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Ange ett giltigt kreditkortsnummer</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ange ett giltigt kreditkortsnummer</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Ange ett giltigt kortnummer</string>
+    <string name="credit_cards_number_validation_error_message_2">Ange ett giltigt kortnummer</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Fyll i det här fältet</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Fyll i det här fältet</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Lägg till ett namn</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Lägg till ett namn</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Lås upp för att se dina sparade kreditkort</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Säkra dina kreditkort</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Säkra dina kreditkort</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Säkra dina sparade betalningsmetoder</string>
+    <string name="credit_cards_warning_dialog_title_2">Säkra dina sparade betalningsmetoder</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Konfigurera enhetens låsmönster, PIN eller lösenord för att skydda dina sparade kreditkort från åtkomst om någon annan har din enhet.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Konfigurera enhetens låsmönster, PIN eller lösenord för att skydda dina sparade kreditkort från åtkomst om någon annan har din enhet.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Konfigurera ett enhetslåsmönster, PIN-kod eller lösenord för att skydda dina sparade betalningsmetoder från att användas om någon annan har din enhet.</string>
+    <string name="credit_cards_warning_dialog_message_3">Konfigurera ett enhetslåsmönster, PIN-kod eller lösenord för att skydda dina sparade betalningsmetoder från att användas om någon annan har din enhet.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Konfigurera nu</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1906,10 +1921,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Lås upp din enhet</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Lås upp för att använda lagrad kreditkortsinformation</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Lås upp för att använda lagrad kreditkortsinformation</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Lås upp för att använda sparade betalningsmetoder</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Lås upp för att använda sparade betalningsmetoder</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Lägg till adress</string>
     <!-- Title of the "Edit address" screen -->
@@ -1917,11 +1932,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Hantera adresser</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Förnamn</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Förnamn</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Mellannamn</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Mellannamn</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Efternamn</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Efternamn</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Namn</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Gatuadress</string>
     <!-- The header for the city of an address -->
@@ -1946,9 +1963,9 @@
     <string name="addressess_delete_address_button">Ta bort adress</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Är du säker på att du vill ta bort den här adressen?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Är du säker på att du vill ta bort den här adressen?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Ta bort den här adressen?</string>
+    <string name="addressess_confirm_dialog_message_2">Ta bort den här adressen?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Ta bort</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2047,49 +2064,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Redigera</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Är du säker på att du vill ta bort den här inloggningen?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Är du säker på att du vill ta bort den här inloggningen?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Är du säker på att du vill ta bort det här lösenordet?</string>
+    <string name="login_deletion_confirmation_2">Är du säker på att du vill ta bort det här lösenordet?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Ta bort</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Avbryt</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Inloggningsalternativ</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Inloggningsalternativ</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Lösenordsalternativ</string>
+    <string name="login_options_menu_2">Lösenordsalternativ</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Det redigerbara textfältet för inloggningens webbadress.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Det redigerbara textfältet för inloggningens webbadress.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Det redigerbara textfältet för webbplatsadressen.</string>
+    <string name="saved_login_hostname_description_3">Det redigerbara textfältet för webbplatsadressen.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Det redigerbara textfältet för inloggningens användarnamn.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Det redigerbara textfältet för inloggningens användarnamn.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Det redigerbara textfältet för användarnamnet.</string>
+    <string name="saved_login_username_description_3">Det redigerbara textfältet för användarnamnet.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Det redigerbara textfältet för inloggningens lösenord.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Det redigerbara textfältet för inloggningens lösenord.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Det redigerbara textfältet för lösenordet.</string>
+    <string name="saved_login_password_description_2">Det redigerbara textfältet för lösenordet.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Spara ändringar för inloggning.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Spara ändringar för inloggning.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Spara ändringar.</string>
+    <string name="save_changes_to_login_2">Spara ändringar.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Redigera</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Redigera</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Redigera lösenord</string>
+    <string name="edit_2">Redigera lösenord</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Lägg till ny inloggning</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Lägg till ny inloggning</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Lägg till lösenord</string>
+    <string name="add_login_2">Lägg till lösenord</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Lösenord krävs</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Lösenord krävs</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Ange ett lösenord</string>
+    <string name="saved_login_password_required_2">Ange ett lösenord</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Användarnamn krävs</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Användarnamn krävs</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Ange ett användarnamn</string>
+    <string name="saved_login_username_required_2">Ange ett användarnamn</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Värdnamn krävs</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2201,7 +2218,7 @@
     <string name="radio_preference_info_content_description">Klicka för mer information</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Navigera uppåt</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Navigera uppåt</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Stäng</string>
@@ -2242,8 +2259,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Justerat betyg</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Opålitliga recensioner har tagits bort</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Baserat på tillförlitliga recensioner</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Höjdpunkter från de senaste recensionerna</string>
@@ -2299,10 +2314,6 @@
     <string name="review_quality_check_product_availability_warning_body">Om du ser att den här produkten finns i lager igen, rapportera det så jobbar vi med att kontrollera recensionerna.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Rapportera att produkten finns i lager</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Kontrollerar recensionens kvalitet</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Kontrollerar recensionens kvalitet</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Kontrollerar recensionskvalitet (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2348,13 +2359,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Läs mer</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Genom att välja &quot;Ja, prova den&quot; godkänner du %1$s av Mozillas %2$s och %3$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Genom att välja &quot;Ja, prova den&quot; godkänner du %1$s av Mozillas %2$s och %3$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Genom att välja &quot;Ja, prova den&quot; godkänner du följande från %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Genom att välja &quot;Ja, prova den&quot; godkänner du %1$s %2$s och %3$s %4$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Genom att välja &quot;Ja, prova den&quot; godkänner du %1$s %2$s och %3$s %4$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">sekretesspolicy</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">sekretesspolicy</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Sekretesspolicy</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">sekretessmeddelande</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">användarvillkor</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2425,6 +2442,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Översätt den här sidan?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Sida översatt från %1$s till %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Prova privata översättningar i %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2437,6 +2458,8 @@
     <string name="translations_bottom_sheet_translate_to">Översätt till</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Inte nu</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Visa original</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Klar</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2461,6 +2484,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Läs mer</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Översätter…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Översättningsalternativ</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 747d55275..3e0899c6d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -255,6 +255,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Sayfayı çevir</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Sayfa %1$s dilinden %2$s diline çevrildi.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Seçili dil</string>
@@ -333,7 +338,6 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox gizlilik bildirimi</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Sizi güvende tutmayı seviyoruz</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
@@ -694,9 +698,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Yer imleri</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Hesaplar</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Hesaplar</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Parolalar</string>
+    <string name="preferences_sync_logins_2">Parolalar</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Açık sekmeler</string>
     <!-- Preference for signing out -->
@@ -722,9 +726,9 @@
     <string name="default_device_name_2">%1$s - %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Kredi kartları</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kredi kartları</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Ödeme yöntemleri</string>
+    <string name="preferences_sync_credit_cards_2">Ödeme yöntemleri</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresler</string>
 
@@ -1668,13 +1672,13 @@
     <string name="add_to_homescreen_description_2">Bu siteyi cihazınızın ana ekranına ekleyerek ona hızlıca erişebilir, site bir uygulamaymış gibi daha hızlı gezinti yapabilirsiniz.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Hesaplar ve parolalar</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Hesaplar ve parolalar</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Parolalar</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Parolalar</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Kullanıcı adı ve parolaları kaydet</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Kullanıcı adı ve parolaları kaydet</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Parolaları kaydet</string>
+    <string name="preferences_passwords_save_logins_2">Parolaları kaydet</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Kaydetmeyi sor</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1689,47 +1693,47 @@
     <string name="preferences_android_autofill_description">Cihazınızdaki diğer uygulamalarda kullanıcı adı ve parolalar doldurulsun.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Hesap ekle</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Hesap ekle</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Parola ekle</string>
+    <string name="preferences_logins_add_login_2">Parola ekle</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Hesapları eşitle</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Parolaları eşitle</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Hesapları eşitle</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Parolaları eşitle</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Hesapları cihazlar arasında eşitle</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Hesapları cihazlar arasında eşitle</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Parolaları cihazlar arasında eşitle</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Parolaları cihazlar arasında eşitle</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Kayıtlı hesaplar</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Kayıtlı hesaplar</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Kayıtlı parolalar</string>
+    <string name="preferences_passwords_saved_logins_2">Kayıtlı parolalar</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Kaydettiğiniz veya %s ile eşitlediğiniz hesaplar burada görünecektir.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Kaydettiğiniz veya %s ile eşitlediğiniz hesaplar burada görünecektir.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">%s tarayıcısına kaydettiğiniz veya eşitlediğiniz parolalar burada listelenecektir. Kaydettiğiniz tüm parolalar şifrelenir.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">%s tarayıcısına kaydettiğiniz veya eşitlediğiniz parolalar burada listelenecektir. Kaydettiğiniz tüm parolalar şifrelenir.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Sync hakkında bilgi alın.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Sync hakkında bilgi alın.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Eşitlemeyle ilgili bilgi al</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Eşitlemeyle ilgili bilgi al</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">İstisnalar</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Kaydedilmeyen hesaplar ve parolalar burada görünecektir.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Kaydedilmeyen hesaplar ve parolalar burada görünecektir.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s, burada listelenen sitelerin parolalarını kaydetmeyecektir.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s, burada listelenen sitelerin parolalarını kaydetmeyecektir.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Bu sitelere ait hesaplar ve parolalar kaydedilmeyecektir.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Bu sitelere ait hesaplar ve parolalar kaydedilmeyecektir.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s bu sitelerin parolalarını kaydetmeyecektir.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s bu sitelerin parolalarını kaydetmeyecektir.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Tüm istisnaları sil</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Hesaplarda ara</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Hesaplarda ara</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Parolalarda ara</string>
+    <string name="preferences_passwords_saved_logins_search_2">Parolalarda ara</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Site</string>
     <!-- The header for the username for a login -->
@@ -1757,17 +1761,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Parolayı gizle</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Kayıtlı hesaplarınızı görmek için kilidi açın</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Kayıtlı hesaplarınızı görmek için kilidi açın</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Kayıtlı parolalarınızı görmek için kilidi açın</string>
+    <string name="logins_biometric_prompt_message_2">Kayıtlı parolalarınızı görmek için kilidi açın</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Hesaplarınızı güvence altına alın</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Hesaplarınızı güvence altına alın</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Kayıtlı parolalarınızı güvence altına alın</string>
+    <string name="logins_warning_dialog_title_2">Kayıtlı parolalarınızı güvence altına alın</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Cihazınız başka birinin eline geçerse kayıtlı hesaplarına erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Cihazınız başka birinin eline geçerse kayıtlı hesaplarına erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Cihazınız başka birinin eline geçerse kayıtlı parolalarınıza erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
+    <string name="logins_warning_dialog_message_2">Cihazınız başka birinin eline geçerse kayıtlı parolalarınıza erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Daha sonra</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1785,10 +1789,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Son kullanım</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Hesapları sırala menüsü</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Hesapları sırala menüsü</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Parolaları sırala menüsü</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Parolaları sırala menüsü</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1796,43 +1800,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adresler</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Kredi kartları</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kredi kartları</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Ödeme yöntemleri</string>
+    <string name="preferences_credit_cards_2">Ödeme yöntemleri</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Kartları kaydedip otomatik doldur</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kartları kaydedip otomatik doldur</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Ödeme yöntemlerini kaydet ve doldur</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Ödeme yöntemlerini kaydet ve doldur</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Veriler şifrelenir</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Veriler şifrelenir</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s kaydettiğiniz tüm ödeme yöntemlerini şifreler</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s kaydettiğiniz tüm ödeme yöntemlerini şifreler</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Kartları cihazlar arasında eşitle</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Kartları eşitle</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Kredi kartı ekle</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Kredi kartı ekle</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Kart ekle</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Kart ekle</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Kayıtlı kartları yönet</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kayıtlı kartları yönet</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Kartları yönet</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Kartları yönet</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adres ekle</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Adresleri yönet</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Adresleri kaydedip otomatik doldur</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Adresleri kaydedip otomatik doldur</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Adresleri kaydet ve doldur</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Adresleri kaydet ve doldur</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Numaralar, e-posta ve gönderim adresleri gibi bilgileri dahil et</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Numaralar, e-posta ve gönderim adresleri gibi bilgileri dahil et</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Telefon numaraları ve e-posta adresleri de dahildir</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Telefon numaraları ve e-posta adresleri de dahildir</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Kart ekle</string>
@@ -1853,9 +1857,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Kartı sil</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Bu kredi kartını silmek istediğinizden emin misiniz?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Bu kredi kartını silmek istediğinizden emin misiniz?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Kart silinsin mi?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Kart silinsin mi?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Sil</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1869,24 +1873,24 @@
     <string name="credit_cards_saved_cards">Kayıtlı kartlar</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Lütfen geçerli bir kredi kartı numarası girin</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Lütfen geçerli bir kredi kartı numarası girin</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Geçerli bir kart numarası girin</string>
+    <string name="credit_cards_number_validation_error_message_2">Geçerli bir kart numarası girin</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Lütfen bu alanı doldurun</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Lütfen bu alanı doldurun</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Adınızı yazın</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Adınızı yazın</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Kayıtlı kartlarınızı görmek için kilidi açın</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Kredi kartlarını güvence altına al</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Kredi kartlarını güvence altına al</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Kayıtlı ödeme yöntemlerinizi güvence altına alın</string>
+    <string name="credit_cards_warning_dialog_title_2">Kayıtlı ödeme yöntemlerinizi güvence altına alın</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Cihazınız başka birinin eline geçerse kayıtlı kartlarınıza erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Cihazınız başka birinin eline geçerse kayıtlı kartlarınıza erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Cihazınız başka birinin eline geçerse kayıtlı ödeme yöntemlerinize erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
+    <string name="credit_cards_warning_dialog_message_3">Cihazınız başka birinin eline geçerse kayıtlı ödeme yöntemlerinize erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Hemen ayarla</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1895,10 +1899,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Cihazınızın kilidini açın</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Depolanan kredi kartı bilgilerini kullanmak için kilidi açın</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Depolanan kredi kartı bilgilerini kullanmak için kilidi açın</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Kayıtlı ödeme yöntemlerinizi kullanmak için kilidi açın</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Kayıtlı ödeme yöntemlerinizi kullanmak için kilidi açın</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adres ekle</string>
     <!-- Title of the "Edit address" screen -->
@@ -1906,11 +1910,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Adresleri yönet</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Ad</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Ad</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">İkinci ad</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">İkinci ad</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Soyadı</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Soyadı</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Ad</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Sokak adresi</string>
     <!-- The header for the city of an address -->
@@ -1935,9 +1941,9 @@
     <string name="addressess_delete_address_button">Adresi sil</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Bu adresi silmek istediğinizden emin misiniz?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Bu adresi silmek istediğinizden emin misiniz?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Bu adres silinsin mi?</string>
+    <string name="addressess_confirm_dialog_message_2">Bu adres silinsin mi?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Sil</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2035,49 +2041,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Düzenle</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Bu hesabı silmek istediğinizden emin misiniz?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Bu hesabı silmek istediğinizden emin misiniz?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Bu parolayı silmek istediğinizden emin misiniz?</string>
+    <string name="login_deletion_confirmation_2">Bu parolayı silmek istediğinizden emin misiniz?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Sil</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Vazgeç</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Hesap seçenekleri</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Hesap seçenekleri</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Parola seçenekleri</string>
+    <string name="login_options_menu_2">Parola seçenekleri</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Hesabın web adresi için düzenlenebilir metin alanı.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Hesabın web adresi için düzenlenebilir metin alanı.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Web sitesi adresi için düzenlenebilir metin alanı.</string>
+    <string name="saved_login_hostname_description_3">Web sitesi adresi için düzenlenebilir metin alanı.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Hesabın kullanıcı adı için düzenlenebilir metin alanı.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Hesabın kullanıcı adı için düzenlenebilir metin alanı.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Kullanıcı adı için düzenlenebilir metin alanı.</string>
+    <string name="saved_login_username_description_3">Kullanıcı adı için düzenlenebilir metin alanı.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Hesabın parolası için düzenlenebilir metin alanı.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Hesabın parolası için düzenlenebilir metin alanı.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Parola için düzenlenebilir metin alanı.</string>
+    <string name="saved_login_password_description_2">Parola için düzenlenebilir metin alanı.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Değişiklikleri hesaba kaydet.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Değişiklikleri hesaba kaydet.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Değişiklikleri kaydet.</string>
+    <string name="save_changes_to_login_2">Değişiklikleri kaydet.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Düzenle</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Düzenle</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Parola düzenle</string>
+    <string name="edit_2">Parola düzenle</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Yeni hesap ekle</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Yeni hesap ekle</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Parola ekle</string>
+    <string name="add_login_2">Parola ekle</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Parola gerekli</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Parola gerekli</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Parolayı girin</string>
+    <string name="saved_login_password_required_2">Parolayı girin</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Kullanıcı adı gereklidir</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Kullanıcı adı gereklidir</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Kullanıcı adını girin</string>
+    <string name="saved_login_username_required_2">Kullanıcı adını girin</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Sunucu gereklidir</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2189,7 +2195,7 @@
     <string name="radio_preference_info_content_description">Ayrıntılar için tıklayın</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Yukarı</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Yukarı</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Kapat</string>
@@ -2230,8 +2236,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Düzeltilmiş puan</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Güvenilmez değerlendirmeler kaldırıldı</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Güvenilir değerlendirmelere dayanarak</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Öne çıkan son değerlendirmeler</string>
@@ -2287,10 +2291,6 @@
     <string name="review_quality_check_product_availability_warning_body">Bu ürünün yeniden stoka girdiğini görürseniz bize bildirin, biz de değerlendirmeleri kontrol etmeye çalışalım.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Ürünün stokta olduğunu bildir</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Değerlendirme kalitesi kontrol ediliyor</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Değerlendirme kalitesi kontrol ediliyor</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Değerlendirme kalitesi kontrol ediliyor (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2336,13 +2336,15 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Daha fazla bilgi alın</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">“Evet, deneyeceğim”i seçtiğinizde Mozilla %1$s %2$s ve %3$snı kabul etmiş olursunuz.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">“Evet, deneyeceğim”i seçtiğinizde Mozilla %1$s %2$s ve %3$snı kabul etmiş olursunuz.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">“Evet, deneyeceğim”i seçtiğinizde %1$s için şunları kabul etmiş olursunuz:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">gizlilik politikası</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">gizlilik politikası</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Gizlilik politikası</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">gizlilik bildirimi</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">kullanım koşulları</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2416,6 +2418,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Bu sayfa çevrilsin mi?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Sayfa %1$s dilinden %2$s diline çevrildi</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">%1$s ile gizli çevirileri deneyin</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2428,6 +2434,8 @@
     <string name="translations_bottom_sheet_translate_to">Bu dile</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Şimdi değil</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Orijinalini göster</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Tamam</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2450,6 +2458,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Daha fazla bilgi al</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Çevriliyor…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Çeviri Seçenekleri</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 1b7a232b0..4dcf33075 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -253,6 +253,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Dịch trang</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Đã dịch trang từ %1$s sang %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Ngôn ngữ được chọn</string>
@@ -330,12 +335,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Thông báo về quyền riêng tư Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Tìm hiểu thêm trong thông báo bảo mật của chúng tôi</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Chúng tôi thích giữ an toàn cho bạn</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Tìm hiểu lý do tại sao hàng triệu người thích Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Duyệt web an toàn với nhiều lựa chọn hơn</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Trình duyệt được hỗ trợ phi lợi nhuận của chúng tôi giúp ngăn các công ty bí mật theo dõi bạn trên web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Hơn 100 triệu người bảo vệ quyền riêng tư của mình bằng cách chọn trình duyệt được hỗ trợ bởi tổ chức phi lợi nhuận.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Trình theo dõi được biết đến? Sẽ bị chặn tự động. Tiện ích mở rộng? Hãy thử tất cả 700 cái. Đọc PDF? Trình đọc tích hợp của chúng tôi giúp bạn dễ dàng quản lý chúng.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Trình duyệt được tài trợ bởi tổ chức phi lợi nhuận của chúng tôi giúp ngăn các công ty bí mật theo dõi bạn trên web.\n\nTìm hiểu thêm về thông báo quyền riêng tư của chúng tôi.
 </string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
@@ -689,9 +704,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Dấu trang</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Đăng nhập</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Đăng nhập</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Mật khẩu</string>
+    <string name="preferences_sync_logins_2">Mật khẩu</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Các thẻ đang mở</string>
     <!-- Preference for signing out -->
@@ -717,9 +732,9 @@
     <string name="default_device_name_2">%1$s trên %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Thẻ tín dụng</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Thẻ tín dụng</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Phương thức thanh toán</string>
+    <string name="preferences_sync_credit_cards_2">Phương thức thanh toán</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Địa chỉ</string>
 
@@ -1653,13 +1668,13 @@
     <string name="add_to_homescreen_description_2">Bạn có thể dễ dàng thêm trang web vào màn hình chính thiết bị của bạn để có thể truy cập và duyệt web nhanh hơn với trải nghiệm giống như trên ứng dụng.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Thông tin đăng nhập và mật khẩu</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Thông tin đăng nhập và mật khẩu</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Mật khẩu</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Mật khẩu</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Lưu thông tin đăng nhập và mật khẩu</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Lưu thông tin đăng nhập và mật khẩu</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Lưu mật khẩu</string>
+    <string name="preferences_passwords_save_logins_2">Lưu mật khẩu</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Yêu cầu để lưu</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1674,48 +1689,48 @@
     <string name="preferences_android_autofill_description">Điền tên người dùng và mật khẩu vào các ứng dụng khác trên thiết bị của bạn.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Thêm thông tin đăng nhập</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Thêm thông tin đăng nhập</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Thêm mật khẩu</string>
+    <string name="preferences_logins_add_login_2">Thêm mật khẩu</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Đồng bộ hóa thông tin đăng nhập</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Đồng bộ mật khẩu</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Đồng bộ hóa thông tin đăng nhập</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Đồng bộ mật khẩu</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Đồng bộ hóa thông tin đăng nhập trên các thiết bị</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Đồng bộ hóa thông tin đăng nhập trên các thiết bị</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Đồng bộ hóa mật khẩu giữa các thiết bị</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Đồng bộ hóa mật khẩu giữa các thiết bị</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Thông tin đăng nhập đã lưu</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Thông tin đăng nhập đã lưu</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Mật khẩu đã lưu</string>
+    <string name="preferences_passwords_saved_logins_2">Mật khẩu đã lưu</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Thông tin đăng nhập bạn lưu hoặc đồng bộ hóa với %s sẽ hiển thị tại đây.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Thông tin đăng nhập bạn lưu hoặc đồng bộ hóa với %s sẽ hiển thị tại đây.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Mật khẩu bạn lưu hoặc đồng bộ hóa với %s sẽ được liệt kê ở đây. Tất cả mật khẩu bạn lưu đều được mã hóa.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Mật khẩu bạn lưu hoặc đồng bộ hóa với %s sẽ được liệt kê ở đây. Tất cả mật khẩu bạn lưu đều được mã hóa.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Tìm hiểu thêm về đồng bộ hóa.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Tìm hiểu thêm về đồng bộ hóa.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Tìm hiểu thêm về đồng bộ hoá</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Tìm hiểu thêm về đồng bộ hoá</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Ngoại lệ</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Thông tin đăng nhập và mật khẩu không được lưu sẽ được hiển thị ở đây.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Thông tin đăng nhập và mật khẩu không được lưu sẽ được hiển thị ở đây.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s sẽ không lưu mật khẩu cho các trang được liệt kê ở đây.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s sẽ không lưu mật khẩu cho các trang được liệt kê ở đây.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Thông tin đăng nhập và mật khẩu sẽ không được lưu cho các trang web này.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Thông tin đăng nhập và mật khẩu sẽ không được lưu cho các trang web này.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s sẽ không lưu mật khẩu cho các trang web này.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s sẽ không lưu mật khẩu cho các trang web này.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Xóa tất cả ngoại lệ</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Tìm thông tin đăng nhập</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Tìm thông tin đăng nhập</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Tìm kiếm mật khẩu</string>
+    <string name="preferences_passwords_saved_logins_search_2">Tìm kiếm mật khẩu</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Trang</string>
     <!-- The header for the username for a login -->
@@ -1743,17 +1758,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Ẩn mật khẩu</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Mở khóa để xem thông tin đăng nhập đã lưu của bạn</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Mở khóa để xem thông tin đăng nhập đã lưu của bạn</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Mở khóa để xem mật khẩu đã lưu của bạn</string>
+    <string name="logins_biometric_prompt_message_2">Mở khóa để xem mật khẩu đã lưu của bạn</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Bảo mật thông tin đăng nhập và mật khẩu của bạn</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Bảo mật thông tin đăng nhập và mật khẩu của bạn</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Giữ mật khẩu đã lưu của bạn một cách an toàn</string>
+    <string name="logins_warning_dialog_title_2">Giữ mật khẩu đã lưu của bạn một cách an toàn</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Thiết lập mẫu khóa thiết bị, mã PIN hoặc mật khẩu để bảo vệ thông tin đăng nhập và mật khẩu đã lưu của bạn khỏi bị truy cập nếu người khác lấy được thiết bị của bạn.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Thiết lập mẫu khóa thiết bị, mã PIN hoặc mật khẩu để bảo vệ thông tin đăng nhập và mật khẩu đã lưu của bạn khỏi bị truy cập nếu người khác lấy được thiết bị của bạn.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Đặt mật khẩu thiết bị dạng mẫu hình, mã PIN hoặc mật khẩu để bảo vệ mật khẩu đã lưu của bạn không bị truy cập nếu người khác lấy được thiết bị của bạn.</string>
+    <string name="logins_warning_dialog_message_2">Đặt mật khẩu thiết bị dạng mẫu hình, mã PIN hoặc mật khẩu để bảo vệ mật khẩu đã lưu của bạn không bị truy cập nếu người khác lấy được thiết bị của bạn.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Để sau</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1770,10 +1785,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Sử dụng lần cuối</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sắp xếp menu đăng nhập</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Sắp xếp menu đăng nhập</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu sắp xếp mật khẩu</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menu sắp xếp mật khẩu</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1781,43 +1796,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Địa chỉ</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Thẻ tín dụng</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Thẻ tín dụng</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Phương thức thanh toán</string>
+    <string name="preferences_credit_cards_2">Phương thức thanh toán</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Lưu và tự động điền thẻ tín dụng</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Lưu và tự động điền thẻ tín dụng</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Lưu và điền phương thức thanh toán</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Lưu và điền phương thức thanh toán</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Dữ liệu được mã hóa</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Dữ liệu được mã hóa</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s mã hóa tất cả các phương thức thanh toán bạn lưu</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s mã hóa tất cả các phương thức thanh toán bạn lưu</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Đồng bộ thông tin thẻ tín dụng trên các thiết bị</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Đồng bộ hóa thẻ tín dụng</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Thêm thẻ tín dụng</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Thêm thẻ tín dụng</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Thêm thẻ</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Thêm thẻ</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Quản lý thẻ tín dụng đã lưu</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Quản lý thẻ tín dụng đã lưu</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Quản lý thẻ tín dụng</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Quản lý thẻ tín dụng</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Thêm địa chỉ</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Quản lý địa chỉ</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Lưu và tự động điền địa chỉ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Lưu và tự động điền địa chỉ</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Lưu và điền địa chỉ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Lưu và điền địa chỉ</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Bao gồm thông tin như số, email và địa chỉ giao hàng</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Bao gồm thông tin như số, email và địa chỉ giao hàng</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Bao gồm số điện thoại và địa chỉ email</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Bao gồm số điện thoại và địa chỉ email</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Thêm thẻ</string>
@@ -1838,9 +1853,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Xóa thẻ</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Bạn có chắc chắn muốn xóa thẻ tín dụng này không?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Bạn có chắc chắn muốn xóa thẻ tín dụng này không?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Xoá thẻ?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Xoá thẻ?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Xóa</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1854,24 +1869,24 @@
     <string name="credit_cards_saved_cards">Thẻ tín dụng đã lưu</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Vui lòng nhập số thẻ tín dụng hợp lệ</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Vui lòng nhập số thẻ tín dụng hợp lệ</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Nhập số thẻ hợp lệ</string>
+    <string name="credit_cards_number_validation_error_message_2">Nhập số thẻ hợp lệ</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Vui lòng điền vào trường này</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Vui lòng điền vào trường này</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Thêm tên</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Thêm tên</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Mở khóa để xem các thẻ tín dụng đã lưu của bạn</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Bảo mật thẻ tín dụng của bạn</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Bảo mật thẻ tín dụng của bạn</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Giữ các phương thức thanh toán đã lưu của bạn một cách an toàn</string>
+    <string name="credit_cards_warning_dialog_title_2">Giữ các phương thức thanh toán đã lưu của bạn một cách an toàn</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Thiết lập màn hình khóa thiết bị với mẫu hình, mã PIN hoặc mật khẩu để bảo vệ thẻ tín dụng đã lưu của bạn không bị truy cập nếu người khác có thiết bị của bạn.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Thiết lập màn hình khóa thiết bị với mẫu hình, mã PIN hoặc mật khẩu để bảo vệ thẻ tín dụng đã lưu của bạn không bị truy cập nếu người khác có thiết bị của bạn.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Đặt mật khẩu thiết bị dạng mẫu hình, mã PIN hoặc mật khẩu để bảo vệ phương thức thanh toán đã lưu của bạn không bị truy cập nếu người khác lấy đuọc thiết bị của bạn.</string>
+    <string name="credit_cards_warning_dialog_message_3">Đặt mật khẩu thiết bị dạng mẫu hình, mã PIN hoặc mật khẩu để bảo vệ phương thức thanh toán đã lưu của bạn không bị truy cập nếu người khác lấy đuọc thiết bị của bạn.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Thiết lập ngay</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1879,10 +1894,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Mở khóa thiết bị của bạn</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Mở khóa để sử dụng thông tin thẻ tín dụng được lưu trữ</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Mở khóa để sử dụng thông tin thẻ tín dụng được lưu trữ</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Mở khóa để sử dụng các phương thức thanh toán đã lưu</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Mở khóa để sử dụng các phương thức thanh toán đã lưu</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Thêm địa chỉ</string>
     <!-- Title of the "Edit address" screen -->
@@ -1890,11 +1905,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Quản lý địa chỉ</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Tên</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Tên</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Tên đệm</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Tên đệm</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Họ</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Họ</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Tên</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Địa chỉ đường phố</string>
     <!-- The header for the city of an address -->
@@ -1919,9 +1936,9 @@
     <string name="addressess_delete_address_button">Xóa địa chỉ</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Bạn có chắc chắn muốn xóa địa chỉ này không?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Bạn có chắc chắn muốn xóa địa chỉ này không?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Xoá địa chỉ này?</string>
+    <string name="addressess_confirm_dialog_message_2">Xoá địa chỉ này?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Xóa</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2019,49 +2036,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Chỉnh sửa</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Bạn có chắc chắn muốn xóa thông tin đăng nhập này không?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Bạn có chắc chắn muốn xóa thông tin đăng nhập này không?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Bạn có chắc chắn muốn xóa mật khẩu này?</string>
+    <string name="login_deletion_confirmation_2">Bạn có chắc chắn muốn xóa mật khẩu này?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Xóa</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Hủy bỏ</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Tùy chọn thông tin đăng nhập</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Tùy chọn thông tin đăng nhập</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Cài đặt mật khẩu</string>
+    <string name="login_options_menu_2">Cài đặt mật khẩu</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Trường văn bản có thể chỉnh sửa cho địa chỉ web của thông tin đăng nhập.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Trường văn bản có thể chỉnh sửa cho địa chỉ web của thông tin đăng nhập.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Trường văn bản có thể chỉnh sửa cho địa chỉ trang web.</string>
+    <string name="saved_login_hostname_description_3">Trường văn bản có thể chỉnh sửa cho địa chỉ trang web.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Trường văn bản có thể chỉnh sửa cho tên người dùng của thông tin đăng nhập.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Trường văn bản có thể chỉnh sửa cho tên người dùng của thông tin đăng nhập.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Trường văn bản có thể chỉnh sửa cho tên người dùng.</string>
+    <string name="saved_login_username_description_3">Trường văn bản có thể chỉnh sửa cho tên người dùng.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Trường văn bản có thể chỉnh sửa cho mật khẩu của thông tin đăng nhập.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Trường văn bản có thể chỉnh sửa cho mật khẩu của thông tin đăng nhập.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Trường văn bản có thể chỉnh sửa cho mật khẩu.</string>
+    <string name="saved_login_password_description_2">Trường văn bản có thể chỉnh sửa cho mật khẩu.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Lưu các thay đổi vào thông tin đăng nhập.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Lưu các thay đổi vào thông tin đăng nhập.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Lưu thay đổi.</string>
+    <string name="save_changes_to_login_2">Lưu thay đổi.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Chỉnh sửa</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Chỉnh sửa</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Chỉnh sửa mật khẩu</string>
+    <string name="edit_2">Chỉnh sửa mật khẩu</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Thêm thông tin đăng nhập mới</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Thêm thông tin đăng nhập mới</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Thêm mật khẩu</string>
+    <string name="add_login_2">Thêm mật khẩu</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Yêu cầu mật khẩu</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Yêu cầu mật khẩu</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Nhập mật khẩu</string>
+    <string name="saved_login_password_required_2">Nhập mật khẩu</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Yêu cầu tên đăng nhập</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Yêu cầu tên đăng nhập</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Nhập tên người dùng</string>
+    <string name="saved_login_username_required_2">Nhập tên người dùng</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Yêu cầu tên máy chủ</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2173,7 +2190,7 @@
     <string name="radio_preference_info_content_description">Chạm để biết thêm chi tiết</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Điều hướng lên</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Điều hướng lên</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Đóng</string>
@@ -2214,8 +2231,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Đánh giá đã được điều chỉnh</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Đã xóa các đánh giá không đáng tin cậy</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Dựa trên những đánh giá đáng tin cậy</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Điểm nổi bật từ các đánh giá gần đây</string>
@@ -2271,10 +2286,6 @@
     <string name="review_quality_check_product_availability_warning_body">Nếu bạn thấy sản phẩm này đã có hàng trở lại, hãy báo cáo và chúng tôi sẽ kiểm tra đánh giá.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Báo sản phẩm còn hàng</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Đang kiểm tra chất lượng đánh giá</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Đang kiểm tra chất lượng đánh giá</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Kiểm tra chất lượng đánh giá (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2320,13 +2331,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Tìm hiểu thêm</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Bằng cách chọn “Có, hãy thử nó” bạn đã đồng ý với %2$s và %3$s của %1$s bởi Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Bằng cách chọn “Có, hãy thử nó” bạn đã đồng ý với %2$s và %3$s của %1$s bởi Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Bằng cách chọn “Có, dùng thử nó”, bạn đồng ý với những điều sau từ %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Bằng cách chọn “Có, hãy thử nó” bạn đồng ý với %2$s của %1$s và %4$s của %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Bằng cách chọn “Có, hãy thử nó” bạn đồng ý với %2$s của %1$s và %4$s của %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">chính sách riêng tư</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">chính sách riêng tư</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Chính sách riêng tư</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">thông báo bảo mật</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">điều khoản sử dụng</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2398,6 +2415,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Dịch trang này?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Đã dịch trang từ %1$s sang %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Hãy thử bản dịch riêng tư trong %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2410,6 +2431,8 @@
     <string name="translations_bottom_sheet_translate_to">Dịch sang</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Không phải bây giờ</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Hiển thị bản gốc</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Xong</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2432,6 +2455,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Tìm hiểu thêm</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Đang dịch…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Tuỳ chọn dịch</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 78fe06934..93bc63e62 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -259,6 +259,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">翻譯頁面</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">已將頁面從 %1$s 翻譯為 %2$s。</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">選擇的語言</string>
@@ -337,12 +342,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox 隱私權公告</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">可以到我們的隱私權公告了解更多資訊</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">我們希望確保您上網安全</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">看看為什麼有數百萬人愛用 Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">更多讓您上網更安全的選擇</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">我們這套由非營利組織所開發的瀏覽器，會自動封鎖讓大企業在網路上偷偷跟蹤您的程式。</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">有超過一億人選用由非營利組織全力相挺的瀏覽器，來保護他們的隱私。</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">遇到已知的追蹤器？會自動封鎖。想要使用擴充套件？全部有 700 套任君選用。要開啟 PDF 檔案？我們直接內建閱讀器讓您輕鬆好管理。</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">這套由非營利組織打造的瀏覽器，可幫助防止企業在網路上偷偷追蹤您。\n\n到我們的隱私權公告了解更多資訊。</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -699,9 +714,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">書籤</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">登入資訊</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">登入資訊</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">密碼</string>
+    <string name="preferences_sync_logins_2">密碼</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">開啟分頁</string>
     <!-- Preference for signing out -->
@@ -727,9 +742,9 @@
     <string name="default_device_name_2">在 %2$s %3$s 上的 %1$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">信用卡</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">信用卡</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">付款方式</string>
+    <string name="preferences_sync_credit_cards_2">付款方式</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">地址</string>
 
@@ -1696,13 +1711,13 @@
     <string name="add_to_homescreen_description_2">您可將此網站加到裝置主畫面，方便快速開啟，或是以類似 App 的方式使用。</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">登入資訊與密碼</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">登入資訊與密碼</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">密碼</string>
+    <string name="preferences_passwords_logins_and_passwords_2">密碼</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">儲存登入資訊與密碼</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">儲存登入資訊與密碼</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">已存密碼</string>
+    <string name="preferences_passwords_save_logins_2">已存密碼</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">詢問我是否儲存</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1717,47 +1732,47 @@
     <string name="preferences_android_autofill_description">使用其他裝置中的其他應用程式時也自動填寫使用者名稱與密碼。</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">新增登入資訊</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">新增登入資訊</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">新增密碼</string>
+    <string name="preferences_logins_add_login_2">新增密碼</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">同步登入資訊</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">同步密碼</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">同步登入資訊</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">同步密碼</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">在不同裝置間同步登入資訊</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">在不同裝置間同步登入資訊</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">在不同裝置間同步密碼</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">在不同裝置間同步密碼</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">儲存的登入資訊</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">儲存的登入資訊</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">已存密碼</string>
+    <string name="preferences_passwords_saved_logins_2">已存密碼</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">您儲存或同步到 %s 的登入資訊將顯示於此處。</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">您儲存或同步到 %s 的登入資訊將顯示於此處。</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">您儲存或同步到 %s 的密碼將顯示於此處，所有儲存的密碼資訊都會被加密。</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">您儲存或同步到 %s 的密碼將顯示於此處，所有儲存的密碼資訊都會被加密。</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">了解 Sync 的更多資訊。</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">了解 Sync 的更多資訊。</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">瞭解同步功能的更多資訊</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">瞭解同步功能的更多資訊</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">例外網站</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">不儲存登入資訊與密碼的網站將顯示於此處。</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">不儲存登入資訊與密碼的網站將顯示於此處。</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s 不會儲存下列網站的密碼。</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s 不會儲存下列網站的密碼。</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">將不儲存這些網站的登入資訊與密碼。</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">將不儲存這些網站的登入資訊與密碼。</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s 不會儲存下列網站的密碼。</string>
+    <string name="preferences_passwords_exceptions_description_2">%s 不會儲存下列網站的密碼。</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">刪除所有例外</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">搜尋登入資訊</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">搜尋登入資訊</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">搜尋密碼</string>
+    <string name="preferences_passwords_saved_logins_search_2">搜尋密碼</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">網站</string>
     <!-- The header for the username for a login -->
@@ -1785,17 +1800,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">隱藏密碼</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">解鎖後即可檢視儲存的登入資訊</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">解鎖後即可檢視儲存的登入資訊</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">解鎖後即可檢視儲存的密碼</string>
+    <string name="logins_biometric_prompt_message_2">解鎖後即可檢視儲存的密碼</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">保護您的登入資訊與密碼</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">保護您的登入資訊與密碼</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">保護您儲存的密碼</string>
+    <string name="logins_warning_dialog_title_2">保護您儲存的密碼</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存下來的登入資訊與密碼，避免別人盜用。</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存下來的登入資訊與密碼，避免別人盜用。</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存的密碼，避免別人盜用。</string>
+    <string name="logins_warning_dialog_message_2">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存的密碼，避免別人盜用。</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">稍後處理</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1812,10 +1827,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">上次使用</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">排序登入資訊選單</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">排序登入資訊選單</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">排序密碼選單</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">排序密碼選單</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1823,44 +1838,44 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">地址</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">信用卡</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">信用卡</string>
 
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">付款方式</string>
+    <string name="preferences_credit_cards_2">付款方式</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">儲存並自動填寫卡片</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">儲存並自動填寫卡片</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">儲存並自動填寫付款方式</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">儲存並自動填寫付款方式</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">資料有加密</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">資料有加密</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s 會加密您儲存的所有付款方式資料</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s 會加密您儲存的所有付款方式資料</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">在不同裝置間同步卡片資料</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">同步信用卡資訊</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">新增信用卡</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">新增信用卡</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">新增付款卡片</string>
+    <string name="preferences_credit_cards_add_credit_card_2">新增付款卡片</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">管理已儲存的卡片</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">管理已儲存的卡片</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">管理卡片</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">管理卡片</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">新增地址</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">管理已存地址</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">儲存並自動填寫地址</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">儲存並自動填寫地址</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">儲存並自動填寫地址</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">儲存並自動填寫地址</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">包含電話號碼、E-Mail、收件地址等資訊</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">包含電話號碼、E-Mail、收件地址等資訊</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">包含電話號碼與電子郵件地址</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">包含電話號碼與電子郵件地址</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">新增付款卡片</string>
@@ -1881,9 +1896,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">刪除卡片</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">你確定要刪除這張信用卡嗎？</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">你確定要刪除這張信用卡嗎？</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">要刪除卡片嗎？</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">要刪除卡片嗎？</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">刪除</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1897,24 +1912,24 @@
     <string name="credit_cards_saved_cards">已儲存的卡片</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">請輸入有效的信用卡號</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">請輸入有效的信用卡號</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">請輸入有效卡號</string>
+    <string name="credit_cards_number_validation_error_message_2">請輸入有效卡號</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">請填寫此欄位</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">請填寫此欄位</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">請輸入持卡人姓名</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">請輸入持卡人姓名</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">解鎖後即可檢視儲存的卡片資訊</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">保護您的信用卡資訊</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">保護您的信用卡資訊</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">保護您儲存的付款方式</string>
+    <string name="credit_cards_warning_dialog_title_2">保護您儲存的付款方式</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存的信用卡資訊，避免別人盜用。</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存的信用卡資訊，避免別人盜用。</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存的付款方式資訊，避免別人盜用。</string>
+    <string name="credit_cards_warning_dialog_message_3">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存的付款方式資訊，避免別人盜用。</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">立即設定</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1923,10 +1938,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">裝置解鎖</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">解鎖後，即可使用儲存的信用卡資訊</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">解鎖後，即可使用儲存的信用卡資訊</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">解鎖後即可使用儲存的付款方式</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">解鎖後即可使用儲存的付款方式</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">新增地址</string>
     <!-- Title of the "Edit address" screen -->
@@ -1934,11 +1949,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">管理已存地址</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">名字</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">名字</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">中間名</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">中間名</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">姓氏</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">姓氏</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">姓名</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">街道地址</string>
     <!-- The header for the city of an address -->
@@ -1963,9 +1980,9 @@
     <string name="addressess_delete_address_button">刪除地址</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">您確定要刪除這筆地址嗎？</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">您確定要刪除這筆地址嗎？</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">要刪除這個地址嗎？</string>
+    <string name="addressess_confirm_dialog_message_2">要刪除這個地址嗎？</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">刪除</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2063,49 +2080,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">編輯</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">您確定要刪除這筆登入資訊嗎？</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">您確定要刪除這筆登入資訊嗎？</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">你確定要刪除這筆密碼嗎？</string>
+    <string name="login_deletion_confirmation_2">你確定要刪除這筆密碼嗎？</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">刪除</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">取消</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">登入選項</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">登入選項</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">密碼選項</string>
+    <string name="login_options_menu_2">密碼選項</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">登入資訊當中，網址的輸入欄位。</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">登入資訊當中，網址的輸入欄位。</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">網址的輸入欄位。</string>
+    <string name="saved_login_hostname_description_3">網址的輸入欄位。</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">登入資訊當中，使用者名稱的輸入欄位。</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">登入資訊當中，使用者名稱的輸入欄位。</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">使用者名稱的輸入欄位。</string>
+    <string name="saved_login_username_description_3">使用者名稱的輸入欄位。</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">登入資訊當中，密碼的輸入欄位。</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">登入資訊當中，密碼的輸入欄位。</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">密碼的輸入欄位。</string>
+    <string name="saved_login_password_description_2">密碼的輸入欄位。</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">儲存編輯過的登入資訊。</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">儲存編輯過的登入資訊。</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">儲存變更。</string>
+    <string name="save_changes_to_login_2">儲存變更。</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">編輯</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">編輯</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">編輯密碼</string>
+    <string name="edit_2">編輯密碼</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">新增登入資訊</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">新增登入資訊</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">新增密碼</string>
+    <string name="add_login_2">新增密碼</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">需要密碼</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">需要密碼</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">輸入密碼</string>
+    <string name="saved_login_password_required_2">輸入密碼</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">必須輸入使用者名稱</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">必須輸入使用者名稱</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">輸入使用者名稱</string>
+    <string name="saved_login_username_required_2">輸入使用者名稱</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">必須輸入主機名稱</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2217,7 +2234,7 @@
     <string name="radio_preference_info_content_description">點這裡取得詳細資訊</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">向上導航</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">向上導航</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">關閉</string>
@@ -2258,8 +2275,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">調整後評分</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">已移除不可靠的評論</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">根據可靠評論調整</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">近期評論的重點資訊</string>
@@ -2315,10 +2330,6 @@
     <string name="review_quality_check_product_availability_warning_body">若您發現此產品又上架了，請回報給我們，我們將盡快檢查評論內容。</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">回報產品已有庫存</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">正在檢查評論品質</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">正在檢查評論品質</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">正在檢查評論品質（%s）</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2364,13 +2375,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">了解更多</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">選擇「好，試用看看」，代表您同意 %1$s by Mozilla 的 %2$s 與 %3$s 。</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">選擇「好，試用看看」，代表您同意 %1$s by Mozilla 的 %2$s 與 %3$s 。</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">選擇「好，試試看」，代表您同意 %1$s：</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">選擇「好，試用看看」，代表您同意 %1$s 的 %2$s 與 %3$s 的 %4$s。</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">選擇「好，試用看看」，代表您同意 %1$s 的 %2$s 與 %3$s 的 %4$s。</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">隱私權保護政策</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">隱私權保護政策</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">隱私權保護政策</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">隱私權公告</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">使用條款</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2441,6 +2458,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">要翻譯此頁面嗎？</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">已將頁面從 %1$s 翻譯為 %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">在 %1$s 試用保護隱私的翻譯功能</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2453,6 +2474,8 @@
     <string name="translations_bottom_sheet_translate_to">翻譯語言：</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">現在不要</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">顯示原始內容</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">完成</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2475,6 +2498,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">更多資訊</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">翻譯中…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">翻譯選項</string>

From 5bb8c2c84a0da4387f4b7ddb2d6207435698f760 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 3 Mar 2024 01:18:07 +0000
Subject: [PATCH 199/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-cy/strings.xml     |  16 +-
 app/src/main/res/values-es-rAR/strings.xml |   4 +
 app/src/main/res/values-iw/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-ug/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-uk/strings.xml     | 217 ++++++++++----------
 app/src/main/res/values-zh-rCN/strings.xml | 218 ++++++++++++---------
 6 files changed, 483 insertions(+), 408 deletions(-)

diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 31668142d..0f2246e36 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -256,7 +256,7 @@
     <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
          The first parameter is the name of the language that is displayed in the original page. (For example: English)
          The second parameter is the name of the language which the page was translated to. (For example: French) -->
-    <string name="browser_toolbar_translated_successfully">Tudalen wedi\'i chyfieithu o %1$s i %2$s.</string>
+    <string name="browser_toolbar_translated_successfully">Tudalen wedi\'i chyfieithu o\'r %1$s i\'r %2$s.</string>
 
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
@@ -335,20 +335,20 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Hysbysiad preifatrwydd Firefox</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Darllenwch ein hysbysiad preifatrwydd</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Darllenwch ein hysbysiad preifatrwydd</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Rydyn ni wrth ein bodd yn eich cadw chi’n ddiogel</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
         Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Darganfyddwch pam mae miliynau yn caru Firefox</string>
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Deall pam mae miliynau\'n caru Firefox</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Pori diogel gyda mwy o ddewisiadau</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Mae ein porwr gan gorff dim-er-elw\'n atal cwmnïau rhag eich dilyn yn gyfrinachol o amgylch y we.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Mae mwy na 100 miliwn o bobl yn amddiffyn eu preifatrwydd trwy ddewis porwr a gefnogir gan ddielw.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Mae mwy na 100 miliwn o bobl yn diogelu eu preifatrwydd trwy ddewis porwr sy\'n cael ei gefnogi gan gorff dim-er-elw.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Tracwyr hysbys? Wedi\'i rwystro\'n awtomatig. Estyniadau? Rhowch gynnig ar bob 700. PDF? Mae ein darllenydd adeiledig yn eu gwneud yn hawdd i\'w rheoli.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Tracwyr hysbys? Wedi\'u rwystro\'n awtomatig. Estyniadau? Rhowch gynnig ar bob un o\'r 700. PDF? Mae ein darllenydd mewnol yn eu gwneud yn hawdd i\'w rheoli.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Mae ein porwr gan gorff dim-er-elw yn helpu i atal cwmnïau rhag eich dilyn yn gyfrinachol o amgylch y we.\n\nDarllenwch ragor yn ein hysbysiad preifatrwydd.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
@@ -2344,9 +2344,9 @@
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Wrth ddewis “Iawn, rhowch gynnig arni” rydych yn cytuno i’r canlynol o %1$s:</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
-    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Drwy ddewis &quot;Ie, rhowch gynnig arni&quot; rydych yn cytuno i %2$s %1$s a %3$s %4$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Drwy ddewis “Iawn, rhoi cynnig arni” rydych yn cytuno i %2$s %1$s a %3$s %4$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
-    <string name="review_quality_check_contextual_onboarding_caption_4">Drwy ddewis &quot;Ie, rhowch gynnig arni&quot; rydych yn cytuno i %2$s %1$s a %3$s %4$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption_4">Drwy ddewis “Iawn, rhoi cynnig arni” rydych yn cytuno i %1$s %2$s a %3$s %4$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">polisi preifatrwydd</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
@@ -2426,7 +2426,7 @@
     <!-- Title for the translation dialog after a translation was completed successfully.
     The first parameter is the name of the language that the page was translated from, for example, "French".
     The second parameter is the name of the language that the page was translated to, for example, "English". -->
-    <string name="translations_bottom_sheet_title_translation_completed">Tudalen wedi\'i chyfieithu o %1$s i %2$s</string>
+    <string name="translations_bottom_sheet_title_translation_completed">Tudalen wedi\'i chyfieithu o\'r %1$s i\'r %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Rhowch gynnig ar gyfieithu preifat yn %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 13f63ac35..c7d503bd1 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -2371,6 +2371,10 @@
     <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Al seleccionar “Si, probarlo” Estás de acuerdo con %1$s de Mozilla %2$s y %3$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Al seleccionar “Sí, probarlo” aceptás lo siguiente de %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Al seleccionar “Si, probarlo” Estás de acuerdo con %2$s de %1$s y %4$s de %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Al seleccionar “Si, probarlo” Estás de acuerdo con %2$s de %1$s y %4$s de %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">política de privacidad</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 58167cd3b..83f74c61e 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -253,6 +253,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">תרגום הדף</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">הדף תורגם מ%1$s ל%2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">שפה נבחרת</string>
@@ -330,12 +335,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">הצהרת הפרטיות של Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">מידע נוסף בהצהרת הפרטיות שלנו</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">אנחנו אוהבים לשמור עליך</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">גלו מדוע מיליונים אוהבים את Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">גלישה בטוחה עם אפשרויות נוספות</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">הדפדפן שלנו שמגובה בקרן ללא מטרות רווח מסייע למנוע מחברות לעקוב אחריך בסתר ברחבי הרשת.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">יותר מ־100 מיליון אנשים מגנים על הפרטיות שלהם על־ידי בחירה בדפדפן שמגובה על־ידי עמותה שאינה למטרות רווח.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">רכיבי מעקב ידועים? נחסמים באופן אוטומטי. הרחבות? נסו את כל ה־700 שיש לנו. קובצי PDF? עם הקורא המובנה שלנו קל לנהל אותם.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">הדפדפן שלנו שמגובה בקרן ללא מטרות רווח מסייע למנוע מחברות לעקוב אחריך בסתר ברחבי הרשת.\n\nמידע נוסף בהצהרת הפרטיות שלנו.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -692,9 +707,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">סימניות</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">כניסות</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">כניסות</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">ססמאות</string>
+    <string name="preferences_sync_logins_2">ססמאות</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">לשוניות פתוחות</string>
     <!-- Preference for signing out -->
@@ -720,9 +735,9 @@
     <string name="default_device_name_2">‏%1$s על %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">כרטיסי אשראי</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">כרטיסי אשראי</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">אמצעי תשלום</string>
+    <string name="preferences_sync_credit_cards_2">אמצעי תשלום</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">כתובות</string>
 
@@ -1664,13 +1679,13 @@
     <string name="add_to_homescreen_description_2">באפשרותך להוסיף בקלות אתר זה למסך הבית של המכשיר שלך כדי לקבל גישה מיידית ולגלוש מהר יותר עם חוויה שמדמה שימוש ביישומון.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">כניסות וססמאות</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">כניסות וססמאות</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">ססמאות</string>
+    <string name="preferences_passwords_logins_and_passwords_2">ססמאות</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">שמירת כניסות וססמאות</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">שמירת כניסות וססמאות</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">שמירת ססמאות</string>
+    <string name="preferences_passwords_save_logins_2">שמירת ססמאות</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">לבקש לשמור</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1687,47 +1702,47 @@
     <string name="preferences_android_autofill_description">מילוי ושמירת שמות משתמשים וססמאות ביישומונים אחרים במכשיר שלך.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">הוספת כניסה</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">הוספת כניסה</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">הוספת ססמה</string>
+    <string name="preferences_logins_add_login_2">הוספת ססמה</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">סנכרון כניסות</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">סנכרון ססמאות</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">סנכרון כניסות</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">סנכרון ססמאות</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">סנכרון כניסות בין מכשירים</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">סנכרון כניסות בין מכשירים</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">סנכרון ססמאות בין מכשירים</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">סנכרון ססמאות בין מכשירים</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">כניסות שמורות</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">כניסות שמורות</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">ססמאות שמורות</string>
+    <string name="preferences_passwords_saved_logins_2">ססמאות שמורות</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">הכניסות שיישמרו או יסתנכרנו אל %s יופיעו כאן.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">הכניסות שיישמרו או יסתנכרנו אל %s יופיעו כאן.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">הססמאות שיישמרו או יסונכרנו עם %s יופיעו כאן. כל הססמאות השמורות הינן מוצפנות.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">הססמאות שיישמרו או יסונכרנו עם %s יופיעו כאן. כל הססמאות השמורות הינן מוצפנות.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">מידע נוסף על Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">מידע נוסף על Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">מידע נוסף על סנכרון</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">מידע נוסף על סנכרון</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">חריגות</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">כניסות וססמאות שאינן שמורות יופיעו כאן.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">כניסות וססמאות שאינן שמורות יופיעו כאן.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">‏%s לא ישמור ססמאות לאתרים המפורטים כאן.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">‏%s לא ישמור ססמאות לאתרים המפורטים כאן.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">כניסות וססמאות לא יישמרו עבור אתרים אלו.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">כניסות וססמאות לא יישמרו עבור אתרים אלו.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">‏%s לא ישמור ססמאות לאתרים אלו.</string>
+    <string name="preferences_passwords_exceptions_description_2">‏%s לא ישמור ססמאות לאתרים אלו.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">מחיקת כל החריגות</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">חיפוש כניסות</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">חיפוש כניסות</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">חיפוש ססמאות</string>
+    <string name="preferences_passwords_saved_logins_search_2">חיפוש ססמאות</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">אתר</string>
     <!-- The header for the username for a login -->
@@ -1755,17 +1770,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">הסתרת ססמה</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">יש לבטל את הנעילה כדי להציג את הכניסות השמורות שלך</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">יש לבטל את הנעילה כדי להציג את הכניסות השמורות שלך</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">יש לבטל את הנעילה כדי להציג את הססמאות השמורות שלך</string>
+    <string name="logins_biometric_prompt_message_2">יש לבטל את הנעילה כדי להציג את הססמאות השמורות שלך</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">שמירה מאובטחת של הכניסות והססמאות שלך</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">שמירה מאובטחת של הכניסות והססמאות שלך</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">אבטחת הססמאות השמורות שלך</string>
+    <string name="logins_warning_dialog_title_2">אבטחת הססמאות השמורות שלך</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על פרטי הגישה והססמאות השמורות שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על פרטי הגישה והססמאות השמורות שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על הססמאות השמורות שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
+    <string name="logins_warning_dialog_message_2">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על הססמאות השמורות שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">מאוחר יותר</string>
 
@@ -1783,10 +1798,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">שימוש אחרון</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">תפריט מיון כניסות</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">תפריט מיון כניסות</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">תפריט מיון ססמאות</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">תפריט מיון ססמאות</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1794,44 +1809,44 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">כתובות</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">כרטיסי אשראי</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">כרטיסי אשראי</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">אמצעי תשלום</string>
+    <string name="preferences_credit_cards_2">אמצעי תשלום</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">שמירה ומילוי אוטומטי של כרטיסים</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">שמירה ומילוי אוטומטי של כרטיסים</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">שמירה ומילוי אמצעי תשלום</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">שמירה ומילוי אמצעי תשלום</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">הנתונים מוצפנים</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">הנתונים מוצפנים</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">‏%s מצפין את כל אמצעי התשלום השמורים</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">‏%s מצפין את כל אמצעי התשלום השמורים</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">סנכרון כרטיסים בין מכשירים</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">סנכרון כרטיסים</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">הוספת כרטיס אשראי</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">הוספת כרטיס אשראי</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">הוספת כרטיס</string>
+    <string name="preferences_credit_cards_add_credit_card_2">הוספת כרטיס</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">ניהול כרטיסים שמורים</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">ניהול כרטיסים שמורים</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">ניהול כרטיסים</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">ניהול כרטיסים</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">הוספת כתובת</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">ניהול כתובות</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">שמירה ומילוי אוטומטי של כתובות</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">שמירה ומילוי אוטומטי של כתובות</string>
 
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">שמירה ומילוי כתובות</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">שמירה ומילוי כתובות</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">לכלול מידע כמו מספרים, כתובות דוא״ל וכתובות למשלוח</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">לכלול מידע כמו מספרים, כתובות דוא״ל וכתובות למשלוח</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">כולל מספרי טלפון וכתובות דוא״ל</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">כולל מספרי טלפון וכתובות דוא״ל</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">הוספת כרטיס</string>
@@ -1852,9 +1867,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">מחיקת כרטיס</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">האם ברצונך למחוק את כרטיס האשראי הזה?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">האם ברצונך למחוק את כרטיס האשראי הזה?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">למחוק את הכרטיס?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">למחוק את הכרטיס?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">מחיקה</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1868,24 +1883,24 @@
     <string name="credit_cards_saved_cards">כרטיסים שמורים</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">נא להכניס מספר כרטיס אשראי תקין</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">נא להכניס מספר כרטיס אשראי תקין</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">נא להכניס מספר כרטיס תקני</string>
+    <string name="credit_cards_number_validation_error_message_2">נא להכניס מספר כרטיס תקני</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">נא למלא שדה זה</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">נא למלא שדה זה</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">הוספת שם</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">הוספת שם</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">יש לבטל את הנעילה כדי להציג את הכרטיסים השמורים שלך</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">אבטחת כרטיסי האשראי שלך</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">אבטחת כרטיסי האשראי שלך</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">אבטחת אמצעי התשלום השמורים שלך</string>
+    <string name="credit_cards_warning_dialog_title_2">אבטחת אמצעי התשלום השמורים שלך</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על כרטיסי האשראי השמורים שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על כרטיסי האשראי השמורים שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על אמצעי התשלום השמורים שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
+    <string name="credit_cards_warning_dialog_message_3">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על אמצעי התשלום השמורים שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">להגדיר כעת</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1894,10 +1909,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">שחרור נעילת המכשיר שלך</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">יש לבטל את הנעילה כדי להשתמש בפרטי כרטיס האשראי השמור</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">יש לבטל את הנעילה כדי להשתמש בפרטי כרטיס האשראי השמור</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">יש לבטל את הנעילה כדי להשתמש באמצעי התשלום השמורים שלך</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">יש לבטל את הנעילה כדי להשתמש באמצעי התשלום השמורים שלך</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">הוספת כתובת</string>
     <!-- Title of the "Edit address" screen -->
@@ -1905,11 +1920,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">ניהול כתובות</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">שם פרטי</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">שם פרטי</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">שם אמצעי</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">שם אמצעי</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">שם משפחה</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">שם משפחה</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">שם</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">כתובת רחוב</string>
     <!-- The header for the city of an address -->
@@ -1932,10 +1949,10 @@
     <string name="addressess_delete_address_button">מחיקת כתובת</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">האם ברצונך למחוק את כתובת זו?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">האם ברצונך למחוק את כתובת זו?</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">למחוק את הכתובת הזאת?</string>
+    <string name="addressess_confirm_dialog_message_2">למחוק את הכתובת הזאת?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">מחיקה</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2034,49 +2051,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">עריכה</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">האם ברצונך למחוק את כניסה זו?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">האם ברצונך למחוק את כניסה זו?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">האם ברצונך למחוק ססמה זו?</string>
+    <string name="login_deletion_confirmation_2">האם ברצונך למחוק ססמה זו?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">מחיקה</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">ביטול</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">אפשרויות כניסה</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">אפשרויות כניסה</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">אפשרויות ססמה</string>
+    <string name="login_options_menu_2">אפשרויות ססמה</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">שדה הטקסט הניתן לעריכה עבור כתובת האתר של הכניסה.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">שדה הטקסט הניתן לעריכה עבור כתובת האתר של הכניסה.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">שדה הטקסט הניתן לעריכה עבור כתובת האתר.</string>
+    <string name="saved_login_hostname_description_3">שדה הטקסט הניתן לעריכה עבור כתובת האתר.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">שדה הטקסט הניתן לעריכה עבור שם המשתמש של הכניסה.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">שדה הטקסט הניתן לעריכה עבור שם המשתמש של הכניסה.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">שדה הטקסט הניתן לעריכה עבור שם המשתמש.</string>
+    <string name="saved_login_username_description_3">שדה הטקסט הניתן לעריכה עבור שם המשתמש.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">שדה הטקסט הניתן לעריכה עבור הססמה של הכניסה.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">שדה הטקסט הניתן לעריכה עבור הססמה של הכניסה.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">שדה הטקסט הניתן לעריכה עבור הססמה.</string>
+    <string name="saved_login_password_description_2">שדה הטקסט הניתן לעריכה עבור הססמה.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">שמירת השינויים של הכניסה.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">שמירת השינויים של הכניסה.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">שמירת שינויים.</string>
+    <string name="save_changes_to_login_2">שמירת שינויים.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">עריכה</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">עריכה</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">עריכת הססמה</string>
+    <string name="edit_2">עריכת הססמה</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">הוספת כניסה חדשה</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">הוספת כניסה חדשה</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">הוספת ססמה</string>
+    <string name="add_login_2">הוספת ססמה</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">נדרשת ססמה</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">נדרשת ססמה</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">נא להכניס ססמה</string>
+    <string name="saved_login_password_required_2">נא להכניס ססמה</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">דרוש שם משתמש</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">דרוש שם משתמש</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">נא להכניס שם משתמש</string>
+    <string name="saved_login_username_required_2">נא להכניס שם משתמש</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">דרוש שם מארח</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2190,7 +2207,7 @@
     <string name="radio_preference_info_content_description">יש ללחוץ לפרטים נוספים</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">ניווט למעלה</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">ניווט למעלה</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">סגירה</string>
@@ -2231,8 +2248,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">דירוג מותאם</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">סקירות בלתי אמינות הוסרו</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">מבוסס על סקירות אמינות</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">דגשים מהסקירות האחרונות</string>
@@ -2287,10 +2302,6 @@
     <string name="review_quality_check_product_availability_warning_body">אם מוצר זה חזר למלאי, נא לדווח על כך ואנו נעבוד על בדיקת הסקירות.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">שליחת דיווח שמוצר זה חזר למלאי</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">בתהליך בדיקת איכות הסקירות</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">בתהליך בדיקת איכות הסקירות</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">בתהליך בדיקת איכות הסקירות (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2338,13 +2349,19 @@
     <string name="review_quality_check_contextual_onboarding_learn_more_link">מידע נוסף</string>
 
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">בחירה באפשרות ״כן, ארצה לנסות״ מהווה הסכמה ל%2$s ול%3$s של %1$s מאת Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">בחירה באפשרות ״כן, ארצה לנסות״ מהווה הסכמה ל%2$s ול%3$s של %1$s מאת Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">בחירה באפשרות ״כן, ארצה לנסות״ מהווה הסכמה לתנאים הבאים מאת %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">בחירה באפשרות ״כן, ארצה לנסות״ מהווה הסכמה ל%2$s של %1$s ול%4$s של %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">בחירה באפשרות ״כן, ארצה לנסות״ מהווה הסכמה ל%2$s של %1$s ול%4$s של %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">הצהרת הפרטיות</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">מדיניות הפרטיות</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">מדיניות הפרטיות</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">הצהרת הפרטיות</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">תנאי השימוש</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2415,6 +2432,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">לתרגם את הדף הזה?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">הדף תורגם מ%1$s ל%2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">לנסות תרגומים פרטיים ב־%1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2427,6 +2448,8 @@
     <string name="translations_bottom_sheet_translate_to">שפת יעד</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">לא כעת</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">הצגת המקור</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">סיום</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2449,6 +2472,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">מידע נוסף</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">בתהליך תרגום…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">אפשרויות תרגום</string>
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index d0b0e1fdf..56a566d40 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -251,6 +251,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">بەت تەرجىمىسى</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">بەت %1$s دىن %2$s غا تەرجىمە قىلىندى.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">تاللانغان تىل</string>
@@ -325,12 +330,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox شەخسىيەت ئۇقتۇرۇشى</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">شەخسىيەت ئۇقتۇرۇشىنىڭ تەپسىلاتىنى ئوقۇڭ</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">بىخەتەرلىكىڭىزنى ساقلاشنى ياخشى كۆرىمىز</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">مىليونلىغان كىشىنىڭ نېمىشقا Firefox نى ياقتۇرىدىغانلىقىنى تېپىڭ</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">بىخەتەر تور زىيارىتىنىڭ تېخىمۇ كۆپ تاللىشى</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">پايدا تاپمايدىغان توركۆرگۈمىز شىركەتلەرنىڭ سىزگە تور بېكەتلەردە مەخپىي ھالدا ئەگىشىشىنى توسىدۇ.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">100 مىليوندىن ئارتۇق كىشى پايدا تاپمايدىغان ئورگان قوللىغان توركۆرگۈنى تاللاپ ئىشلىتىپ ئۆزلىرىنىڭ شەخسىيىتىنى قوغداۋاتىدۇ.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">بىلىنگەن ئىزلىغۇچ؟ ئۆزلۈكىدىن توسۇلىدۇ. كېڭەيتمە؟ 700 دىن ئارتۇقنى سىناڭ. PDF نى ئاچامدۇ؟ توركۆرگۈ ئىچىدىكى ئوقۇغۇچ ئۇلارنى باشقۇرۇشنى قۇلايلاشتۇرىدۇ.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">پايدا تاپمايدىغان ئورگان قوللايدىغان توركۆرگۈمىز شىركەتلەرنىڭ سىزنى مەخپىي ھالدا توردىن ئىزلىشىنى توختىتىشىغا ياردەم بېرىدۇ.\n\nشەخسىيەت ئۇقتۇرۇشى ھەققىدىكى تەپسىلات بىلدۈرگۈسى.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -685,9 +700,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">خەتكۈچ</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">كىرىش</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">كىرىش</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">ئىم</string>
+    <string name="preferences_sync_logins_2">ئىم</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">بەتكۈچ ئاچ</string>
     <!-- Preference for signing out -->
@@ -711,9 +726,9 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%2$s %3$s دىكى %1$s</string>
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">ئىناۋەتلىك كارتا</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">ئىناۋەتلىك كارتا</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">چىقىم قىلىش ئۇسۇلى</string>
+    <string name="preferences_sync_credit_cards_2">چىقىم قىلىش ئۇسۇلى</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">ئادرېس</string>
 
@@ -1653,13 +1668,13 @@
     <string name="add_to_homescreen_description_2">تېز سۈرئەتتە زىيارەت قىلىش ۋە ئەپكە ئوخشاش زىيارەت تۇيغۇسىغا ئېرىشىش ئۈچۈن، مەزكۇر تور بېكەتنى باش ئېكرانغا ئاسانلا قوشالايسىز.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">كىرىش ۋە ئىم</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">كىرىش ۋە ئىم</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">ئىم</string>
+    <string name="preferences_passwords_logins_and_passwords_2">ئىم</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">كىرىش ۋە ئىم ساقلا</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">كىرىش ۋە ئىم ساقلا</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">ئىم ساقلا</string>
+    <string name="preferences_passwords_save_logins_2">ئىم ساقلا</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">ساقلاشنى سورا</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1673,47 +1688,47 @@
     <!-- Description for the preference for autofilling logins from Fenix in other apps (e.g. autofilling the Twitter app) -->
     <string name="preferences_android_autofill_description">ئۈسكۈنىڭىزدىكى باشقا ئەپلەردە ئىشلەتكۈچى ئىسمى ۋە ئىمنى تولدۇرىدۇ.</string>
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">كىرىشنى قوش</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">كىرىشنى قوش</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">ئىم قوش</string>
+    <string name="preferences_logins_add_login_2">ئىم قوش</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">كىرىشنى قەدەمداشلا</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">ئىم قەدەمداشلا</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">كىرىشنى قەدەمداشلا</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">ئىم قەدەمداشلا</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">ئۈسكۈنىلەر ئارا قەدەمداشلا</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">ئۈسكۈنىلەر ئارا قەدەمداشلا</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">ئىمنى ئۈسكۈنىلەر ئارا قەدەمداشلايدۇ</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">ئىمنى ئۈسكۈنىلەر ئارا قەدەمداشلايدۇ</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">ساقلانغان كىرىش</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">ساقلانغان كىرىش</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">ساقلانغان ئىم</string>
+    <string name="preferences_passwords_saved_logins_2">ساقلانغان ئىم</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">سىز ساقلىغان كىرىش ياكى %s بىلەن بولغان قەدەمداش بۇ جايدا كۆرۈنىدۇ.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">سىز ساقلىغان كىرىش ياكى %s بىلەن بولغان قەدەمداش بۇ جايدا كۆرۈنىدۇ.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">سىز ساقلىغان ياكى %s غا قەدەمداشلىغان ئىم بۇ يەردە كۆرسىتىلىدۇ. سىز ساقلىغان بارلىق ئىم مەخپىيلەشتۈرۈلگەن.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">سىز ساقلىغان ياكى %s غا قەدەمداشلىغان ئىم بۇ يەردە كۆرسىتىلىدۇ. سىز ساقلىغان بارلىق ئىم مەخپىيلەشتۈرۈلگەن.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">قەدەمداش ھەققىدىكى تەپسىلاتلار.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">قەدەمداش ھەققىدىكى تەپسىلاتلار.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">قەدەمداش ھەققىدىكى تەپسىلاتلار</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">قەدەمداش ھەققىدىكى تەپسىلاتلار</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">مۇستەسنا</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">ساقلانمىغان كىرىش ۋە ئىم بۇ يەردە كۆرسىتىلىدۇ.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">ساقلانمىغان كىرىش ۋە ئىم بۇ يەردە كۆرسىتىلىدۇ.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">بۇ جايدا كۆرسىتىلگەن تور بېكەتلەر ئۈچۈن %s ئىم ساقلىمايدۇ.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">بۇ جايدا كۆرسىتىلگەن تور بېكەتلەر ئۈچۈن %s ئىم ساقلىمايدۇ.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">بۇ تور بېكەتلەرنىڭ كىرىش ۋە ئىم ئۇچۇرلىرى ساقلانمايدۇ.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">بۇ تور بېكەتلەرنىڭ كىرىش ۋە ئىم ئۇچۇرلىرى ساقلانمايدۇ.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">بۇ تور بېكەتلەر ئۈچۈن %s ئىم ساقلىمايدۇ.</string>
+    <string name="preferences_passwords_exceptions_description_2">بۇ تور بېكەتلەر ئۈچۈن %s ئىم ساقلىمايدۇ.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">ھەممە مۇستەسنالارنى ئۆچۈرىدۇ</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">كىرىش خاتىرىسىنى ئىزدە</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">كىرىش خاتىرىسىنى ئىزدە</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">پارول ئىزدەش</string>
+    <string name="preferences_passwords_saved_logins_search_2">پارول ئىزدەش</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">بېكەت</string>
     <!-- The header for the username for a login -->
@@ -1742,17 +1757,17 @@
     <string name="saved_login_hide_password">ئىم يوشۇر</string>
 
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">ساقلانغان كىرىشلىرىڭىزنى كۆرۈش ئۈچۈن قۇلۇپ ئېچىڭ</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ساقلانغان كىرىشلىرىڭىزنى كۆرۈش ئۈچۈن قۇلۇپ ئېچىڭ</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">ساقلانغان پارولىڭىزنى كۆرۈش ئۈچۈن قۇلۇپ ئېچىڭ</string>
+    <string name="logins_biometric_prompt_message_2">ساقلانغان پارولىڭىزنى كۆرۈش ئۈچۈن قۇلۇپ ئېچىڭ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">كىرىش ۋە ئىمنى قوغدايدۇ</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">كىرىش ۋە ئىمنى قوغدايدۇ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">ساقلانغان ئىملىرىڭىز شىفىرلىنىدۇ</string>
+    <string name="logins_warning_dialog_title_2">ساقلانغان ئىملىرىڭىز شىفىرلىنىدۇ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان تىزىمغا كىرىش ئۇچۇرى ۋە ئىمنى زىيارەت قىلالمايدۇ.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان تىزىمغا كىرىش ئۇچۇرى ۋە ئىمنى زىيارەت قىلالمايدۇ.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان ئىملىرىڭىزنى زىيارەت قىلالمايدۇ.</string>
+    <string name="logins_warning_dialog_message_2">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان ئىملىرىڭىزنى زىيارەت قىلالمايدۇ.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">كېيىنچە</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1770,10 +1785,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">ئاخىرقى قېتىم ئىشلىتىلگەن</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">كىرىش تىزىملىكىنى تەرتىپلەيدۇ</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">كىرىش تىزىملىكىنى تەرتىپلەيدۇ</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">ئىم تىزىملىكىنى تەرتىپلە</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">ئىم تىزىملىكىنى تەرتىپلە</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1781,42 +1796,42 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">ئادرېس</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">ئىناۋەتلىك كارتا</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">ئىناۋەتلىك كارتا</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">چىقىم قىلىش ئۇسۇلى</string>
+    <string name="preferences_credit_cards_2">چىقىم قىلىش ئۇسۇلى</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">كارتا ساقلاش ۋە ئاپتوماتىك تولدۇرۇش</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">كارتا ساقلاش ۋە ئاپتوماتىك تولدۇرۇش</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">چىقىم قىلىش ئۇسۇلىنى ساقلاپ ۋە تولدۇرىدۇ</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">چىقىم قىلىش ئۇسۇلىنى ساقلاپ ۋە تولدۇرىدۇ</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">سانلىق مەلۇمات شىفىرلانغان</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">سانلىق مەلۇمات شىفىرلانغان</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">سىز ساقلىغان بارلىق چىقىم قىلىش ئۇسۇللىرىنى %s شىفىرلايدۇ</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">سىز ساقلىغان بارلىق چىقىم قىلىش ئۇسۇللىرىنى %s شىفىرلايدۇ</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">كارتىنى ئۈسكۈنىلەر ئارا قەدەمداشلايدۇ</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">كارتا قەدەمداشلا</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">ئىناۋەتلىك كارتا قوش</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">ئىناۋەتلىك كارتا قوش</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">كارتا قوش</string>
+    <string name="preferences_credit_cards_add_credit_card_2">كارتا قوش</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">ساقلانغان كارتا باشقۇرۇش</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">ساقلانغان كارتا باشقۇرۇش</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">كارتا باشقۇرۇش</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">كارتا باشقۇرۇش</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">ئادرېس قوش</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">ئادرېس باشقۇرۇش</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">ئادرېسلارنى ساقلاش ۋە ئاپتوماتىك تولدۇرۇش</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">ئادرېسلارنى ساقلاش ۋە ئاپتوماتىك تولدۇرۇش</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">ئادرېس ساقلاپ تولدۇرىدۇ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">ئادرېس ساقلاپ تولدۇرىدۇ</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">سان، ئېلخەت ۋە توشۇش ئادرېسى قاتارلىق ئۇچۇرلارنى ئۆز ئىچىگە ئالىدۇ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">سان، ئېلخەت ۋە توشۇش ئادرېسى قاتارلىق ئۇچۇرلارنى ئۆز ئىچىگە ئالىدۇ</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">تېلېفون نومۇرى ۋە ئېلخەت ئادرېسىنى ئۆز ئىچىگە ئالىدۇ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">تېلېفون نومۇرى ۋە ئېلخەت ئادرېسىنى ئۆز ئىچىگە ئالىدۇ</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">كارتا قوش</string>
@@ -1837,9 +1852,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">كارتىنى ئۆچۈر</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">بۇ ئىناۋەتلىك كارتىنى راستىنلا ئۆچۈرەمسىز؟</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">بۇ ئىناۋەتلىك كارتىنى راستىنلا ئۆچۈرەمسىز؟</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">كارتىنى ئۆچۈرەمدۇ؟</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">كارتىنى ئۆچۈرەمدۇ؟</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">ئۆچۈر</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1851,24 +1866,24 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">ساقلانغان كارتا</string>
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">ئىناۋەتلىك كارتا نومۇرىنى كىرگۈزۈڭ</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ئىناۋەتلىك كارتا نومۇرىنى كىرگۈزۈڭ</string>
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">ئىناۋەتلىك كارتا نومۇرى كىرگۈزۈلىدۇ</string>
+    <string name="credit_cards_number_validation_error_message_2">ئىناۋەتلىك كارتا نومۇرى كىرگۈزۈلىدۇ</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">بۇ بۆلەكنى تولدۇرۇڭ</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">بۇ بۆلەكنى تولدۇرۇڭ</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">ئات قوش</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">ئات قوش</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">ساقلانغان كارتىلىرىڭىزنى كۆرۈش ئۈچۈن قۇلۇپ ئېچىڭ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">ئىناۋەتلىك كارتىڭىزنى شىفىرلايدۇ</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">ئىناۋەتلىك كارتىڭىزنى شىفىرلايدۇ</string>
 
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">ساقلانغان چىقىم قىلىش ئۇسۇللىرىڭىز شىفىرلىنىدۇ</string>
+    <string name="credit_cards_warning_dialog_title_2">ساقلانغان چىقىم قىلىش ئۇسۇللىرىڭىز شىفىرلىنىدۇ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان ئىناۋەتلىك كارتىڭىزنى زىيارەت قىلالمايدۇ.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان ئىناۋەتلىك كارتىڭىزنى زىيارەت قىلالمايدۇ.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان چىقىم قىلىش ئۇسۇلىڭىزنى زىيارەت قىلالمايدۇ.</string>
+    <string name="credit_cards_warning_dialog_message_3">ئۈسكۈنە قۇلۇپلاش ئەندىزىسى، PIN ياكى ئىم ئورنىتىشنى تەڭشىسىڭىز، ئۈسكۈنىڭىز باشقىلارنىڭ قولىدا بولسىمۇ ساقلانغان چىقىم قىلىش ئۇسۇلىڭىزنى زىيارەت قىلالمايدۇ.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">ھازىر تەڭشە</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1876,9 +1891,9 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">ئۈسكۈنىڭىزنىڭ قۇلۇپىنى ئېچىڭ</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">ساقلانغان ئىناۋەتلىك كارتا ئۇچۇرلىرىنى ئىشلىتىش ئۈچۈن قۇلۇپ ئېچىڭ</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ساقلانغان ئىناۋەتلىك كارتا ئۇچۇرلىرىنى ئىشلىتىش ئۈچۈن قۇلۇپ ئېچىڭ</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">ساقلانغان چىقىم قىلىش ئۇسۇلىنى ئىشلىتىش ئۈچۈن قۇلۇپ ئېچىڭ</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">ساقلانغان چىقىم قىلىش ئۇسۇلىنى ئىشلىتىش ئۈچۈن قۇلۇپ ئېچىڭ</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">ئادرېس قوش</string>
     <!-- Title of the "Edit address" screen -->
@@ -1886,11 +1901,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">ئادرېس باشقۇرۇش</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">ئىسمى</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">ئىسمى</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">ئوتتۇرا ئىسمى</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">ئوتتۇرا ئىسمى</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">تەگئات</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">تەگئات</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">ئىسمى</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">كوچا ئادرېسى</string>
     <!-- The header for the city of an address -->
@@ -1914,9 +1931,9 @@
     <!-- The text for the "Delete address" button for deleting an address -->
     <string name="addressess_delete_address_button">ئادرېس ئۆچۈر</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">بۇ ئادرېسنى راستىنلا ئۆچۈرەمسىز؟</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">بۇ ئادرېسنى راستىنلا ئۆچۈرەمسىز؟</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">بۇ ئادرېسنى ئۆچۈرەمدۇ؟</string>
+    <string name="addressess_confirm_dialog_message_2">بۇ ئادرېسنى ئۆچۈرەمدۇ؟</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">ئۆچۈر</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2014,50 +2031,50 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">تەھرىر</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">بۇ كىرىشنى راستىنلا ئۆچۈرەمسىز؟</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">بۇ كىرىشنى راستىنلا ئۆچۈرەمسىز؟</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">بۇ ئىمنى راستىنلا ئۆچۈرەمسىز؟</string>
+    <string name="login_deletion_confirmation_2">بۇ ئىمنى راستىنلا ئۆچۈرەمسىز؟</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">ئۆچۈر</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">ۋاز كەچ</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">كىرىش تاللانمىلىرى</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">كىرىش تاللانمىلىرى</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">ئىم تاللانمىسى</string>
+    <string name="login_options_menu_2">ئىم تاللانمىسى</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">كىرىشنىڭ تور ئادرېسىنى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">كىرىشنىڭ تور ئادرېسىنى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">تور بېكەت ئادرېسىنىڭ تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
+    <string name="saved_login_hostname_description_3">تور بېكەت ئادرېسىنىڭ تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">كىرىشنىڭ ئىشلەتكۈچى ئىسمىنى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">كىرىشنىڭ ئىشلەتكۈچى ئىسمىنى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
 
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">ئىشلەتكۈچى ئاتىنىڭ تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
+    <string name="saved_login_username_description_3">ئىشلەتكۈچى ئاتىنىڭ تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">كىرىشنىڭ ئىمىنى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">كىرىشنىڭ ئىمىنى تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">ئىمنىڭ تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
+    <string name="saved_login_password_description_2">ئىمنىڭ تەھرىرلىگىلى بولىدىغان تېكىست بۆلىكى.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">كىرىش ئۆزگەرتىشلىرىنى ساقلايدۇ.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">كىرىش ئۆزگەرتىشلىرىنى ساقلايدۇ.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">ئۆزگەرتىشلەرنى ساقلايدۇ.</string>
+    <string name="save_changes_to_login_2">ئۆزگەرتىشلەرنى ساقلايدۇ.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">تەھرىر</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">تەھرىر</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">ئىم تەھرىر</string>
+    <string name="edit_2">ئىم تەھرىر</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">يېڭى كىرىش قوش</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">يېڭى كىرىش قوش</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">ئىم قوش</string>
+    <string name="add_login_2">ئىم قوش</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">ئىم زۆرۈر</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">ئىم زۆرۈر</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">ئىم كىرگۈزۈلىدۇ</string>
+    <string name="saved_login_password_required_2">ئىم كىرگۈزۈلىدۇ</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">ئىشلەتكۈچى ئىسمى زۆرۈر</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">ئىشلەتكۈچى ئىسمى زۆرۈر</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">ئىشلەتكۈچى ئاتى كىرگۈزۈلىدۇ</string>
+    <string name="saved_login_username_required_2">ئىشلەتكۈچى ئاتى كىرگۈزۈلىدۇ</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">مۇلازىم ئىسمى زۆرۈر</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2162,7 +2179,7 @@
     <string name="radio_preference_info_content_description">تەپسىلات ئۈچۈن چېكىڭ</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">ئۈستىگە يول باشلا</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">ئۈستىگە يول باشلا</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">تاقاش</string>
@@ -2204,8 +2221,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">تەڭشەلگەن باھا</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">ئىشەنچسىز باھا چىقىرىۋېتىلدى</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">ئىشەنچلىك باھالار ئاساس قىلىندى</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">يېقىنقى باھالاردىن يارقىن نۇقتىلار</string>
@@ -2265,10 +2280,6 @@
     <string name="review_quality_check_product_availability_warning_body">ئەگەر بۇ مەھسۇلاتتىن مال بارلىقىنى بايقىسىڭىز، دوكلات قىلسىڭىز، بىز باھالاشنى تەكشۈرەلەيمىز.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">مەھسۇلاتنىڭ تىزىلغانلىقىنى دوكلات قىلىڭ</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">باھالاش سۈپىتىنى تەكشۈرۈۋاتىدۇ</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">باھالاش سۈپىتىنى تەكشۈرۈۋاتىدۇ</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">باھالاش سۈپىتىنى تەكشۈرۈۋاتىدۇ(%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2317,13 +2328,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">تەپسىلاتى</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">«ھەئە، سىناپ باقاي» تاللانسا سىز Mozilla نىڭ %2$s ۋە %3$s دىكى %1$s غا قوشۇلغان بولىسىز.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">«ھەئە، سىناپ باقاي» تاللانسا سىز Mozilla نىڭ %2$s ۋە %3$s دىكى %1$s غا قوشۇلغان بولىسىز.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">«ھەئە، سىناپ باقاي» تاللانسا تۆۋەندىكى %1$s غا قوشۇلغان بولىسىز:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">«ھەئە، سىناپ باقاي» تاللانسا %1$s نىڭ %2$s ۋە %3$s نىڭ %4$s غا قوشۇلغان بولىسىز.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">«ھەئە، سىناپ باقاي» تاللانسا %1$s نىڭ %2$s ۋە %3$s نىڭ %4$s غا قوشۇلغان بولىسىز.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">شەخسىيەت تۈزۈمى</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">شەخسىيەت تۈزۈمى</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">شەخسىيەت تۈزۈمى</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">شەخسىيەت ئۇقتۇرۇشى</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">ئىشلىتىش شەرتلىرى</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2396,6 +2413,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">بۇ بەتنى تەرجىمە قىلامدۇ؟</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">بەت %1$s دىن %2$s غا تەرجىمە قىلىندى</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">%1$s دىكى شەخسىي تەرجىمىلەرنى سىناپ بېقىڭ</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2408,6 +2429,8 @@
     <string name="translations_bottom_sheet_translate_to">نىشان تىل</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">ھازىر ئەمەس</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">ئەسلىنى كۆرسەت</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">تامام</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2431,6 +2454,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">تەپسىلاتى</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">تەرجىمە قىلىۋاتىدۇ…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">تەرجىمە تاللانمىلىرى</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 8ce5dea5f..582150ceb 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -267,7 +267,7 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Сканувати</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
-    <string name="search_shortcuts_engine_settings">Налаштування пошукових засобів</string>
+    <string name="search_shortcuts_engine_settings">Налаштування пошукових систем</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Заповнити посилання з буфера обміну</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -278,7 +278,7 @@
     <string name="search_suggestions_onboarding_title">Дозволяти пошукові пропозиції у приватних сеансах?</string>
 
     <!-- Search suggestion onboarding hint description text, first parameter is the name of the app defined in app_name (for example: Fenix)-->
-    <string name="search_suggestions_onboarding_text">%s відправлятиме все, що ви вводите в адресному рядку, вашому типовому провайдеру пошуку.</string>
+    <string name="search_suggestions_onboarding_text">%s відправлятиме все, що ви вводите в адресному рядку, вашій типовій пошуковій системі.</string>
 
     <!-- Search engine suggestion title text. The first parameter is the name of the suggested engine-->
     <string name="search_engine_suggestions_title">Пошук в %s</string>
@@ -292,7 +292,7 @@
     <string name="search_header_menu_item_2">Шукати в:</string>
 
     <!-- Content description (not visible, for screen readers etc.): Search engine icon. The first parameter is the search engine name (for example: DuckDuckGo). -->
-    <string name="search_engine_icon_content_description" tools:ignore="UnusedResources">Засіб пошуку %s</string>
+    <string name="search_engine_icon_content_description" tools:ignore="UnusedResources">Пошукова система %s</string>
 
     <!-- Home onboarding -->
     <!-- Onboarding home screen popup dialog, shown on top of the Jump back in section. -->
@@ -333,7 +333,6 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Положення про приватність Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Ми дбаємо про вашу безпеку</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
@@ -342,7 +341,7 @@
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Наш некомерційний браузер не дозволяє компаніям таємно стежити за вами в інтернеті.\n\nДокладніше в нашому Положенні про приватність.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">політиці приватності</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">положенні про приватність</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Встановити типовим браузером</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -401,19 +400,19 @@
     <!-- Preference category for settings related to changing the default search engine -->
     <string name="preferences_category_select_default_search_engine">Оберіть</string>
     <!-- Preference for settings related to managing search shortcuts for the quick search menu -->
-    <string name="preferences_manage_search_shortcuts_2">Керуйте альтернативними засобами пошуку</string>
+    <string name="preferences_manage_search_shortcuts_2">Альтернативні пошукові системи</string>
     <!-- Summary for preference for settings related to managing search shortcuts for the quick search menu -->
-    <string name="preferences_manage_search_shortcuts_summary">Редагувати засоби пошуку, доступні в меню</string>
+    <string name="preferences_manage_search_shortcuts_summary">Редагувати системи, доступні в меню пошуку</string>
     <!-- Preference category for settings related to managing search shortcuts for the quick search menu -->
-    <string name="preferences_category_engines_in_search_menu">Засоби пошуку, доступні в меню</string>
+    <string name="preferences_category_engines_in_search_menu">Системи, доступні в меню пошуку</string>
     <!-- Preference for settings related to changing the default search engine -->
-    <string name="preferences_default_search_engine">Типовий засіб пошуку</string>
+    <string name="preferences_default_search_engine">Типова пошукова система</string>
     <!-- Preference for settings related to Search -->
     <string name="preferences_search">Пошук</string>
     <!-- Preference for settings related to Search engines -->
-    <string name="preferences_search_engines">Засоби пошуку</string>
+    <string name="preferences_search_engines">Пошукові системи</string>
     <!-- Preference for settings related to Search engines suggestions-->
-    <string name="preferences_search_engines_suggestions">Пропозиції засобів пошуку</string>
+    <string name="preferences_search_engines_suggestions">Пропозиції від пошукових систем</string>
     <!-- Preference Category for settings related to Search address bar -->
     <string name="preferences_settings_address_bar">Налаштування панелі адреси</string>
     <!-- Preference Category for settings to Firefox Suggest -->
@@ -697,9 +696,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Закладки</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Паролі</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Паролі</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Паролі</string>
+    <string name="preferences_sync_logins_2">Паролі</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Вкладки</string>
     <!-- Preference for signing out -->
@@ -725,9 +724,9 @@
     <string name="default_device_name_2">%1$s на %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Кредитні картки</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Кредитні картки</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Способи оплати</string>
+    <string name="preferences_sync_credit_cards_2">Способи оплати</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Адреси</string>
 
@@ -1670,13 +1669,13 @@
     <string name="add_to_homescreen_description_2">Ви можете легко додати цей вебсайт на головний екран вашого пристрою, щоб мати миттєвий доступ до нього і працювати швидше.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Паролі</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Паролі</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Паролі</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Паролі</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Зберігати паролі</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Зберігати паролі</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Зберігати паролі</string>
+    <string name="preferences_passwords_save_logins_2">Зберігати паролі</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Питати про збереження</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1691,49 +1690,49 @@
     <string name="preferences_android_autofill_description">Заповнювати імена користувачів і паролі в інших програмах на цьому пристрої.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Додати пароль</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Додати пароль</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Додати пароль</string>
+    <string name="preferences_logins_add_login_2">Додати пароль</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Синхронізація паролів</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Синхронізувати паролі</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Синхронізація паролів</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Синхронізувати паролі</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Синхронізувати паролі між пристроями</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Синхронізувати паролі між пристроями</string>
 
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Синхронізація паролів між пристроями</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Синхронізація паролів між пристроями</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Збережені паролі</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Збережені паролі</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Збережені паролі</string>
+    <string name="preferences_passwords_saved_logins_2">Збережені паролі</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Тут з’являтимуться ваші збережені та синхронізовані з %s паролі.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Тут з’являтимуться ваші збережені та синхронізовані з %s паролі.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Тут з\'являтимуться паролі, які ви зберігаєте чи синхронізуєте в %s. Усі паролі зашифровано.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Тут з\'являтимуться паролі, які ви зберігаєте чи синхронізуєте в %s. Усі паролі зашифровано.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Докладніше про синхронізацію.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Докладніше про синхронізацію.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Докладніше про синхронізацію</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Докладніше про синхронізацію</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Винятки</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Не збережені паролі з’являтимуться тут.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Не збережені паролі з’являтимуться тут.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s не зберігатиме паролі для вказаних тут сайтів.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s не зберігатиме паролі для вказаних тут сайтів.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Паролі для цих сайтів не зберігатимуться.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Паролі для цих сайтів не зберігатимуться.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s не зберігатиме паролі для цих сайтів.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s не зберігатиме паролі для цих сайтів.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Видалити всі винятки</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Шукати паролі</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Шукати паролі</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Пошук паролів</string>
+    <string name="preferences_passwords_saved_logins_search_2">Пошук паролів</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Сайт</string>
     <!-- The header for the username for a login -->
@@ -1762,17 +1761,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Приховати пароль</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Розблокуйте для перегляду збережених паролів</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Розблокуйте для перегляду збережених паролів</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Розблокуйте, щоб переглянути збережені паролі</string>
+    <string name="logins_biometric_prompt_message_2">Розблокуйте, щоб переглянути збережені паролі</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Захистіть свої паролі</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Захистіть свої паролі</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Захистіть збережені паролі</string>
+    <string name="logins_warning_dialog_title_2">Захистіть збережені паролі</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених паролів від інших, хто може отримати доступ до вашого пристрою.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених паролів від інших, хто може отримати доступ до вашого пристрою.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених паролів від інших, хто може отримати доступ до вашого пристрою.</string>
+    <string name="logins_warning_dialog_message_2">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених паролів від інших, хто може отримати доступ до вашого пристрою.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Пізніше</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1790,10 +1789,10 @@
     <string name="saved_logins_sort_strategy_last_used">Востаннє використано</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Меню впорядкування паролів</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Меню впорядкування паролів</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Меню сортування паролів</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Меню сортування паролів</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1801,43 +1800,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Адреси</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Кредитні картки</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Кредитні картки</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Способи оплати</string>
+    <string name="preferences_credit_cards_2">Способи оплати</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Зберігати та автоматично заповнювати дані карток</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Зберігати та автоматично заповнювати дані карток</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Зберігати й заповнювати способи оплати</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Зберігати й заповнювати способи оплати</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Дані зашифровано</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Дані зашифровано</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s шифрує всі збережені способи оплати</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s шифрує всі збережені способи оплати</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Синхронізувати картки між пристроями</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Синхронізувати картки</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Додати кредитну картку</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Додати кредитну картку</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Додати картку</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Додати картку</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Керувати збереженими картками</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Керувати збереженими картками</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Керувати картками</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Керувати картками</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Додати адресу</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Керувати адресами</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Зберігати та автоматично заповнювати адреси</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Зберігати та автоматично заповнювати адреси</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Зберігати й заповнювати адреси</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Зберігати й заповнювати адреси</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Включити дані, як-от номери, електронні адреси та адреси доставлення</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Включити дані, як-от номери, електронні адреси та адреси доставлення</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Містить номери телефонів і адреси електронної пошти</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Містить номери телефонів і адреси електронної пошти</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Додати картку</string>
@@ -1858,9 +1857,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Видалити картку</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Ви впевнені, що хочете видалити цю кредитну картку?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Ви впевнені, що хочете видалити цю кредитну картку?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Видалити картку?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Видалити картку?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Видалити</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1874,24 +1873,24 @@
     <string name="credit_cards_saved_cards">Збережені картки</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Введіть дійсний номер кредитної картки</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Введіть дійсний номер кредитної картки</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Введіть дійсний номер картки</string>
+    <string name="credit_cards_number_validation_error_message_2">Введіть дійсний номер картки</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Будь ласка, заповніть це поле</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Будь ласка, заповніть це поле</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Додайте назву</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Додайте назву</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Розблокуйте для перегляду збережених карток</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Захистіть свої банківські картки</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Захистіть свої банківські картки</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Захистіть свої збережені способи оплати</string>
+    <string name="credit_cards_warning_dialog_title_2">Захистіть свої збережені способи оплати</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених банківських карток від інших, хто може отримати доступ до вашого пристрою.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених банківських карток від інших, хто може отримати доступ до вашого пристрою.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених способів оплати від інших, хто може отримати доступ до вашого пристрою.</string>
+    <string name="credit_cards_warning_dialog_message_3">Встановіть графічний ключ, PIN-код чи пароль для захисту збережених способів оплати від інших, хто може отримати доступ до вашого пристрою.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Встановити</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1900,10 +1899,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Розблокуйте свій пристрій</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Розблокуйте, щоб використовувати збережену інформацію про кредитну картку</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Розблокуйте, щоб використовувати збережену інформацію про кредитну картку</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Розблокуйте, щоб використати збережені способи оплати</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Розблокуйте, щоб використати збережені способи оплати</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Додати адресу</string>
     <!-- Title of the "Edit address" screen -->
@@ -1911,11 +1910,11 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Керувати адресами</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Ім’я</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Ім’я</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">По батькові</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">По батькові</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Прізвище</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Прізвище</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Вулиця</string>
     <!-- The header for the city of an address -->
@@ -1940,9 +1939,9 @@
     <string name="addressess_delete_address_button">Видалити адресу</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Ви дійсно хочете видалити цю адресу?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ви дійсно хочете видалити цю адресу?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Видалити цю адресу?</string>
+    <string name="addressess_confirm_dialog_message_2">Видалити цю адресу?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Видалити</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1953,11 +1952,11 @@
     <string name="address_menu_delete_address">Видалити адресу</string>
 
     <!-- Title of the Add search engine screen -->
-    <string name="search_engine_add_custom_search_engine_title">Додати засіб пошуку</string>
+    <string name="search_engine_add_custom_search_engine_title">Додати пошукову систему</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button that navigates to add new engine screen -->
-    <string name="search_engine_add_custom_search_engine_button_content_description">Додати новий засіб пошуку</string>
+    <string name="search_engine_add_custom_search_engine_button_content_description">Додати нову пошукову систему</string>
     <!-- Title of the Edit search engine screen -->
-    <string name="search_engine_edit_custom_search_engine_title">Змінити засіб пошуку</string>
+    <string name="search_engine_edit_custom_search_engine_title">Змінити пошукову систему</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Змінити</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -1966,7 +1965,7 @@
     <!-- Label for the TextField in which user enters custom search engine name -->
     <string name="search_add_custom_engine_name_label">Назва</string>
     <!-- Placeholder text shown in the Search Engine Name text field before a user enters text -->
-    <string name="search_add_custom_engine_name_hint_2">Назва засобу пошуку</string>
+    <string name="search_add_custom_engine_name_hint_2">Назва пошукової системи</string>
     <!-- Label for the TextField in which user enters custom search engine URL -->
     <string name="search_add_custom_engine_url_label">URL рядка пошуку</string>
     <!-- Placeholder text shown in the Search String TextField before a user enters text -->
@@ -1975,7 +1974,7 @@
     <string name="search_add_custom_engine_search_string_example" formatted="false">Змініть запит на “%s”. Зразок:\nhttps://www.google.com/search?q=%s</string>
 
     <!-- Accessibility description for the form in which details about the custom search engine are entered -->
-    <string name="search_add_custom_engine_form_description">Подробиці власного засобу пошуку</string>
+    <string name="search_add_custom_engine_form_description">Подробиці власної пошукової системи</string>
 
     <!-- Label for the TextField in which user enters custom search engine suggestion URL -->
     <string name="search_add_custom_engine_suggest_url_label">API пошукових пропозицій (необов’язково)</string>
@@ -1987,7 +1986,7 @@
     <string name="search_custom_engine_save_button">Зберегти</string>
 
     <!-- Text shown when a user leaves the name field empty -->
-    <string name="search_add_custom_engine_error_empty_name">Введіть назву засобу пошуку</string>
+    <string name="search_add_custom_engine_error_empty_name">Введіть назву пошукової системи</string>
 
     <!-- Text shown when a user leaves the search string field empty -->
     <string name="search_add_custom_engine_error_empty_search_string">Введіть пошуковий запит</string>
@@ -2041,49 +2040,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Змінити</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Ви дійсно хочете видалити цей запис?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Ви дійсно хочете видалити цей запис?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Ви дійсно хочете видалити цей пароль?</string>
+    <string name="login_deletion_confirmation_2">Ви дійсно хочете видалити цей пароль?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Видалити</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Скасувати</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Опції запису</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Опції запису</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Параметри пароля</string>
+    <string name="login_options_menu_2">Параметри пароля</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Текстове поле для редагування вебадреси запису.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Текстове поле для редагування вебадреси запису.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Текстове поле для редагування адреси вебсайту.</string>
+    <string name="saved_login_hostname_description_3">Текстове поле для редагування адреси вебсайту.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Текстове поле для редагування імені користувача запису.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Текстове поле для редагування імені користувача запису.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Текстове поле для редагування імені користувача.</string>
+    <string name="saved_login_username_description_3">Текстове поле для редагування імені користувача.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Текстове поле для редагування пароля запису.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Текстове поле для редагування пароля запису.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Текстове поле для редагування пароля.</string>
+    <string name="saved_login_password_description_2">Текстове поле для редагування пароля.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Зберегти зміни.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Зберегти зміни.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Зберегти зміни.</string>
+    <string name="save_changes_to_login_2">Зберегти зміни.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Змінити</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Змінити</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Редагувати пароль</string>
+    <string name="edit_2">Редагувати пароль</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Додати новий пароль</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Додати новий пароль</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Додати пароль</string>
+    <string name="add_login_2">Додати пароль</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Потрібен пароль</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Потрібен пароль</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Введіть пароль</string>
+    <string name="saved_login_password_required_2">Введіть пароль</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Необхідно вказати ім’я користувача</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Необхідно вказати ім’я користувача</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Введіть ім’я користувача</string>
+    <string name="saved_login_username_required_2">Введіть ім’я користувача</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Необхідно вказати назву вузла</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2195,7 +2194,7 @@
     <string name="radio_preference_info_content_description">Показати подробиці</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Вгору</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Вгору</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Закрити</string>
@@ -2236,8 +2235,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Скоригований рейтинг</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Сумнівні відгуки прибрано</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">На основі надійних відгуків</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Обране з недавніх відгуків</string>
@@ -2293,10 +2290,6 @@
     <string name="review_quality_check_product_availability_warning_body">Якщо цей товар знову з’явиться, повідомте про це нам, і ми його проаналізуємо.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Повідомити про наявність товару</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Перевірка якості відгуку</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Перевірка якості відгуку</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Перевірка якості відгуку (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2342,11 +2335,11 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Докладніше</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Вибравши “Так, спробувати”, ви погоджуєтеся з %1$s %2$s і %3$s від Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Вибравши “Так, спробувати”, ви погоджуєтеся з %1$s %2$s і %3$s від Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Вибираючи “Спробувати”, ви погоджуєтеся з такими умовами від %1$s:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">політикою приватності</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">політикою приватності</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Політика приватності</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8e192a27d..e2d55dd2f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -261,6 +261,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">翻译页面</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">已将页面从%1$s翻译成%2$s｡</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">选择的语言</string>
@@ -341,12 +346,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox 隐私声明</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">阅读我们的隐私声明详细了解</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">我们乐于为您护航</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">探究 Firefox 何以受亿万用户青睐</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">更多保障上网安全的选项</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">这款由非营利组织支持的浏览器会自动阻止大公司在网上偷偷跟踪您。</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">这款由非营利组织支持的浏览器，是超过一亿用户的隐私保护之选。</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">已知跟踪器？自动拦截！好用扩展？足足 700 款任您选！PDF 文档？内置阅读器轻松满足您的需求。</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">这款由非营利组织支持的浏览器会自动阻止大公司在网上偷偷跟踪您。\n\n请阅读我们的隐私声明详细了解。</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -707,9 +722,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">书签</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">登录信息</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">登录信息</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">密码</string>
+    <string name="preferences_sync_logins_2">密码</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">打开的标签页</string>
     <!-- Preference for signing out -->
@@ -735,10 +750,10 @@
     <string name="default_device_name_2">%2$s %3$s 上的 %1$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">信用卡</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">信用卡</string>
 
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">付款方式</string>
+    <string name="preferences_sync_credit_cards_2">付款方式</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">邮政地址</string>
 
@@ -1711,13 +1726,13 @@
     <string name="add_to_homescreen_description_2">您可以轻松将此网站添加到设备主屏幕，以便迅捷访问并以类似应用的体验畅享浏览。</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">密码</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">密码</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">密码</string>
+    <string name="preferences_passwords_logins_and_passwords_2">密码</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">保存登录名和密码</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">保存登录名和密码</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">保存密码</string>
+    <string name="preferences_passwords_save_logins_2">保存密码</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">询问是否保存</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1734,48 +1749,48 @@
     <string name="preferences_android_autofill_description">在您设备上的其他应用程序中填充用户名和密码。</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">添加登录信息</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">添加登录信息</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">添加密码</string>
+    <string name="preferences_logins_add_login_2">添加密码</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">同步登录信息</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">同步密码</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">同步登录信息</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">同步密码</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">跨设备同步登录信息</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">跨设备同步登录信息</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">跨设备同步密码</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">跨设备同步密码</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">保存的登录信息</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">保存的登录信息</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">保存的密码</string>
+    <string name="preferences_passwords_saved_logins_2">保存的密码</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">您保存或同步到 %s 的登录信息将显示于此处。</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">您保存或同步到 %s 的登录信息将显示于此处。</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">保存和同步到 %s 的密码会显示在这里，所有密码均已加密保存。
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">保存和同步到 %s 的密码会显示在这里，所有密码均已加密保存。
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">详细了解“同步”。</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">详细了解“同步”。</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">详细了解同步功能</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">详细了解同步功能</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">例外</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">不保存登录名和密码的网站将显示于此处。</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">不保存登录名和密码的网站将显示于此处。</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s 将不会保存此处所列网站的密码。</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s 将不会保存此处所列网站的密码。</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">将不保存这些网站的登录名和密码。</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">将不保存这些网站的登录名和密码。</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s 将不会保存这些网站的密码。</string>
+    <string name="preferences_passwords_exceptions_description_2">%s 将不会保存这些网站的密码。</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">删除所有例外</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">搜索登录信息</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">搜索登录信息</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">搜索密码</string>
+    <string name="preferences_passwords_saved_logins_search_2">搜索密码</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">网站</string>
     <!-- The header for the username for a login -->
@@ -1803,17 +1818,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">隐藏密码</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">解锁以查看您保存的登录信息</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">解锁以查看您保存的登录信息</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">解锁以查看保存的密码</string>
+    <string name="logins_biometric_prompt_message_2">解锁以查看保存的密码</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">保护您的登录名和密码</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">保护您的登录名和密码</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">保护您保存的密码</string>
+    <string name="logins_warning_dialog_title_2">保护您保存的密码</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">设置设备锁定图案、PIN 或密码以保护您保存的登录名与密码，避免他人盗用。</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">设置设备锁定图案、PIN 或密码以保护您保存的登录名与密码，避免他人盗用。</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">设置设备锁定图案、PIN 或密码以保护您保存的密码，避免他人盗用。</string>
+    <string name="logins_warning_dialog_message_2">设置设备锁定图案、PIN 或密码以保护您保存的密码，避免他人盗用。</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">稍后</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1830,10 +1845,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">上次使用</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">排序登录信息菜单</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">排序登录信息菜单</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">密码排序菜单</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">密码排序菜单</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1841,43 +1856,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">地址</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">信用卡</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">信用卡</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">付款方式</string>
+    <string name="preferences_credit_cards_2">付款方式</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">保存并自动填充信用卡信息</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">保存并自动填充信用卡信息</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">保存和填写付款方式</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">保存和填写付款方式</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">数据已加密</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">数据已加密</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s 会加密您保存的所有付款方式</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s 会加密您保存的所有付款方式</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">跨设备同步信用卡信息</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">同步卡片信息</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">添加信用卡</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">添加信用卡</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">添加信用卡</string>
+    <string name="preferences_credit_cards_add_credit_card_2">添加信用卡</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">管理保存的卡片</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">管理保存的卡片</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">管理信用卡</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">管理信用卡</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">添加地址</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">管理地址</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">保存并自动填充地址</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">保存并自动填充地址</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">保存和填充地址</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">保存和填充地址</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">包含号码、邮箱和收货地址等信息</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">包含号码、邮箱和收货地址等信息</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">包括电话号码和邮箱地址</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">包括电话号码和邮箱地址</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">添加信用卡</string>
@@ -1898,9 +1913,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">删除卡片</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">您确定要删除此信用卡吗？</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">您确定要删除此信用卡吗？</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">确定删除信用卡吗？</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">确定删除信用卡吗？</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">删除</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1914,25 +1929,25 @@
     <string name="credit_cards_saved_cards">保存的卡片</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">请输入有效的信用卡卡号</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">请输入有效的信用卡卡号</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">请输入有效卡号</string>
+    <string name="credit_cards_number_validation_error_message_2">请输入有效卡号</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">请填写此栏</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">请填写此栏</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">请输入持卡人姓名</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">请输入持卡人姓名</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">解锁后即可查看保存的卡片信息</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">保护您的卡片信息</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">保护您的卡片信息</string>
 
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">保护您保存的付款方式</string>
+    <string name="credit_cards_warning_dialog_title_2">保护您保存的付款方式</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">设置设备锁定图案、PIN 或密码以保护您保存的卡片信息，避免他人盗用。</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">设置设备锁定图案、PIN 或密码以保护您保存的卡片信息，避免他人盗用。</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">设置设备锁定图案、PIN 或密码以保护您保存的付款方式，避免他人盗用。</string>
+    <string name="credit_cards_warning_dialog_message_3">设置设备锁定图案、PIN 或密码以保护您保存的付款方式，避免他人盗用。</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">立即设置</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1941,10 +1956,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">解锁设备</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">解锁以使用存储的卡片信息</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">解锁以使用存储的卡片信息</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">解锁以使用保存的付款方式</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">解锁以使用保存的付款方式</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">添加地址</string>
     <!-- Title of the "Edit address" screen -->
@@ -1952,11 +1967,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">管理地址</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">名</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">名</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">中间名</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">中间名</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">姓</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">姓</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">姓名</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">街道地址</string>
     <!-- The header for the city of an address -->
@@ -1981,9 +1998,9 @@
     <string name="addressess_delete_address_button">删除地址</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">您确定要删除此地址吗？</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">您确定要删除此地址吗？</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">确定删除此地址吗？</string>
+    <string name="addressess_confirm_dialog_message_2">确定删除此地址吗？</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">删除</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2081,49 +2098,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">编辑</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">您确定要删除此登录信息吗？</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">您确定要删除此登录信息吗？</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">您确定要删除此密码吗？</string>
+    <string name="login_deletion_confirmation_2">您确定要删除此密码吗？</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">删除</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">取消</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">登录选项</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">登录选项</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">密码选项</string>
+    <string name="login_options_menu_2">密码选项</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">登录信息中的网址输入框。</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">登录信息中的网址输入框。</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">网址输入框。</string>
+    <string name="saved_login_hostname_description_3">网址输入框。</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">登录信息中的用户名输入框。</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">登录信息中的用户名输入框。</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">用户名输入框。</string>
+    <string name="saved_login_username_description_3">用户名输入框。</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">登录信息中的密码输入框。</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">登录信息中的密码输入框。</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">密码输入框。</string>
+    <string name="saved_login_password_description_2">密码输入框。</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">保存编辑过的登录信息。</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">保存编辑过的登录信息。</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">保存更改。</string>
+    <string name="save_changes_to_login_2">保存更改。</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">编辑</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">编辑</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">编辑密码</string>
+    <string name="edit_2">编辑密码</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">新建登录信息</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">新建登录信息</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">添加密码</string>
+    <string name="add_login_2">添加密码</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">需要密码</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">需要密码</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">请输入密码</string>
+    <string name="saved_login_password_required_2">请输入密码</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">用户名不能为空</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">用户名不能为空</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">请输入用户名</string>
+    <string name="saved_login_username_required_2">请输入用户名</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">主机名不能为空</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2235,7 +2252,7 @@
     <string name="radio_preference_info_content_description">点击了解更多信息</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">向上导航</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">向上导航</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">关闭</string>
@@ -2276,8 +2293,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">调整后的评分</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">已排除不可信的评价</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">基于可信评价调整</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">最有帮助的近期评价</string>
@@ -2338,10 +2353,6 @@
 
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">报告商品有货</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">正在核查评价质量</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">正在核查评价质量</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">正在检查评价质量（%s）</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2391,13 +2402,19 @@
     <string name="review_quality_check_contextual_onboarding_learn_more_link">详细了解</string>
 
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">选择“试试看”，即代表您同意由 Mozilla 支持的 %1$s 的%2$s和%3$s。</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">选择“试试看”，即代表您同意由 Mozilla 支持的 %1$s 的%2$s和%3$s。</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">选择“试试看”，即代表您同意 %1$s 的：</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">选择“试试看”，即代表您同意 %1$s 的 %2$s 和 %3$s 的 %4$s。</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">选择“试试看”，即代表您同意 %1$s 的 %2$s 和 %3$s 的 %4$s。</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">隐私政策</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">隐私政策</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">隐私政策</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">隐私声明</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">使用条款</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2469,6 +2486,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">要翻译此页面吗？</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">已将页面从%1$s翻译成%2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">试试 %1$s 注重隐私的翻译功能</string>
 
@@ -2482,6 +2503,8 @@
     <string name="translations_bottom_sheet_translate_to">目标语言：</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">暂时不要</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">显示原文</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">完成</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2504,6 +2527,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">详细了解</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">正在翻译…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">翻译设置</string>

From 4470864440703176407d1930e3239446b1e4f5cf Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 02:26:15 +0000
Subject: [PATCH 200/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-de/strings.xml     |   4 +-
 app/src/main/res/values-es-rES/strings.xml | 218 +++++----
 app/src/main/res/values-eu/strings.xml     | 218 +++++----
 app/src/main/res/values-gl/strings.xml     | 493 ++++++++++++++-------
 app/src/main/res/values-kk/strings.xml     |  23 +-
 app/src/main/res/values-pa-rIN/strings.xml | 216 +++++----
 app/src/main/res/values-sk/strings.xml     | 218 +++++----
 app/src/main/res/values-sl/strings.xml     | 174 ++++----
 8 files changed, 931 insertions(+), 633 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6ad60d827..42c36ab56 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -342,12 +342,12 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox-Datenschutzhinweis</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Weitere Informationen finden Sie in unserem Datenschutzhinweis</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Weitere Informationen finden Sie in unserem Datenschutzhinweis</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Wir schützen Sie gerne</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
         Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Erfahren Sie, warum Millionen Firefox Firefox lieben</string>
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Erfahren Sie, warum Millionen Firefox lieben</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Sicheres Surfen mit mehr Auswahl</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index e9888675a..65bc3a3e3 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -258,6 +258,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Traducir página</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Página traducida de %1$s a %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Idioma seleccionado</string>
@@ -336,12 +341,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Aviso de privacidad de Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Saber más en nuestro aviso de privacidad</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Nos encanta mantenerte a salvo</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Descubre por qué millones aman Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Navegación segura con más opciones</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Nuestro navegador respaldado por una organización sin ánimo de lucro ayuda a evitar que las empresas te sigan en secreto por la web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Más de 100 millones de personas protegen su privacidad eligiendo un navegador respaldado por una organización sin ánimo de lucro.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">¿Rastreadores conocidos? Bloqueados automáticamente. ¿Extensiones? Más de 700. ¿PDF? Nuestro lector incorporado los hace fáciles de administrar.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Nuestro navegador respaldado por una organización sin ánimo de lucro ayuda a evitar que las empresas te sigan en secreto en la web.\n\nMás información en nuestro aviso de privacidad.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -697,9 +712,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Marcadores</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Inicios de sesión</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Inicios de sesión</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Contraseñas</string>
+    <string name="preferences_sync_logins_2">Contraseñas</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Pestañas abiertas</string>
     <!-- Preference for signing out -->
@@ -725,9 +740,9 @@
     <string name="default_device_name_2">%1$s en %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Tarjetas de crédito</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Tarjetas de crédito</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
+    <string name="preferences_sync_credit_cards_2">Métodos de pago</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Direcciones</string>
 
@@ -1694,13 +1709,13 @@
     <string name="add_to_homescreen_description_2">Puedes añadir fácilmente este sitio web a la pantalla de inicio de tu dispositivo para tener acceso instantáneo y navegar rápidamente, consiguiendo una experiencia similar a la de una aplicación real.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Inicios de sesión y contraseñas</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Inicios de sesión y contraseñas</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Contraseñas</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Contraseñas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Guardar inicios de sesión y contraseñas</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar inicios de sesión y contraseñas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Guardar contraseñas</string>
+    <string name="preferences_passwords_save_logins_2">Guardar contraseñas</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Preguntar antes de guardar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1717,47 +1732,47 @@
     <string name="preferences_android_autofill_description">Completar nombres de usuarios y contraseñas en otras aplicaciones de tu dispositivo.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Añadir cuenta</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Añadir cuenta</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Añadir contraseña</string>
+    <string name="preferences_logins_add_login_2">Añadir contraseña</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Inicios de sesión sincronizados</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizar contraseñas</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Inicios de sesión sincronizados</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Sincronizar contraseñas</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sincronizar inicios de sesión entre dispositivos</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizar inicios de sesión entre dispositivos</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronizar contraseñas entre dispositivos</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Sincronizar contraseñas entre dispositivos</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Inicios de sesión guardados</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Inicios de sesión guardados</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Contraseñas guardadas</string>
+    <string name="preferences_passwords_saved_logins_2">Contraseñas guardadas</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Los inicios de sesión que guardes o sincronices con %s se mostrarán aquí.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Los inicios de sesión que guardes o sincronices con %s se mostrarán aquí.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Las contraseñas que guardes o sincronices con %s aparecerán aquí. Todas las contraseñas que guardes quedan cifradas.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Las contraseñas que guardes o sincronices con %s aparecerán aquí. Todas las contraseñas que guardes quedan cifradas.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Saber más sobre Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Saber más sobre Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Descubre más sobre Sync</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Descubre más sobre Sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Excepciones</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Los inicios de sesión y contraseñas no guardados aparecerán aquí.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Los inicios de sesión y contraseñas no guardados aparecerán aquí.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s no guardará contraseñas para los sitios que se listen aquí.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s no guardará contraseñas para los sitios que se listen aquí.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">No se guardarán los inicios de sesión y contraseñas para estos sitios.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">No se guardarán los inicios de sesión y contraseñas para estos sitios.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s no guardará las contraseñas para estos sitios.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s no guardará las contraseñas para estos sitios.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eliminar todas las excepciones</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Buscar inicios de sesión</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Buscar inicios de sesión</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Buscar contraseñas</string>
+    <string name="preferences_passwords_saved_logins_search_2">Buscar contraseñas</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sitio</string>
     <!-- The header for the username for a login -->
@@ -1785,17 +1800,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Ocultar contraseña</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Desbloquear para ver tus inicios de sesión guardados</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquear para ver tus inicios de sesión guardados</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desbloquea para ver tus contraseñas guardadas</string>
+    <string name="logins_biometric_prompt_message_2">Desbloquea para ver tus contraseñas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Asegurar tus usuarios y contraseñas</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Asegurar tus usuarios y contraseñas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Asegura tus contraseñas guardadas</string>
+    <string name="logins_warning_dialog_title_2">Asegura tus contraseñas guardadas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Configura un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus usuarios y contraseñas guardados si alguien más tiene tu dispositivo.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configura un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus usuarios y contraseñas guardados si alguien más tiene tu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Establece un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus contraseñas guardadas y evitar que sean accedidas por otras personas en caso de que alguien más tenga tu dispositivo.</string>
+    <string name="logins_warning_dialog_message_2">Establece un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus contraseñas guardadas y evitar que sean accedidas por otras personas en caso de que alguien más tenga tu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Más tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1814,10 +1829,10 @@
     <string name="saved_logins_sort_strategy_last_used">Usado por última vez</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordenar menú de inicio de sesión</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ordenar menú de inicio de sesión</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menú ordenar contraseñas</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menú ordenar contraseñas</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1825,44 +1840,44 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Direcciones</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Tarjetas de crédito</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Tarjetas de crédito</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
+    <string name="preferences_credit_cards_2">Métodos de pago</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Guardar y autocompletar tarjetas</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar y autocompletar tarjetas</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Guardar y completar métodos de pago</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Guardar y completar métodos de pago</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Los datos están cifrados</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Los datos están cifrados</string>
 
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s cifra todos los métodos de pago que guardes</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s cifra todos los métodos de pago que guardes</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar tarjetas entre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sincronizar tarjetas</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Añadir tarjeta de crédito</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Añadir tarjeta de crédito</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Añadir tarjeta</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Añadir tarjeta</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Administrar tarjetas guardadas</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Administrar tarjetas guardadas</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Administrar tarjetas</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Administrar tarjetas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Añadir dirección</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Administrar direcciones</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Guardar y autocompletar direcciones</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar y autocompletar direcciones</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Guardar y completar direcciones</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Guardar y completar direcciones</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Incluir información como números, correos electrónicos y direcciones de envío</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Incluir información como números, correos electrónicos y direcciones de envío</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Incluye números de teléfono y direcciones de correo electrónico</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Incluye números de teléfono y direcciones de correo electrónico</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Añadir tarjeta</string>
@@ -1883,9 +1898,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Eliminar tarjeta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">¿Seguro que quieres eliminar esta tarjeta de crédito?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">¿Seguro que quieres eliminar esta tarjeta de crédito?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">¿Eliminar tarjeta?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">¿Eliminar tarjeta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Eliminar</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1899,24 +1914,24 @@
     <string name="credit_cards_saved_cards">Tarjetas guardadas</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Por favor, escriba un número válido de tarjeta de crédito</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Por favor, escriba un número válido de tarjeta de crédito</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Introduce un número de tarjeta válido</string>
+    <string name="credit_cards_number_validation_error_message_2">Introduce un número de tarjeta válido</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Por favor, rellena este campo</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Por favor, rellena este campo</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Añadir un nombre</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Añadir un nombre</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloquear para ver tus tarjetas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Asegurar tus tarjetas de crédito</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Asegurar tus tarjetas de crédito</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Protege tus métodos de pago guardados</string>
+    <string name="credit_cards_warning_dialog_title_2">Protege tus métodos de pago guardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Configura un patrón de bloqueo, PIN o contraseña para proteger el acceso a tus tarjetas guardadas si alguien más accede a tu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configura un patrón de bloqueo, PIN o contraseña para proteger el acceso a tus tarjetas guardadas si alguien más accede a tu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Establece un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus métodos de pago guardados y evitar que sean accedidos por otras personas en caso de que alguien más tenga tu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message_3">Establece un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus métodos de pago guardados y evitar que sean accedidos por otras personas en caso de que alguien más tenga tu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1924,10 +1939,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Desbloquear tu dispositivo</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Desbloquear para usar la información de la tarjeta de crédito almacenada</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquear para usar la información de la tarjeta de crédito almacenada</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desbloquea para utilizar métodos de pago guardados</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Desbloquea para utilizar métodos de pago guardados</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Añadir dirección</string>
     <!-- Title of the "Edit address" screen -->
@@ -1935,11 +1950,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Administrar direcciones</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Nombre</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Nombre</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Segundo nombre</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Segundo nombre</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Apellidos</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Apellidos</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nombre</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Domicilio</string>
     <!-- The header for the city of an address -->
@@ -1964,9 +1981,9 @@
     <string name="addressess_delete_address_button">Eliminar dirección</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">¿Seguro que quieres eliminar esta dirección?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">¿Seguro que quieres eliminar esta dirección?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">¿Eliminar esta dirección?</string>
+    <string name="addressess_confirm_dialog_message_2">¿Eliminar esta dirección?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Eliminar</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2065,49 +2082,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Editar</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">¿Seguro que quieres eliminar este inicio de sesión?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">¿Seguro que quieres eliminar este inicio de sesión?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">¿Estás seguro de que quieres eliminar esta contraseña?</string>
+    <string name="login_deletion_confirmation_2">¿Estás seguro de que quieres eliminar esta contraseña?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Eliminar</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancelar</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Opciones de inicio de sesión</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Opciones de inicio de sesión</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opciones de contraseña</string>
+    <string name="login_options_menu_2">Opciones de contraseña</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">El campo de texto editable para la dirección web del inicio de sesión.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">El campo de texto editable para la dirección web del inicio de sesión.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">El campo de texto editable para la dirección del sitio web.</string>
+    <string name="saved_login_hostname_description_3">El campo de texto editable para la dirección del sitio web.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">El campo de texto editable para el nombre de usuario del inicio de sesión.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario del inicio de sesión.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario.</string>
+    <string name="saved_login_username_description_3">El campo de texto editable para el nombre de usuario.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">El campo de texto editable para la contraseña del inicio de sesión.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">El campo de texto editable para la contraseña del inicio de sesión.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">El campo de texto editable para la contraseña.</string>
+    <string name="saved_login_password_description_2">El campo de texto editable para la contraseña.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Guardar cambios para el inicio de sesión.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar cambios para el inicio de sesión.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Guardar cambios.</string>
+    <string name="save_changes_to_login_2">Guardar cambios.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Editar</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Editar</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Editar contraseña</string>
+    <string name="edit_2">Editar contraseña</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Añadir nueva cuenta</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Añadir nueva cuenta</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Añadir contraseña</string>
+    <string name="add_login_2">Añadir contraseña</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Se necesita contraseña</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Se necesita contraseña</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Introduce una contraseña</string>
+    <string name="saved_login_password_required_2">Introduce una contraseña</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Se requiere nombre de usuario</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Se requiere nombre de usuario</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Introduce un nombre de usuario</string>
+    <string name="saved_login_username_required_2">Introduce un nombre de usuario</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Se requiere nombre de servidor</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2220,7 +2237,7 @@
     <string name="radio_preference_info_content_description">Clic para más detalles</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Ir arriba</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Ir arriba</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Cerrar</string>
@@ -2261,8 +2278,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Calificación ajustada</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Se han eliminado las reseñas no fiables</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Basado en revisiones fiables</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Aspectos destacados de reseñas recientes</string>
@@ -2318,10 +2333,6 @@
     <string name="review_quality_check_product_availability_warning_body">Si ves que este producto vuelve a estar disponible, infórmanos y trabajaremos para actualizar el análisis.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Informar que el producto está en stock</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Comprobando la calidad de la reseña</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Comprobando la calidad de la reseña</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Comprobando la calidad de la reseña (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2367,13 +2378,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Saber más</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Al seleccionar “Sí, probarlo”, aceptas %1$s de %2$s y %3$s de Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Al seleccionar “Sí, probarlo”, aceptas %1$s de %2$s y %3$s de Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Al seleccionar “Sí, probarlo”, aceptas lo siguiente de %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Al seleccionar “Sí, probarlo”, aceptas la %2$s de %1$s y los %4$s de %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Al seleccionar “Sí, probarlo”, aceptas la %2$s de %1$s y los %4$s de %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">política de privacidad</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">política de privacidad</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Política de privacidad</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">aviso de privacidad</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">términos de uso</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2444,6 +2461,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">¿Traducir esta página?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Página traducida de %1$s a %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Probar traducciones privadas en %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2456,6 +2477,8 @@
     <string name="translations_bottom_sheet_translate_to">Traducir a</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Ahora no</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Mostrar original</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Hecho</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2478,6 +2501,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Saber más</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Traduciendo…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opciones de traducción</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 7f70955c9..5799fbc48 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -256,6 +256,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Itzuli orria</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Orria %1$s hizkuntzatik %2$s hizkuntzara itzuli da.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Hautatutako hizkuntza</string>
@@ -334,12 +339,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefoxen pribatutasun-oharra</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Argibide gehiago gure pribatutasun-oharrean</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Zu seguru mantentzea dugu xede</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Ezagutu zergatik milioika pertsonek atsegin duten Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Nabigatze segurua aukera gehiagorekin</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Irabazi asmorik gabeko erakundeak babestutako gure nabigatzaileak laguntzen du eragozten enpresek zure webeko jarraipena sekretupean egin dezaten.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">100 milioi pertsona baino gehiagok beraien pribatutasuna babesten duten irabazi-asmorik gabeko batek sostengatutako nabigatzailea aukeratuz.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Jarraipen-elementu ezagunak? Automatikoki blokeatzen dira. Hedapenak? Probatu denak, 700 guztira. PDFak? Integratutako gure irakurgailuarekin erraz kudea daitezke.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Irabazi asmorik gabeko erakundeak babestutako gure nabigatzaileak laguntzen du
 eragozten enpresek zure webeko jarraipena sekretupean egin dezaten.\n\n
 Argibide gehiago gure pribatutasun-oharrean.</string>
@@ -697,9 +712,9 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Laster-markak</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Saio-hasierak</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Saio-hasierak</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Pasahitzak</string>
+    <string name="preferences_sync_logins_2">Pasahitzak</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Irekitako fitxak</string>
     <!-- Preference for signing out -->
@@ -726,9 +741,9 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="default_device_name_2">%1$s / %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Kreditu-txartelak</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditu-txartelak</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Ordainketa metodoak</string>
+    <string name="preferences_sync_credit_cards_2">Ordainketa metodoak</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Helbideak</string>
 
@@ -1675,13 +1690,13 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="add_to_homescreen_description_2">Modu errazean gehi dezakezu webgune hau zure gailuaren hasierako pantailan berehalako sarbidea izan eta aplikazio-moduko esperientziarekin azkarrago nabigatzeko.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Saio-hasierak eta pasahitzak</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Saio-hasierak eta pasahitzak</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Pasahitzak</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Pasahitzak</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Gorde saio-hasierak eta pasahitzak</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Gorde saio-hasierak eta pasahitzak</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Gorde pasahitzak</string>
+    <string name="preferences_passwords_save_logins_2">Gorde pasahitzak</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Galdetu gorde aurretik</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1696,48 +1711,48 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="preferences_android_autofill_description">Bete erabiltzaile-izen eta pasahitzak zure gailuko beste aplikazioetan.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Gehitu saio-hasiera</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Gehitu saio-hasiera</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Gehitu pasahitza</string>
+    <string name="preferences_logins_add_login_2">Gehitu pasahitza</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sinkronizatu saio-hasierak</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sinkronizatu pasahitzak</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sinkronizatu saio-hasierak</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Sinkronizatu pasahitzak</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sinkronizatu saio-hasierak gailuen artean</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sinkronizatu saio-hasierak gailuen artean</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sinkronizatu pasahitzak gailuen artean</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Sinkronizatu pasahitzak gailuen artean</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Gordetako saio-hasierak</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Gordetako saio-hasierak</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Gordetako pasahitzak</string>
+    <string name="preferences_passwords_saved_logins_2">Gordetako pasahitzak</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">%s(e)n gordetzen edo sinkronizatzen dituzun saio-hasierak hemen agertuko dira.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">%s(e)n gordetzen edo sinkronizatzen dituzun saio-hasierak hemen agertuko dira.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">%s(e)n gordetzen edo sinkronizatzen dituzun pasahitzak hemen agertuko dira. Gordetzen dituzun pasahitz guztiak zifratuta daude.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">%s(e)n gordetzen edo sinkronizatzen dituzun pasahitzak hemen agertuko dira. Gordetzen dituzun pasahitz guztiak zifratuta daude.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Sinkronizazioari buruzko argibide gehiago.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Sinkronizazioari buruzko argibide gehiago.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Sinkronizazioari buruzko argibide gehiago</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Sinkronizazioari buruzko argibide gehiago</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Salbuespenak</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Gorde gabeko saio-hasiera eta pasahitzak hemen erakutsiko dira.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Gorde gabeko saio-hasiera eta pasahitzak hemen erakutsiko dira.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s(e)k ez du pasahitzik gordeko hemen zerrendatutako guneetarako.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s(e)k ez du pasahitzik gordeko hemen zerrendatutako guneetarako.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Gune hauetarako ez da saio-hasiera eta pasahitzik gordeko.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Gune hauetarako ez da saio-hasiera eta pasahitzik gordeko.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s(e)k ez du pasahitzik gordeko gune hauetarako.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s(e)k ez du pasahitzik gordeko gune hauetarako.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Ezabatu salbuespen guztiak</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Bilatu saio-hasierak</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Bilatu saio-hasierak</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Bilatu pasahitzak</string>
+    <string name="preferences_passwords_saved_logins_search_2">Bilatu pasahitzak</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Gunea</string>
     <!-- The header for the username for a login -->
@@ -1765,17 +1780,17 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Ezkutatu pasahitza</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Desblokeatu gordetako saio-hasierak ikusteko</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desblokeatu gordetako saio-hasierak ikusteko</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desblokeatu gordetako pasahitzak ikusteko</string>
+    <string name="logins_biometric_prompt_message_2">Desblokeatu gordetako pasahitzak ikusteko</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Lortu zure saio-hasierak eta pasahitzak</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Lortu zure saio-hasierak eta pasahitzak</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Bermatu gordetako zure pasahitzak</string>
+    <string name="logins_warning_dialog_title_2">Bermatu gordetako zure pasahitzak</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Konfiguratu gailua blokeatzeko patroia, PINa edo pasahitza zure saio-hasierak eta pasahitzak babesteko zure gailua beste norbaitek izango balu.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Konfiguratu gailua blokeatzeko patroia, PINa edo pasahitza zure saio-hasierak eta pasahitzak babesteko zure gailua beste norbaitek izango balu.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Konfiguratu gailua blokeatzeko patroia, PINa edo pasahitza zure gordetako pasahitzak babesteko zure gailua beste norbaitek izango balu.</string>
+    <string name="logins_warning_dialog_message_2">Konfiguratu gailua blokeatzeko patroia, PINa edo pasahitza zure gordetako pasahitzak babesteko zure gailua beste norbaitek izango balu.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Geroago</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1793,10 +1808,10 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Azkenekoz erabilia</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordenatu saio-hasieren menua</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ordenatu saio-hasieren menua</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Ordenatu pasahitzen menua</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Ordenatu pasahitzen menua</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1804,44 +1819,44 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Helbideak</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Kreditu-txartelak</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditu-txartelak</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Ordainketa metodoak</string>
+    <string name="preferences_credit_cards_2">Ordainketa metodoak</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Gorde eta osatu automatikoki kreditu-txartelak</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Gorde eta osatu automatikoki kreditu-txartelak</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Gorde eta bete ordainketa metodoak</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Gorde eta bete ordainketa metodoak</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Datuak zifratuta daude</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Datuak zifratuta daude</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">Gordetzen dituzun ordainketa metodo guztiak zifratzen ditu %s(e)k</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">Gordetzen dituzun ordainketa metodo guztiak zifratzen ditu %s(e)k</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sinkronizatu txartelak gailuen artean</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sinkronizatu txartelak</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Gehitu kreditu-txartela</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Gehitu kreditu-txartela</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Gehitu txartela</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Gehitu txartela</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Kudeatu gordetako txartelak</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kudeatu gordetako txartelak</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Kudeatu txartelak</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Kudeatu txartelak</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Gehitu helbidea</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Kudeatu helbideak</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Gorde eta osatu automatikoki helbideak</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Gorde eta osatu automatikoki helbideak</string>
 
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Gorde eta osatu helbideak</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Gorde eta osatu helbideak</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Kontuan izan zenbakiak, helbide elektronikoak eta bidalketa-helbideak</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Kontuan izan zenbakiak, helbide elektronikoak eta bidalketa-helbideak</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Telefono zenbakiak eta helbide elektronikoak ere baditu</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Telefono zenbakiak eta helbide elektronikoak ere baditu</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Gehitu txartela</string>
@@ -1862,9 +1877,9 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Ezabatu txartela</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Ziur zaude kreditu-txartel hau ezabatu nahi duzula?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Ziur zaude kreditu-txartel hau ezabatu nahi duzula?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Ezabatu txartela?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Ezabatu txartela?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Ezabatu</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1877,24 +1892,24 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="credit_cards_saved_cards">Gordetako txartelak</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Idatzi baliozko kreditu-txartel zenbakia</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Idatzi baliozko kreditu-txartel zenbakia</string>
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Idatzi baliozko txartel-zenbakia</string>
+    <string name="credit_cards_number_validation_error_message_2">Idatzi baliozko txartel-zenbakia</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Bete eremu hau mesedez</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Bete eremu hau mesedez</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Gehitu izena</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Gehitu izena</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desblokeatu gordetako txartelak ikusteko</string>
 
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Bermatu zure kreditu-txartelak</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Bermatu zure kreditu-txartelak</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Bermatu gordetako zure ordainketa metodoak</string>
+    <string name="credit_cards_warning_dialog_title_2">Bermatu gordetako zure ordainketa metodoak</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Konfiguratu gailua blokeatzeko patroia, PINa edo pasahitza zure gordetako kreditu-txartelak babesteko zure gailua beste norbaitek izango balu.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Konfiguratu gailua blokeatzeko patroia, PINa edo pasahitza zure gordetako kreditu-txartelak babesteko zure gailua beste norbaitek izango balu.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Konfiguratu gailua blokeatzeko patroia, PINa edo pasahitza gordetako zure ordainketa metodoak babesteko zure gailua beste norbaitek izango balu.</string>
+    <string name="credit_cards_warning_dialog_message_3">Konfiguratu gailua blokeatzeko patroia, PINa edo pasahitza gordetako zure ordainketa metodoak babesteko zure gailua beste norbaitek izango balu.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Konfiguratu orain</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1902,10 +1917,10 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Desblokeatu zure gailua</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Desblokeatu gordetako kreditu txartelaren informazioa erabiltzeko</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desblokeatu gordetako kreditu txartelaren informazioa erabiltzeko</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desblokeatu gordetako ordainketa metodoak erabiltzeko</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Desblokeatu gordetako ordainketa metodoak erabiltzeko</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Gehitu helbidea</string>
     <!-- Title of the "Edit address" screen -->
@@ -1913,11 +1928,13 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Kudeatu helbideak</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Izena</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Izena</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Bigarren izena</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Bigarren izena</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Abizena</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Abizena</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Izena</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Helbidea</string>
     <!-- The header for the city of an address -->
@@ -1941,9 +1958,9 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- The text for the "Delete address" button for deleting an address -->
     <string name="addressess_delete_address_button">Ezabatu helbidea</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Ziur zaude helbide hau ezabatu nahi duzula?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ziur zaude helbide hau ezabatu nahi duzula?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Ezabatu helbidea?</string>
+    <string name="addressess_confirm_dialog_message_2">Ezabatu helbidea?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Ezabatu</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2041,49 +2058,49 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Editatu</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Ziur zaude saio-hasiera hau ezabatu nahi duzula?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Ziur zaude saio-hasiera hau ezabatu nahi duzula?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Ziur zaude pasahitz hau ezabatu nahi duzula?</string>
+    <string name="login_deletion_confirmation_2">Ziur zaude pasahitz hau ezabatu nahi duzula?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Ezabatu</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Utzi</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Saio-hasieren aukerak</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Saio-hasieren aukerak</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Pasahitzaren aukerak</string>
+    <string name="login_options_menu_2">Pasahitzaren aukerak</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Saio-hasieraren web helbiderako testu-eremu editagarria.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Saio-hasieraren web helbiderako testu-eremu editagarria.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Webgunearen helbidearen testu-eremu editagarria.</string>
+    <string name="saved_login_hostname_description_3">Webgunearen helbidearen testu-eremu editagarria.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Saio-hasieraren erabiltzaile-izenerako testu-eremu editagarria.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Saio-hasieraren erabiltzaile-izenerako testu-eremu editagarria.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Erabiltzaile-izenaren testu-eremu editagarria.</string>
+    <string name="saved_login_username_description_3">Erabiltzaile-izenaren testu-eremu editagarria.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Saio-hasieraren pasahitzerako testu-eremu editagarria.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Saio-hasieraren pasahitzerako testu-eremu editagarria.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Pasahitzaren testu-eremu editagarria.</string>
+    <string name="saved_login_password_description_2">Pasahitzaren testu-eremu editagarria.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Gorde saio-hasieraren aldaketak.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Gorde saio-hasieraren aldaketak.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Gorde aldaketak.</string>
+    <string name="save_changes_to_login_2">Gorde aldaketak.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Editatu</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Editatu</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Editatu pasahitza</string>
+    <string name="edit_2">Editatu pasahitza</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Gehitu saio-hasiera berria</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Gehitu saio-hasiera berria</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Gehitu pasahitza</string>
+    <string name="add_login_2">Gehitu pasahitza</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Pasahitza behar da</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Pasahitza behar da</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Idatzi pasahitz bat</string>
+    <string name="saved_login_password_required_2">Idatzi pasahitz bat</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Erabiltzaile-izena behar da</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Erabiltzaile-izena behar da</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Idatzi erabiltzaile-izen bat</string>
+    <string name="saved_login_username_required_2">Idatzi erabiltzaile-izen bat</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Ostalari-izena behar da</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2196,7 +2213,7 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="radio_preference_info_content_description">Egin klik xehetasun gehiagorako</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Nabigatu gora</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Nabigatu gora</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Itxi</string>
@@ -2237,8 +2254,6 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Egokitutako balorazioa</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Balorazio fidagaitzak kenduta</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Balorazio fidagarrietan oinarrituta</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Azken balorazioetan nabarmentzekoak</string>
@@ -2295,10 +2310,6 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="review_quality_check_product_availability_warning_body">Produktua berriz ere erabilgarri dagoela ikusten baduzu, jakinaraz iezaguzu eta balorazioak egiaztatzeari ekingo diogu.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Jakinarazi produktua berriz ere erabilgarri dagoela</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Balorazioaren kalitatea egiaztatzen</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Balorazioaren kalitatea egiaztatzen</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Balorazioaren kalitatea egiaztatzen (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2345,13 +2356,19 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Argibide gehiago</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">&quot;Bai, probatu&quot; aukeratuta, Mozillaren %1$s(r)en %2$s eta %3$s onartzen dituzu.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">&quot;Bai, probatu&quot; aukeratuta, Mozillaren %1$s(r)en %2$s eta %3$s onartzen dituzu.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">&quot;Bai, probatu&quot; hautatuz gero, ondorengoa onartzen duzu %1$s(e)tik:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">&quot;Bai, probatu&quot; aukeratuta, %1$s(r)en %2$s eta %3$s(r)en %4$s onartzen dituzu.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">&quot;Bai, probatu&quot; aukeratuta, %1$s(r)en %2$s eta %3$s(r)en %4$s onartzen dituzu.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">pribatutasun-politika</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">pribatutasun-politika</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Pribatutasun-politika</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">pribatutasun-oharra</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">erabilera-baldintzak</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2422,6 +2439,10 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Itzuli orria?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Orria %1$s hizkuntzatik %2$s hizkuntzara itzuli da</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Probatu itzulpen pribatuak %1$s(e)n</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2434,6 +2455,8 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <string name="translations_bottom_sheet_translate_to">Itzuli hona</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Une honetan ez</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Erakutsi jatorrizkoa</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Eginda</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2456,6 +2479,9 @@ zure pasahitzak, laster-markak eta gehiago zifratzen du.</string>
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Argibide gehiago</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Itzultzen…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Itzulpenen aukerak</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 5655ba231..2e4d402e5 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -68,11 +68,6 @@
     <!-- True Private Browsing Mode -->
     <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
     <string name="felt_privacy_desc_card_title">Non deixe rastro neste dispositivo</string>
-    <!-- Explanation for private browsing displayed to users on home view when they first enable
-        private mode in our new Total Private Browsing mode.
-        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
-        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
-    <string name="felt_privacy_info_card_subtitle" moz:removedIn="120" tools:ignore="UnusedResources">%1$s elimina as súas cookies, o historial e os datos do sitio cando peche todas as súas fiestras privadas. %2$s</string>
     <!-- Explanation for private browsing displayed to users on home view when they first enable
         private mode in our new Total Private Browsing mode.
         The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
@@ -213,6 +208,8 @@
     <string name="resync_button_content_description">Resincronizar</string>
     <!-- Browser menu button that opens the find in page menu -->
     <string name="browser_menu_find_in_page">Atopar na páxina</string>
+    <!-- Browser menu button that opens the translations dialog, which has options to translate the current browser page. -->
+    <string name="browser_menu_translations">Traducir a páxina</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">Gardar na colección</string>
     <!-- Browser menu button that open a share menu to share the current site -->
@@ -241,6 +238,7 @@
     <string name="browser_menu_edit">Editar</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalizar a páxina de inicio</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Páxina de inicio</string>
@@ -248,6 +246,13 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Borrar o historial de navegación</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Traducir a páxina</string>
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Páxina traducida de %1$s a %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Idioma seleccionado</string>
@@ -260,8 +265,6 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Escanear</string>
 
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Motor de buscas</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Configuración do motor de busca</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -315,39 +318,44 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">As notificacións axúdanlle a facer máis con %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">As notificacións axúdanlle a facer máis con %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sincronice as súas lapelas entre dispositivos, xestione as descargas, reciba consellos sobre como aproveitar ao máximo a protección da privacidade de %s e moito máis.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sincronice as súas lapelas entre dispositivos, xestione as descargas, reciba consellos sobre como aproveitar ao máximo a protección da privacidade de %s e moito máis.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Continuar</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Continuar</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Agora non</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Agora non</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-        Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_title_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Faga de Firefox o seu navegador de referencia</string>
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text">Política de privacidade de Firefox</string>
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Obtéña máis información no noso aviso de privacidade</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Encántanos telo seguro</string>
-    <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
         Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_description_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Firefox pon ás persoas por riba dos beneficios e defende a súa privacidade bloqueando os rastrexadores entre sitios.\n\nMáis información no noso aviso de privacidade.</string>
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Descubra por que millóns de persoas adoran Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Navegación segura con máis opcións</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_3">O noso navegador sen ánimo de lucro axuda a evitar que as empresas o sigan en segredo pola web.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Máis de 100 millóns de persoas protexen a súa privacidade escollendo un navegador que está apoiado por unha organización sen ánimo de lucro.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Rastrexadores coñecidos? Bloqueados automaticamente. Extensións? Probe as 700. PDF? O noso lector integrado fai que sexan fáciles de xestionar.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_2">O noso navegador sen ánimo de lucro axuda a evitar que as empresas o sigan en segredo pola web.\n\nMáis información no noso aviso de privacidade.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">O noso navegador sen ánimo de lucro axuda a evitar que as empresas o sigan en segredo pola web.\n\nMáis información no noso aviso de privacidade.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">política de privacidade</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">política de privacidade</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Estabelecer como navegador predeterminado</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_default_browser_negative_button" tools:ignore="UnusedResources">Agora non</string>
     <!-- Title for sign in to sync screen. -->
-    <string name="juno_onboarding_sign_in_title" moz:removedIn="120" tools:ignore="UnusedResources">Alterne entre o teléfono e o portátil</string>
-    <!-- Title for sign in to sync screen. -->
     <string name="juno_onboarding_sign_in_title_2">Manteña todo cifrado cando salte entre dispositivos</string>
-    <!-- Description for sign in to sync screen. -->
-    <string name="juno_onboarding_sign_in_description" moz:removedIn="120" tools:ignore="UnusedResources">Recupere as lapelas e os contrasinais dos seus outros dispositivos para retomalo onde o deixou.</string>
     <!-- Description for sign in to sync screen. Nimbus experiments do not support string placeholders.
      Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_sign_in_description_2">Cando inicia sesión e sincroniza, está máis seguro. Firefox cifra os seus contrasinais, marcadores e moito máis.</string>
@@ -356,15 +364,9 @@
 
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Agora non</string>
-    <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-        Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_enable_notifications_title_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">As notificacións axúdanlle a facer máis con Firefox</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus_2">As notificacións axúdanlle a estar máis seguro con Firefox</string>
-    <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-       Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_enable_notifications_description_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Envía lapelas entre dispositivos, xestiona as descargas e recibe consellos para sacar o máximo proveito de Firefox.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_description_nimbus_2">Envíe pestanas de forma segura entre os seus dispositivos e descubra outras funcións de privacidade en Firefox.</string>
@@ -406,8 +408,6 @@
     <!-- Preference category for settings related to changing the default search engine -->
     <string name="preferences_category_select_default_search_engine">Selecciona un</string>
     <!-- Preference for settings related to managing search shortcuts for the quick search menu -->
-    <string name="preferences_manage_search_shortcuts" moz:removedIn="120" tools:ignore="UnusedResources">Xestionar os atallos de busca</string>
-    <!-- Preference for settings related to managing search shortcuts for the quick search menu -->
     <string name="preferences_manage_search_shortcuts_2">Xestionar buscadores alternativos</string>
     <!-- Summary for preference for settings related to managing search shortcuts for the quick search menu -->
     <string name="preferences_manage_search_shortcuts_summary">Edita os motores visibles no menú de busca</string>
@@ -421,8 +421,6 @@
     <string name="preferences_search_engines">Motores de busca</string>
     <!-- Preference for settings related to Search engines suggestions-->
     <string name="preferences_search_engines_suggestions">Suxestións dos buscadores</string>
-    <!-- Preference for settings related to Search address bar -->
-    <string name="preferences_search_address_bar" moz:removedIn="120" tools:ignore="UnusedResources">Barra de enderezos</string>
     <!-- Preference Category for settings related to Search address bar -->
     <string name="preferences_settings_address_bar">Preferencias da barra de enderezos</string>
     <!-- Preference Category for settings to Firefox Suggest -->
@@ -456,20 +454,10 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Modo só HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Redución do aviso de cookies</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Bloqueador de aviso de cookies</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Bloqueador de aviso de cookies na navegación privada</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Reducir os avisos de cookies</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Desactivado</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Activado</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s tenta rexeitar automaticamente as solicitudes de cookies nos avisos de cookies.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Desactivado para este sitio</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -488,33 +476,15 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Sitio actualmente non soportado</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Quere activar a redución do aviso de cookies para %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Quere activar o bloqueador do aviso de cookies para %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Quere desactivar a redución do aviso de cookies para %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Quere desactivar o bloqueador do aviso de cookies para %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s non pode rexeitar automaticamente as solicitudes de cookies neste sitio. Pode enviar unha solicitude para soportar este sitio no futuro.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s borrará as cookies deste sitio e actualizará a páxina. Ao borrar todas as cookies, é posible que peche a sesión ou baleire os carriños da compra.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Desactivar e %1$s borrará as cookies e volverá cargar este sitio. Isto pode pechar a sesión ou baleirar os carriños da compra.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s tenta rexeitar automaticamente todas as solicitudes de cookies en sitios compatibles.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Activar e %1$s tentará rexeitar automaticamente todos os avisos de cookies deste sitio.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Quere permitir que %1$s rexeite os avisos de cookies?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s pode rexeitar automaticamente moitas solicitudes de avisos de cookies.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Agora non</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Verá menos solicitudes de cookies</string>
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Permitir</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s acaba de rexeitar as cookies por ti</string>
@@ -543,14 +513,10 @@
     <string name="errorpage_httpsonly_message_summary">Non obstante, tamén é posible que estea implicado un atacante. Se continúas ao sitio web, non debes introducir ningunha información confidencial. Se continúas, o modo só HTTPS desactivarase temporalmente para o sitio.</string>
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accesibilidade</string>
-    <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidor de contas de Firefox personalizado</string>
     <!-- Preference to override the Mozilla account server -->
     <string name="preferences_override_account_server">Servidor de contas de Mozilla personalizado</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Servidor de sincronización personalizado</string>
-    <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Modificouse o servidor de conta/sincronización de Firefox. Vaise saír da aplicación para aplicar os cambios…</string>
     <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
     <string name="toast_override_account_sync_server_done">Conta de Mozilla/servidor de sincronización modificado. Saíndo da aplicación para aplicar os cambios…</string>
     <!-- Preference category for account information -->
@@ -568,8 +534,6 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Acceda para sincronizar as lapelas, marcadores, contrasinais e moito máis.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Conta de Firefox</string>
-    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
     <string name="preferences_account_default_name_2">Conta de Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Reconectar para retomar a sincronización</string>
@@ -581,8 +545,6 @@
     <string name="preferences_data_collection">Recollida de datos</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Depuración remota por USB</string>
-    <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Mostrar motores de busca</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mostrar suxestións de busca</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -711,12 +673,6 @@
     <!-- Button text of the Nimbus message for add-ons general availability. -->
     <string name="addon_ga_message_button" tools:ignore="UnusedResources">Explorar os complementos</string>
 
-    <!-- Add-on Installation from AMO-->
-    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">O complemento non é compatíbel</string>
-    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">O complemento xa está instalado</string>
-
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
     <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Os complementos están desactivados temporalmente</string>
@@ -741,7 +697,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Marcadores</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Identificacións</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Identificacións</string>
+    <!-- Preference for syncing passwords -->
+    <string name="preferences_sync_logins_2">Contrasinais</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Lapelas abertas</string>
     <!-- Preference for signing out -->
@@ -766,7 +724,9 @@
     <string name="default_device_name_2">%1$s en %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Tarxetas de crédito</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Tarxetas de crédito</string>
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2">Métodos de pago</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Enderezos</string>
 
@@ -1300,8 +1260,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Rexeitar</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Non se puido imprimir</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Non se pode imprimir esta páxina</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Imprimir</string>
@@ -1346,6 +1304,9 @@
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">Pechar lapelas privadas</string>
 
+    <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
+    <string name="notification_erase_title_android_14">Pechar lapelas privadas?</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">Mercadotecnia</string>
 
@@ -1696,9 +1657,13 @@
     <string name="add_to_homescreen_description_2">Pode engadir facilmente este sitio web á pantalla de inicio do dispositivo para ter acceso instantáneo e navegar máis rápido cunha experiencia semellante á dunha aplicación.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Identificacións e contrasinais</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Identificacións e contrasinais</string>
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords_2">Contrasinais</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Gardar Inicios de sesión e contrasinais</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Gardar Inicios de sesión e contrasinais</string>
+    <string name="preferences_passwords_save_logins_2">Gardar contrasinais</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Preguntar para gardar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1713,28 +1678,41 @@
     <!-- Description for the preference for autofilling logins from Fenix in other apps (e.g. autofilling the Twitter app) -->
     <string name="preferences_android_autofill_description">Encher os nomes de usuario e os contrasinais noutras aplicacións do dispositivo.</string>
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Engadir credenciais</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Engadir credenciais</string>
+
+    <!-- Preference option for adding a password -->
+    <string name="preferences_logins_add_login_2">Engadir contrasinal</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sincronizar os inicios de sesión</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizar os inicios de sesión</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Sincronizar contrasinais</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sincronizar as credenciais entre dispositivos</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizar as credenciais entre dispositivos</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2">Sincronizar os contrasinais entre dispositivos</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Identificacións gardadas</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Identificacións gardadas</string>
+    <!-- Preference to access list of saved passwords -->
+    <string name="preferences_passwords_saved_logins_2">Contrasinais gardados</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Os inicios de sesión que garde ou sincronice co %s aparecerán aquí.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Os inicios de sesión que garde ou sincronice co %s aparecerán aquí.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Obteña máis información sobre Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Obteña máis información sobre Sync.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Obteña máis información sobre Sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Excepcións</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Aquí mostraranse os inicios de sesión e os contrasinais que non se garden.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Aquí mostraranse os inicios de sesión e os contrasinais que non se garden.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Non se gardarán os inicios de sesión e os contrasinais para estes sitios.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Non se gardarán os inicios de sesión e os contrasinais para estes sitios.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eliminar todas as excepcións</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Buscar inicios de sesións</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Buscar inicios de sesións</string>
+    <!-- Hint for search box in passwords list -->
+    <string name="preferences_passwords_saved_logins_search_2">Buscar contrasinais</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sitio</string>
     <!-- The header for the username for a login -->
@@ -1762,11 +1740,11 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Agochar contrasinal</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Desbloquee para ver os seus inicios de sesión gardados</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquee para ver os seus inicios de sesión gardados</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Protexa os seus inicios de sesión e contrasinais</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Protexa os seus inicios de sesión e contrasinais</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Configure un padrón de bloqueo de dispositivo, PIN ou contrasinal para protexer os accesos e contrasinais gardados de que non sexan accedidos se outra persoa ten o seu dispositivo.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configure un padrón de bloqueo de dispositivo, PIN ou contrasinal para protexer os accesos e contrasinais gardados de que non sexan accedidos se outra persoa ten o seu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Máis tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1782,7 +1760,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Usado por última vez</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordenar o menú de inicio de sesión</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ordenar o menú de inicio de sesión</string>
+
+    <!-- Content description (not visible, for screen readers etc.) -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menú de ordenar contrasinais</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1790,30 +1771,45 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Enderezos</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Tarxetas de crédito</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Tarxetas de crédito</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2">Métodos de pagamento</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Gardar e completar automaticamente as tarxetas</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Gardar e completar automaticamente as tarxetas</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Gardar e cubrir os métodos de pago</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Os datos están cifrados</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Os datos están cifrados</string>
 
+    <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s cifra todos os métodos de pago que garda</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar as tarxetas entre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sincronizar as tarxetas</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Engadir unha tarxeta de crédito</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Engadir unha tarxeta de crédito</string>
+    <!-- Preference option for adding a card -->
+    <string name="preferences_credit_cards_add_credit_card_2">Engadir a tarxeta</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Xestionar as tarxetas gardadas</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Xestionar as tarxetas gardadas</string>
 
+    <!-- Preference option for managing saved cards -->
+    <string name="preferences_credit_cards_manage_saved_cards_2">Xestionar tarxetas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Engadir enderezo</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Xestionar enderezos</string>
 
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Gardar e encher automaticamente enderezos</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Gardar e encher automaticamente enderezos</string>
+    <!-- Preference for saving and filling addresses -->
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Gardar e completar os enderezos</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Inclúe información como números, correo electrónico e enderezos de envío</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Inclúe información como números, correo electrónico e enderezos de envío</string>
+
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Inclúe números de teléfono e enderezos de correo electrónico</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Engadir a tarxeta</string>
@@ -1834,7 +1830,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Eliminar a tarxeta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Seguro de que quere eliminar esta tarxeta de crédito?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Seguro de que quere eliminar esta tarxeta de crédito?</string>
+    <!-- The text for the confirmation message of "Delete card" dialog -->
+    <string name="credit_cards_delete_dialog_confirmation_2">Eliminar a tarxeta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Eliminar</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1846,15 +1844,21 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Tarxetas gardadas</string>
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Introduza un número de tarxeta válido</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Introduza un número de tarxeta válido</string>
+    <!-- Error message for card number validation -->
+    <string name="credit_cards_number_validation_error_message_2">Introduza un número de tarxeta válido</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Cubra este campo</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Cubra este campo</string>
+    <!-- Error message for card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message_2">Engadir un nome</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloquee para ver as súas tarxetas gardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Asegure as súas tarxetas de crédito</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Asegure as súas tarxetas de crédito</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title_2">Protexa os seus métodos de pago gardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Configure un padrón de bloqueo de dispositivo, PIN ou contrasinal para evitar que outra persoa co seu dispositivo poida acceder a elas.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configure un padrón de bloqueo de dispositivo, PIN ou contrasinal para evitar que outra persoa co seu dispositivo poida acceder a elas.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar agora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1862,7 +1866,7 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Desbloquear o dispositivo</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Desbloquee para empregar a información almacenada de tarxetas de crédito</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquee para empregar a información almacenada de tarxetas de crédito</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Engadir enderezo</string>
     <!-- Title of the "Edit address" screen -->
@@ -1870,11 +1874,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Xestionar enderezos</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Nome</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Nome</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Segundo nome</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Segundo nome</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Apelidos</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Apelidos</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nome</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Domicilio</string>
     <!-- The header for the city of an address -->
@@ -1898,7 +1904,9 @@
     <!-- The text for the "Delete address" button for deleting an address -->
     <string name="addressess_delete_address_button">Eliminar enderezo</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Seguro de que quere eliminar este enderezo?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Seguro de que quere eliminar este enderezo?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2">Eliminar este enderezo?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Eliminar</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1916,28 +1924,18 @@
     <!-- Title of the Edit search engine screen -->
     <string name="search_engine_edit_custom_search_engine_title">Editar motor de busca</string>
 
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
-    <string name="search_engine_add_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Engadir</string>
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Gardar</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Editar</string>
     <!-- Text for the menu button to delete a search engine -->
     <string name="search_engine_delete">Eliminar</string>
 
-    <!-- Text for the button to create a custom search engine on the Add search engine screen -->
-    <string name="search_add_custom_engine_label_other" moz:RemovedIn="120" tools:ignore="UnusedResources">Outro</string>
     <!-- Label for the TextField in which user enters custom search engine name -->
     <string name="search_add_custom_engine_name_label">Nome</string>
-    <!-- Placeholder text shown in the Search Engine Name TextField before a user enters text -->
-    <string name="search_add_custom_engine_name_hint" moz:RemovedIn="120" tools:ignore="UnusedResources">Nome</string>
     <!-- Placeholder text shown in the Search Engine Name text field before a user enters text -->
     <string name="search_add_custom_engine_name_hint_2">Nome do buscador</string>
     <!-- Label for the TextField in which user enters custom search engine URL -->
     <string name="search_add_custom_engine_url_label">URL da cadea de busca</string>
     <!-- Placeholder text shown in the Search String TextField before a user enters text -->
-    <string name="search_add_custom_engine_search_string_hint" moz:RemovedIn="120" tools:ignore="UnusedResources">Cadea de busca para usar</string>
-    <!-- Placeholder text shown in the Search String TextField before a user enters text -->
     <string name="search_add_custom_engine_search_string_hint_2">URL para usar para a busca</string>
     <!-- Description text for the Search String TextField. The %s is part of the string -->
     <string name="search_add_custom_engine_search_string_example" formatted="false">Substitúír a consulta por «%s». Exemplo:\nhttps://www.google.com/search?q=%s</string>
@@ -2008,31 +2006,47 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Editar</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Confirma que desexa eliminar este inicio de sesión?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Confirma que desexa eliminar este inicio de sesión?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2">Seguro que quere eliminar este contrasinal?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Eliminar</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancelar</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Opcións de inicio de sesión</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Opcións de inicio de sesión</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2">Opcións de contrasinal</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">O campo de texto editábel para o enderezo web do inicio de sesión.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">O campo de texto editábel para o enderezo web do inicio de sesión.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">O campo de texto editábel para o nome de usuario do inicio de sesión.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">O campo de texto editábel para o nome de usuario do inicio de sesión.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">O campo de texto editábel para o contrasinal do inicio de sesión.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">O campo de texto editábel para o contrasinal do inicio de sesión.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Gardar os cambios para iniciar sesión.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Gardar os cambios para iniciar sesión.</string>
+    <!--  The button description to save changes to an edited password. -->
+    <string name="save_changes_to_login_2">Gardar cambios.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Editar</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Editar</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2">Editar contrasinal</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Engadir novas credenciais</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Engadir novas credenciais</string>
+    <!--  The page title for adding new password. -->
+    <string name="add_login_2">Engadir contrasinal</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Contrasinal obrigatorio</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Contrasinal obrigatorio</string>
+    <!--  Error text displayed underneath the password field when it is in an error case. -->
+    <string name="saved_login_password_required_2">Introduza un contrasinal</string>
+    <!--  The error message in add login view when username field is blank. -->
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Requírese un nome de usuario</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Requírese un nome de usuario</string>
+    <string name="saved_login_username_required_2">Introduza un nome de usuario</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Requírese un nome de servidor</string>
+    <!--  The error message in add login view when hostname field is blank. -->
+    <string name="saved_login_hostname_required_2" tools:ignore="UnusedResources">Introduza un enderezo web</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Busca por voz</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -2123,6 +2137,9 @@
     <string name="other_default_search_engine_suggestion_header">Buscar con %s</string>
 
     <!-- Default browser experiment -->
+    <!-- Default browser card title -->
+    <string name="default_browser_experiment_card_title">Cambie o seu navegador predeterminado</string>
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Estabelecer ligazóns de sitios web, enderezos de correo electrónico e mensaxes para que se abran automaticamente no Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2132,7 +2149,7 @@
     <string name="radio_preference_info_content_description">Premer para obter máis detalles</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Navegar cara arriba</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Navegar cara arriba</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Pechar</string>
@@ -2161,8 +2178,6 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Verificador de recensións</string>
-    <!-- Name for the review quality check feature used as title for the panel. -->
     <string name="review_quality_check_feature_name_2">Verificador de recensións</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Recensións fiables</string>
@@ -2175,7 +2190,7 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Calificación axustada</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description">Elimináronse as recensións pouco fiables</string>
+    <string name="review_quality_check_adjusted_rating_description_2">Baseado en recensións fiables</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Destacados das recensións recentes</string>
 
@@ -2187,22 +2202,16 @@
     <string name="review_quality_check_info_review_grade_header"><![CDATA[Asignamos ás recensións de cada produto unha <b>nota</b> de A a F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Recensións fiables. Cremos que as recensións son probablemente de clientes reais que deixaron recensións honestas e imparciais.</string>
-    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
-    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Cremos que os comentarios son fiables.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Cremos que hai unha mestura de recensións fiables e pouco fiables.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Recensións pouco fiables. Cremos que as recensións probablemente sexan falsas ou de revisores tendenciosos.</string>
-    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
-    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Cremos que os comentarios non son fiables.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[A <b>valoración axustada</b> baséase só nas recensións que consideramos fiables.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[Os <b>destacados</b> son de %s recensións dos últimos 80 días que consideramos fiables.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Máis información sobre %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">como %s de Mozilla determina a calidade da recensión</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">como %s determina a calidade da revisión</string>
     <!-- Text for title of settings section. -->
@@ -2210,8 +2219,6 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Mostrar anuncios no verificador de recensións</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Verás anuncios ocasionais de produtos relevantes. Todos os anuncios deben cumprir os nosos estándares de calidade de recensións. %s</string>
-    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
     <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Verá anuncios ocasionais de produtos relevantes. Só anunciamos produtos con críticas fiables. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Máis información</string>
@@ -2234,23 +2241,19 @@
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
     <string name="review_quality_check_no_reviews_warning_body">Cando este produto teña máis recensións, poderemos comprobar a súa calidade.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
-    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">O produto non está dispoñible</string>
+    <string name="review_quality_check_product_availability_warning_title">O produto non está dispoñible</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
-    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Se ves que este produto está de novo en stock, infórmao e traballaremos en comprobar as recensións.</string>
-    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Informar que este produto está de novo en stock</string>
+    <string name="review_quality_check_product_availability_warning_body">Se ves que este produto está de novo en stock, infórmao e traballaremos en comprobar as recensións.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Informar que o produto está en stock</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title">Comprobando a calidade da recensión</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title">Comprobando a calidade da recensión</string>
+    <string name="review_quality_check_product_availability_warning_action_2">Informar que o produto está en stock</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
+    <string name="review_quality_check_analysis_in_progress_warning_title_2">Comprobando a calidade da recensión (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
     <string name="review_quality_check_analysis_in_progress_warning_body">Isto pode levar uns 60 segundos.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
-    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Grazas por informar!</string>
+    <string name="review_quality_check_analysis_requested_info_title">Grazas por informar!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
-    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Deberíamos ter información sobre as recensións deste produto nun prazo de 24 horas. Volve a comprobalo máis tarde.</string>
+    <string name="review_quality_check_analysis_requested_info_body">Deberíamos ter información sobre as recensións deste produto nun prazo de 24 horas. Volve a comprobalo máis tarde.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
     <string name="review_quality_check_not_analyzable_info_title">Non podemos comprobar estas recensións</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
@@ -2288,17 +2291,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Máis información</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="121" tools:ignore="UnusedResources">Ao seleccionar «Si, probalo», acepta %2$s e %3$s de %1$s de Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Ao seleccionar «Si, probalo», acepta %2$s e %3$s de %1$s de Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
-    <string name="review_quality_check_contextual_onboarding_caption_2">Ao seleccionar «Si, probalo», acepta o seguinte de %1$s:</string>
+    <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Ao seleccionar «Si, probalo», acepta o seguinte de %1$s:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="121" tools:ignore="UnusedResources">política de privacidade</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">política de privacidade</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy_2">Política de privacidade</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Política de privacidade</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">política de privacidade</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
-    <string name="review_quality_check_contextual_onboarding_terms_use" moz:RemovedIn="121" tools:ignore="UnusedResources">temos de uso</string>
+    <string name="review_quality_check_contextual_onboarding_terms_use">temos de uso</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
-    <string name="review_quality_check_contextual_onboarding_terms_use_2">Temos de uso</string>
+    <string name="review_quality_check_contextual_onboarding_terms_use_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Temos de uso</string>
     <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_primary_button_text">Si, probalo</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
@@ -2335,6 +2340,9 @@
     <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
     <string name="review_quality_check_highlights_type_competitiveness">Competitividade</string>
 
+    <!-- Text that is surrounded by quotes. The parameter is the actual text that is in quotes. An example of that text could be: Excellent craftsmanship, and that is displayed as “Excellent craftsmanship”. The text comes from a buyer's review that the feature is highlighting"   -->
+    <string name="surrounded_with_quotes">«%s»</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">contraer</string>
@@ -2352,4 +2360,169 @@
     <string name="a11y_action_label_pocket_learn_more">abrir a ligazón para saber máis</string>
     <!-- Content description for headings announced by accessibility service. The first parameter is the text of the heading. Talkback will announce the first parameter and then speak the word "Heading" indicating to the user that this text is a heading for a section. -->
     <string name="a11y_heading">%s, Título</string>
+
+    <!-- Title for dialog displayed when trying to access links present in a text. -->
+    <string name="a11y_links_title">Ligazóns</string>
+    <!-- Additional content description for text bodies that contain urls. -->
+    <string name="a11y_links_available">Ligazóns dispoñibles</string>
+
+    <!-- Translations feature-->
+
+    <!-- Translation request dialog -->
+    <!-- Title for the translation dialog that allows a user to translate the webpage. -->
+    <string name="translations_bottom_sheet_title">Traducir esta páxina?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Páxina traducida de %1$s a %2$s</string>
+    <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translations_bottom_sheet_title_first_time">Probe as traducións privadas en %1$s</string>
+    <!-- Text that links to additional information about the Firefox translations feature. -->
+    <string name="translations_bottom_sheet_info_message_learn_more">Máis información</string>
+    <!-- Label for the dropdown to select which language to translate from on the translations dialog. Usually the translate from language selected will be the same as the page language. -->
+    <string name="translations_bottom_sheet_translate_from">Traducir do</string>
+    <!-- Label for the dropdown to select which language to translate to on the translations dialog. Usually the translate to language selected will be the user's preferred language. -->
+    <string name="translations_bottom_sheet_translate_to">Traducir a</string>
+    <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
+    <string name="translations_bottom_sheet_negative_button">Agora non</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Amosar orixinal</string>
+    <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
+    <string name="translations_bottom_sheet_negative_button_error">Feito</string>
+    <!-- Button text on the translations dialog to begin a translation of the website. -->
+    <string name="translations_bottom_sheet_positive_button">Traducir</string>
+    <!-- Button text on the translations dialog when a translation error appears. -->
+    <string name="translations_bottom_sheet_positive_button_error">Tentar de novo</string>
+    <!-- Inactive button text on the translations dialog that indicates a translation is currently in progress. This button will be accompanied by a loading icon. -->
+    <string name="translations_bottom_sheet_translating_in_progress">Traducindo</string>
+    <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
+    <string name="translations_bottom_sheet_translating_in_progress_content_description">Tradución en curso</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Escoller un idioma</string>
+    <!-- The title of the warning card informs the user that a translation could not be completed. -->
+    <string name="translation_error_could_not_translate_warning_text">Houbo un problema ao traducir. Por favor, ténteo de novo.</string>
+    <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
+    <string name="translation_error_could_not_load_languages_warning_text">Non se puideron cargar os idiomas. Comprobe a súa conexión a Internet e ténteo de novo.</string>
+    <!-- The title of the warning card informs the user that a language is not supported. The first parameter is the name of the language that is not supported. -->
+    <string name="translation_error_language_not_supported_warning_text">Sentímolo, aínda non admitimos %1$s.</string>
+    <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
+    <string name="translation_error_language_not_supported_learn_more">Máis información</string>
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Traducindo…</string>
+
+    <!-- Translations options dialog -->
+    <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
+    <string name="translation_option_bottom_sheet_title">Opcións de tradución</string>
+    <!-- Toggle switch label that allows a user to set the setting if they would like the browser to always offer or suggest translations when available. -->
+    <string name="translation_option_bottom_sheet_always_translate">Ofrecer sempre a tradución</string>
+    <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
+    <string name="translation_option_bottom_sheet_never_translate_site">Non traducir nunca este sitio</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Sobrescribe todas as demais configuracións</string>
+    <!-- Button text for the button that will take the user to the translation settings dialog. -->
+    <string name="translation_option_bottom_sheet_translation_settings">Configuración da tradución</string>
+
+    <!-- Translation settings dialog -->
+    <!-- Title of the translation settings dialog that allows a user to set their preferred translation settings. -->
+    <string name="translation_settings_toolbar_title">Traducións</string>
+    <!-- Toggle switch label that indicates that the browser should signal or indicate when a translation is possible for any page. -->
+    <string name="translation_settings_offer_to_translate">Ofrécese a traducir cando sexa posible</string>
+    <!-- Section header text that begins the section of a list of different options the user may select to adjust their translation preferences. -->
+    <string name="translation_settings_translation_preference">Preferencias de tradución</string>
+    <!-- Button text for the button that will take the user to the automatic translations settings dialog. On the automatic translations settings dialog, the user can set if translations should occur automatically for a given language. -->
+    <string name="translation_settings_automatic_translation">Tradución automática</string>
+    <!-- Button text for the button that will take the user to the never translate these sites dialog. On the never translate these sites dialog, the user can set if translations should never occur on certain websites. -->
+    <string name="translation_settings_automatic_never_translate_sites">Non traducir nunca estes sitios</string>
+    <!-- Button text for the button that will take the user to the download languages dialog. On the download languages dialog, the user can manage which languages they would like to download for translations. -->
+    <string name="translation_settings_download_language">Descargar idiomas</string>
+
+    <!-- Automatic translation preference screen -->
+    <!-- Title of the automatic translation preference screen that will appear on the toolbar.-->
+    <string name="automatic_translation_toolbar_title_preference">Tradución automática</string>
+
+    <!-- Preference option for always translate. Radio button title text. -->
+    <string name="automatic_translation_option_always_translate_title_preference">Traduce sempre</string>
+    <!-- Preference option for never translate. Radio button title text.-->
+    <string name="automatic_translation_option_never_translate_title_preference">Non traducir nunca</string>
+
+    <!-- Content description (not visible, for screen readers etc.): For a never-translated site list item that is selected.
+             The first parameter is web site url (for example:"wikipedia.com") -->
+    <string name="never_translate_site_item_list_content_description_preference">Retirar %1$s</string>
+    <!-- The Delete site dialogue title will appear when the user clicks on a list item.
+             The first parameter is web site url (for example:"wikipedia.com") -->
+    <string name="never_translate_site_dialog_title_preference">Eliminar %1$s?</string>
+    <!-- The Delete site dialogue positive button will appear when the user clicks on a list item. The site will be deleted. -->
+    <string name="never_translate_site_dialog_confirm_delete_preference">Eliminar</string>
+    <!-- The Delete site dialogue negative button will appear when the user clicks on a list item. The dialog will be dismissed. -->
+    <string name="never_translate_site_dialog_cancel_preference">Cancelar</string>
+
+    <!-- Download languages preference screen -->
+    <!-- Title of the download languages preference screen toolbar.-->
+    <string name="download_languages_toolbar_title_preference">Descargar idiomas</string>
+    <!-- Clickable text from the screen header that links to a website. -->
+    <string name="download_languages_header_learn_more_preference">Máis información</string>
+    <!-- The subhead of the download language preference screen will appear above the pivot language. -->
+    <string name="download_languages_available_languages_preference">Idiomas dispoñíbeis</string>
+    <!-- Text that will appear beside a core or pivot language package name to show that the language is necessary for the translation feature to function. -->
+    <string name="download_languages_default_system_language_require_preference">requirido</string>
+    <!-- A text for download language preference item.
+    The first parameter is the language name, for example, "Spanish".
+    The second parameter is the language file size, for example, "(3.91 KB)" or, if the language package name is a pivot language, "(required)". -->
+    <string name="download_languages_language_item_preference">%1$s (%2$s)</string>
+    <!-- The subhead of the download language preference screen will appear above the items that were not downloaded. -->
+    <string name="download_language_header_preference">Descargar idiomas</string>
+    <!-- All languages list item. When the user presses this item, they can download or delete all languages. -->
+    <string name="download_language_all_languages_item_preference">Todos os idiomas</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item that was downloaded, the user can now delete it. -->
+    <string name="download_languages_item_content_description_downloaded_state">Eliminar</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item, downloading is in progress. -->
+    <string name="download_languages_item_content_description_in_progress_state">En progreso</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item that was not downloaded. -->
+    <string name="download_languages_item_content_description_not_downloaded_state">Descargar</string>
+    <!-- Content description (not visible, for screen readers etc.): For a language list item that is selected. -->
+    <string name="download_languages_item_content_description_selected_state">Seleccionado</string>
+
+    <!-- Title for the dialog used by the translations feature to confirm deleting a language.
+    The dialog will be presented when the user requests deletion of a language.
+    The first parameter is the name of the language, for example, "Spanish" and the second parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_file_dialog_title">Eliminar %1$s (%2$s)?</string>
+    <!-- Button text on the dialog used by the translations feature to confirm deleting a language. -->
+    <string name="delete_language_file_dialog_positive_button_text">Eliminar</string>
+    <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
+    <string name="delete_language_file_dialog_negative_button_text">Cancelar</string>
+
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
+    <string name="download_language_file_dialog_positive_button_text">Descargar</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file and perform a translation. -->
+    <string name="download_language_file_dialog_positive_button_text_all_languages">Descargar e traducir</string>
+    <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
+    <string name="download_language_file_dialog_negative_button_text">Cancelar</string>
+
+    <!-- Debug drawer -->
+    <!-- The user-facing title of the Debug Drawer feature. -->
+    <string name="debug_drawer_title">Ferramentas de depuración</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate back within the debug drawer. -->
+    <string name="debug_drawer_back_button_content_description">Retroceder no historial</string>
+    <!-- The title of the Tab Tools feature in the Debug Drawer. -->
+    <string name="debug_drawer_tab_tools_title">Ferramentas de lapelas</string>
+    <!-- The title of the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_title">Número de lapelas</string>
+    <!-- The active tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_normal">Activo</string>
+    <!-- The inactive tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_inactive">Inactivo</string>
+    <!-- The private tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_private">Privado</string>
+    <!-- The total tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_total">Total</string>
+    <!-- The title of the tab creation tool section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_title">Ferramenta de creación de lapelas</string>
+    <!-- The label of the text field in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_text_field_label">Cantidade de lapelas a crear</string>
+    <!-- The button text to add tabs to the active tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_active">Engadir ás lapelas activas</string>
+    <!-- The button text to add tabs to the inactive tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_inactive">Engadir ás lapelas inactivas</string>
+    <!-- The button text to add tabs to the private tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_private">Engadir ás lapelas privadas</string>
 </resources>
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index fae15c712..f3b52180b 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -335,15 +335,21 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox жекелік ескертуі</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Біздің жекелік ескертуімізден көбірек біліңіз</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Біздің жекелік ескертуімізден көбірек біліңіз</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Біз сіздің қауіпсіздігіңізді қамтамасыз етуді жақсы көреміз</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Миллиондаған адам неге Firefox-ты жақсы көретінін біліңіз</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Қосымша таңдаулары бар қауіпсіз шолу</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Коммерциялық емес ұйымы қолдауымен жасалатын біздің браузер компанияларды интернетте сізді жасырын түрде бақылауын автоматты түрде тоқтатуға көмектеседі.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Коммерциялық емес ұйым қолдайтын браузерді таңдау арқылы 100 миллионнан астам адам өз жекелігін қорғайды.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Белгілі трекерлер? Автоматты түрде бұғатталған. Кеңейтулер? Барлық 700 түрін қолданып көріңіз. PDF файлдары? Құрамындағы оқу қолданбасы оларды басқаруды жеңілдетеді.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Коммерциялық емес ұйымы қолдау көрсететін браузеріміз компаниялардың сізді интернетте жасырын бақылап отыруын тоқтатуға көмектеседі.\n\nЖекелік ескертуімізден толығырақ ақпарат алыңыз.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -2337,10 +2343,16 @@
     <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">&quot;Иә, қолданып көру&quot; опциясын таңдау арқылы сіз Mozilla ұсынған %1$s қолданбасының %2$s және %3$s шарттарымен келісесіз.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">&quot;Иә, қолданып көру&quot; опциясын таңдау арқылы сіз %1$s ұсынған келесімен келісесіз:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">&quot;Иә, қолданып көру&quot; таңдау арқылы сіз %1$s %2$s және %3$s %4$s шарттарымен келісесіз.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">&quot;Иә, қолданып көру&quot; таңдау арқылы сіз %1$s %2$s және %3$s %4$s шарттарымен келісесіз.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">жекелік саясаты</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Жекелік саясаты</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">жекелік ескертуі</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">қолдану шарттары</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2413,6 +2425,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Бұл парақты аудару керек пе?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Бет %1$s тілінен %2$s тіліне аударылды</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">%1$s ішіндегі жекелік аудармаларды қолданып көріңіз</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2426,6 +2442,8 @@
     <string name="translations_bottom_sheet_translate_to">Мақсат тілі:</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Қазір емес</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Түпнұсқаны көрсету</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Дайын</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2448,6 +2466,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Көбірек білу</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Аударуда…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Аударма баптаулары</string>
diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml
index e9e3d83bf..2a3c445ad 100644
--- a/app/src/main/res/values-pa-rIN/strings.xml
+++ b/app/src/main/res/values-pa-rIN/strings.xml
@@ -260,6 +260,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">ਸਫ਼ੇ ਦਾ ਉਲੱਥਾ ਕਰੋ</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">ਸਫ਼ੇ ਦਾ %1$s ਤੋਂ %2$s ਵਿੱਚ ਅਨੁਵਾਦ ਕੀਤਾ।</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">ਚੁਣੀ ਹੋਈ ਬੋਲੀ</string>
@@ -338,12 +343,20 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox ਪਰਦੇਦਾਰੀ ਸੂਚਨਾ</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">ਸਾਡੀ ਪਰਦੇਦਾਰੀ ਸੂਚਨਾ ਵਿੱਚ ਹੋਰ ਜਾਣਕਾਰੀ ਲਵੋ</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">ਅਸੀਂ ਤੁਹਾਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹਾਂ</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">ਪਤਾ ਕਰੋ ਕਿ ਲੱਖਾਂ Firefox ਨੂੰ ਪਸੰਦ ਕਿਉਂ ਕਰਦੇ ਹਨ</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">ਹੋਰ ਚੋਣਾਂ ਨਾਲ ਸੁਰੱਖਿਅਤ ਬਰਾਊਜ਼ ਕਰਨਾ</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">ਕੰਪਨੀਆਂ ਨੂੰ ਚੋਰੀ ਚੋਰੀ ਵੈੱਬ ਉੱਤੇ ਤੁਹਾਡਾ ਪਿੱਛਾ ਕਰਨ ਤੋਂ ਸਾਡਾ ਗ਼ੈਰ-ਫਾਇਦਾ ਸਮਰੱਥ ਬਰਾਊਜ਼ਰ ਆਪਣੇ-ਆਪ ਹੀ ਰੋਕਦਾ ਹੈ।</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">ਜਾਣੇ-ਪਛਾਣੇ ਟਰੈਕਰ? ਆਪਣੇ ਆਪ ਪਾਬੰਦੀ ਲਾਈ। ਇਕਸਟੈਨਸ਼ਨ? 700 ਤੋਂ ਵੱਧ ਅਜ਼ਮਾਉਣ ਲਈ। PDF? ਸਾਡੇ ਬਿਲਟ-ਇਨ ਰੀਡਰ ਨਾਲ ਉਹਨਾਂ ਨੂੰ ਵਰਤਣਾ ਸੌਖਾ।</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">ਸਾਡਾ ਗ਼ੈਰ-ਮੁਨਾਫ਼ਾ ਸਮਰੱਥ ਬਰਾਊਜ਼ਰ ਕੰਪਨੀਆਂ ਨੂੰ ਵੈੱਬ ਉੱਤੇ ਚੋਰੀ ਛਿਪੇ ਪਿੱਛਾ ਕਰਨ ਤੋਂ ਰੋਕਣ ਲਈ ਮਦਦ ਕਰਦਾ ਹੈ।\n\nਸਾਡੇ ਪਰਦੇਦਾਰੀ ਨੋਟਿਸ ਬਾਰੇ ਹੋਰ ਸਿੱਖੋ।</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -703,9 +716,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">ਬੁੱਕਮਾਰਕ</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">ਲਾਗਇਨ</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">ਲਾਗਇਨ</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ</string>
+    <string name="preferences_sync_logins_2">ਪਾਸਵਰਡ</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">ਟੈਬਾਂ ਖੋਲ੍ਹੋ</string>
     <!-- Preference for signing out -->
@@ -732,9 +745,9 @@
     <string name="default_device_name_2">%2$s %3$s ਉੱਤੇ %1$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">ਕਰੈਡਿਟ ਕਾਰਡ</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">ਕਰੈਡਿਟ ਕਾਰਡ</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">ਭੁਗਤਾਨ ਦੇ ਢੰਗ</string>
+    <string name="preferences_sync_credit_cards_2">ਭੁਗਤਾਨ ਦੇ ਢੰਗ</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">ਸਿਰਨਾਵੇਂ</string>
 
@@ -1685,13 +1698,13 @@
 ਮੁੱਖ ਸਕਰੀਨ ਉੱਤੇ ਸੌਖੀ ਤਰ੍ਹਾਂ ਜੋੜ ਸਕਦੇ ਹੋ।</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡ</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡ</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ</string>
+    <string name="preferences_passwords_logins_and_passwords_2">ਪਾਸਵਰਡ</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡ ਸੰਭਾਲੋ</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡ ਸੰਭਾਲੋ</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡਾਂ ਨੂੰ ਸੰਭਾਲੋ</string>
+    <string name="preferences_passwords_save_logins_2">ਪਾਸਵਰਡਾਂ ਨੂੰ ਸੰਭਾਲੋ</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save"> ਸੰਭਾਲਣ ਲਈ ਪੁੱਛੋ</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1706,47 +1719,47 @@
     <!-- Description for the preference for autofilling logins from Fenix in other apps (e.g. autofilling the Twitter app) -->
     <string name="preferences_android_autofill_description">ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਉੱਤੇ ਹੋਰ ਐਪਾਂ ਵਿੱਚ ਵਰਤੋਂਕਾਰ-ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਭਰੋ।</string>
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">ਲਾਗਇਨ ਜੋੜੋ</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">ਲਾਗਇਨ ਜੋੜੋ</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਜੋੜੋ</string>
+    <string name="preferences_logins_add_login_2">ਪਾਸਵਰਡ ਜੋੜੋ</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">ਲਾਗਇਨ ਸਿੰਕ ਕਰੋ</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਸਿੰਕ ਕਰੋ</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">ਲਾਗਇਨ ਸਿੰਕ ਕਰੋ</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">ਪਾਸਵਰਡ ਸਿੰਕ ਕਰੋ</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">ਡਿਵਾਈਸਾਂ ਵਿਚਾਲੇ ਲਾਗਇਨਾਂ ਨੂੰ ਸਿੰਕ ਕਰੋ</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">ਡਿਵਾਈਸਾਂ ਵਿਚਾਲੇ ਲਾਗਇਨਾਂ ਨੂੰ ਸਿੰਕ ਕਰੋ</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਡਿਵਾਈਸਾਂ ਵਿਚਾਲੇ ਸਿੰਕ ਕਰੋ</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">ਪਾਸਵਰਡ ਡਿਵਾਈਸਾਂ ਵਿਚਾਲੇ ਸਿੰਕ ਕਰੋ</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">ਸੰਭਾਲੇ ਹੋਏ ਲਾਗਇਨ</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">ਸੰਭਾਲੇ ਹੋਏ ਲਾਗਇਨ</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡ</string>
+    <string name="preferences_passwords_saved_logins_2">ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡ</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">ਤੁਹਾਡੇ ਵਲੋਂ ਸੰਭਾਲੇ ਲਾਗਇਨ ਜਾਂ %s ਨਾਲ ਸਿੰਕ ਕੀਤੇ ਇੱਥੇ ਵੇਖਾਏ ਜਾਣਗੇ।</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">ਤੁਹਾਡੇ ਵਲੋਂ ਸੰਭਾਲੇ ਲਾਗਇਨ ਜਾਂ %s ਨਾਲ ਸਿੰਕ ਕੀਤੇ ਇੱਥੇ ਵੇਖਾਏ ਜਾਣਗੇ।</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">ਤੁਹਾਡੇ ਵਲੋਂ %s ਵਿੱਚ ਸੰਭਾਲੇ ਜਾਂ ਸਿੰਕ ਕੀਤੇ ਪਾਸਵਰਡਾਂ ਨੂੰ ਇੱਥੇ ਦਿਖਾਇਆ ਜਾਵੇਗਾ। ਤੁਹਾਡੇ ਸਾਰੇ ਸੰਭਾਲੇ ਪਾਸਵਰਡ ਇੰਕ੍ਰਿਪਟ ਕੀਤੇ ਹੁੰਦੇ ਹਨ।</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">ਤੁਹਾਡੇ ਵਲੋਂ %s ਵਿੱਚ ਸੰਭਾਲੇ ਜਾਂ ਸਿੰਕ ਕੀਤੇ ਪਾਸਵਰਡਾਂ ਨੂੰ ਇੱਥੇ ਦਿਖਾਇਆ ਜਾਵੇਗਾ। ਤੁਹਾਡੇ ਸਾਰੇ ਸੰਭਾਲੇ ਪਾਸਵਰਡ ਇੰਕ੍ਰਿਪਟ ਕੀਤੇ ਹੁੰਦੇ ਹਨ।</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">ਸਿੰਕ ਬਾਰੇ ਹੋਰ ਜਾਣੋ।</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">ਸਿੰਕ ਬਾਰੇ ਹੋਰ ਜਾਣੋ।</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">ਸਿੰਕ ਬਾਰੇ ਹੋਰ ਜਾਣੋ</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">ਸਿੰਕ ਬਾਰੇ ਹੋਰ ਜਾਣੋ</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">ਛੋਟਾਂ</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">ਨਾ ਸੰਭਾਲੇ ਹੋਏ ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡਾਂ ਨੂੰ ਇੱਥੇ ਸੰਭਾਲਿਆ ਜਾਵੇਗਾ।</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">ਨਾ ਸੰਭਾਲੇ ਹੋਏ ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡਾਂ ਨੂੰ ਇੱਥੇ ਸੰਭਾਲਿਆ ਜਾਵੇਗਾ।</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s ਇੱਥੇ ਦਿੱਤੀਆਂ ਹੋਈਆਂ ਸਾਈਟਾਂ ਲਈ ਪਾਸਵਰਡ ਨਹੀਂ ਸੰਭਾਲੇਗਾ।</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s ਇੱਥੇ ਦਿੱਤੀਆਂ ਹੋਈਆਂ ਸਾਈਟਾਂ ਲਈ ਪਾਸਵਰਡ ਨਹੀਂ ਸੰਭਾਲੇਗਾ।</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">ਇਹਨਾਂ ਸਾਈਟਾਂ ਲਈ ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡ ਨਹੀਂ ਸੰਭਾਲੇ ਜਾਣਗੇ।</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ਇਹਨਾਂ ਸਾਈਟਾਂ ਲਈ ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡ ਨਹੀਂ ਸੰਭਾਲੇ ਜਾਣਗੇ।</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s ਇਹਨਾਂ ਸਾਈਟਾਂ ਲਈ ਪਾਸਵਰਡ ਨਹੀਂ ਸੰਭਾਲੇਗਾ।</string>
+    <string name="preferences_passwords_exceptions_description_2">%s ਇਹਨਾਂ ਸਾਈਟਾਂ ਲਈ ਪਾਸਵਰਡ ਨਹੀਂ ਸੰਭਾਲੇਗਾ।</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">ਸਾਰੀਆਂ ਛੋਟਾਂ ਹਟਾ ਦਿਓ</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">ਲਾਗਇਨ ਖੋਜੋ</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">ਲਾਗਇਨ ਖੋਜੋ</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਖੋਜੋ</string>
+    <string name="preferences_passwords_saved_logins_search_2">ਪਾਸਵਰਡ ਖੋਜੋ</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">ਸਾਈਟ</string>
     <!-- The header for the username for a login -->
@@ -1774,17 +1787,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">ਪਾਸਵਰਡ ਲੁਕਾਓ</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">ਆਪਣੇ ਸੰਭਾਲੇ ਲਾਗਇਨ ਵੇਖਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ਆਪਣੇ ਸੰਭਾਲੇ ਲਾਗਇਨ ਵੇਖਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡ ਵੇਖਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
+    <string name="logins_biometric_prompt_message_2">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡ ਵੇਖਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">ਆਪਣੇ ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡ ਸੁਰੱਖਿਅਤ ਕਰੋ</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">ਆਪਣੇ ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡ ਸੁਰੱਖਿਅਤ ਕਰੋ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡਾਂ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰੋ</string>
+    <string name="logins_warning_dialog_title_2">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡਾਂ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰੋ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">ਆਪਣੇ ਲਾਗਇਨਾਂ ਅਤੇ ਪਾਸਵਰਡਾਂ ਨੂੰ ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਨੂੰ ਰੱਖਣ ਵਾਲੇ ਕਿਸੇ ਦੀ ਪਹੁੰਚ ਤੋਂ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਲਈ ਡਿਵਾਈਸ ਲਾਕ ਪੈਟਰਨ, ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈਟ ਅੱਪ ਕਰੋ।</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ਆਪਣੇ ਲਾਗਇਨਾਂ ਅਤੇ ਪਾਸਵਰਡਾਂ ਨੂੰ ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਨੂੰ ਰੱਖਣ ਵਾਲੇ ਕਿਸੇ ਦੀ ਪਹੁੰਚ ਤੋਂ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਲਈ ਡਿਵਾਈਸ ਲਾਕ ਪੈਟਰਨ, ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈਟ ਅੱਪ ਕਰੋ।</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡਾਂ ਨੂੰ ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਉੱਤੇ ਕਿਸੇ ਹੋਰ ਵੱਲੋਂ ਪਹੁੰਚ ਕਰਨ ਤੋਂ ਬਚਾਉਣ ਤੋਂ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਡਿਵਾਈਸ ਲਾਕ ਪੈਟਰਨ, ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ।</string>
+    <string name="logins_warning_dialog_message_2">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡਾਂ ਨੂੰ ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਉੱਤੇ ਕਿਸੇ ਹੋਰ ਵੱਲੋਂ ਪਹੁੰਚ ਕਰਨ ਤੋਂ ਬਚਾਉਣ ਤੋਂ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਡਿਵਾਈਸ ਲਾਕ ਪੈਟਰਨ, ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ।</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">ਬਾਅਦ \'ਚ</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1802,10 +1815,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">ਆਖਰੀ ਵਰਤੋਂ</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">ਲਾਗਇਨ ਲੜੀਬਧ ਮੇਨੂ</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ਲਾਗਇਨ ਲੜੀਬਧ ਮੇਨੂ</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਮੇਨੂ ਨੂੰ ਲੜੀਬੱਧ ਕਰੋ</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">ਪਾਸਵਰਡ ਮੇਨੂ ਨੂੰ ਲੜੀਬੱਧ ਕਰੋ</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1813,42 +1826,42 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">ਸਿਰਨਾਵੇਂ</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">ਕਰੈਡਿਟ ਕਾਰਡ</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">ਕਰੈਡਿਟ ਕਾਰਡ</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">ਭੁਗਤਾਨ ਦੇ ਢੰਗ</string>
+    <string name="preferences_credit_cards_2">ਭੁਗਤਾਨ ਦੇ ਢੰਗ</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">ਕਾਰਡ ਸੰਭਾਲੋ ਅਤੇ ਆਪਣੇ-ਆਪ ਭਰੋ</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">ਕਾਰਡ ਸੰਭਾਲੋ ਅਤੇ ਆਪਣੇ-ਆਪ ਭਰੋ</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">ਭੁਗਤਾਨ ਦੇ ਢੰਗ ਸੰਭਾਲੋ ਅਤੇ ਭਰੋ</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">ਭੁਗਤਾਨ ਦੇ ਢੰਗ ਸੰਭਾਲੋ ਅਤੇ ਭਰੋ</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">ਡਾਟਾ ਇੰਕ੍ਰਿਪਟ ਕੀਤਾ ਹੈ</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">ਡਾਟਾ ਇੰਕ੍ਰਿਪਟ ਕੀਤਾ ਹੈ</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s ਤੁਹਾਡੇ ਵਲੋਂ ਸੰਭਾਲੇ ਸਾਰੇ ਭੁਗਤਾਨ ਢੰਗਾਂ ਨੂੰ ਇੰਕ੍ਰਿਪਟ ਕਰਦਾ ਹੈ</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s ਤੁਹਾਡੇ ਵਲੋਂ ਸੰਭਾਲੇ ਸਾਰੇ ਭੁਗਤਾਨ ਢੰਗਾਂ ਨੂੰ ਇੰਕ੍ਰਿਪਟ ਕਰਦਾ ਹੈ</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">ਡਿਵਾਈਸਾਂ ਵਿਚਾਲੇ ਕਾਰਡਾਂ ਨੂੰ ਸਿੰਕ ਕਰੋ</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">ਕਾਰਡ ਸਿੰਕ ਕਰੋ</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">ਕਰੈਡਿਟ ਕਾਰਡ ਜੋੜੋ</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">ਕਰੈਡਿਟ ਕਾਰਡ ਜੋੜੋ</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">ਕਾਰਡ ਜੋੜੋ</string>
+    <string name="preferences_credit_cards_add_credit_card_2">ਕਾਰਡ ਜੋੜੋ</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">ਸੰਭਾਲੇ ਹੋਏ ਕਾਰਡਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">ਸੰਭਾਲੇ ਹੋਏ ਕਾਰਡਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">ਕਾਰਡਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">ਕਾਰਡਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">ਸਿਰਨਾਵਾਂ ਜੋੜੋ</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">ਸਿਰਨਾਵਿਆਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">ਸਿਰਨਾਵੇਂ ਸੰਭਾਲੋ ਅਤੇ ਆਪਣੇ-ਆਪ ਭਰੋ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">ਸਿਰਨਾਵੇਂ ਸੰਭਾਲੋ ਅਤੇ ਆਪਣੇ-ਆਪ ਭਰੋ</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">ਸਿਰਨਾਵਿਆਂ ਨੂੰ ਸੰਭਾਲੋ ਅਤੇ ਭਰੋ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">ਸਿਰਨਾਵਿਆਂ ਨੂੰ ਸੰਭਾਲੋ ਅਤੇ ਭਰੋ</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">ਨੰਬਰ, ਈਮੇਲ ਅਤੇ ਭੇਜਣ ਵਾਲੇ ਸਿਰਨਾਵਿਆਂ ਸਮੇਤ ਜਾਣਕਾਰੀ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">ਨੰਬਰ, ਈਮੇਲ ਅਤੇ ਭੇਜਣ ਵਾਲੇ ਸਿਰਨਾਵਿਆਂ ਸਮੇਤ ਜਾਣਕਾਰੀ</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">ਫ਼ੋਨ ਨੰਬਰਾਂ ਅਤੇ ਈਮੇਲ ਸਿਰਨਾਵਿਆਂ ਸਮੇਤ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">ਫ਼ੋਨ ਨੰਬਰਾਂ ਅਤੇ ਈਮੇਲ ਸਿਰਨਾਵਿਆਂ ਸਮੇਤ</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">ਕਾਰਡ ਜੋੜੋ</string>
@@ -1869,9 +1882,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">ਕਾਰਡ ਨੂੰ ਹਟਾਓ</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">ਕੀ ਤੁਸੀਂ ਇਹ ਕਰੈਡਿਟ ਕਾਰਡ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">ਕੀ ਤੁਸੀਂ ਇਹ ਕਰੈਡਿਟ ਕਾਰਡ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">ਕਾਰਡ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">ਕਾਰਡ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">ਹਟਾਓ</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1885,24 +1898,24 @@
     <string name="credit_cards_saved_cards">ਸੰਭਾਲੇ ਹੋਏ ਕਾਰਡ</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">ਵਾਜਬ ਕਰੈਡਿਟ ਕਾਰਡ ਨੰਬਰ ਦਿਓ ਜੀ</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ਵਾਜਬ ਕਰੈਡਿਟ ਕਾਰਡ ਨੰਬਰ ਦਿਓ ਜੀ</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">ਵਾਜਬ ਕਾਰਡ ਨੰਬਰ ਭਰੋ</string>
+    <string name="credit_cards_number_validation_error_message_2">ਵਾਜਬ ਕਾਰਡ ਨੰਬਰ ਭਰੋ</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">ਇਹ ਖੇਤਰ ਭਰੋ</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ਇਹ ਖੇਤਰ ਭਰੋ</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">ਨਾਂ ਜੋੜੋ</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">ਨਾਂ ਜੋੜੋ</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਕਾਰਡ ਵੇਖਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">ਆਪਣੇ ਕਰੈਡਿਟ ਕਾਰਡ ਸੁਰੱਖਿਅਤ ਕਰੋ</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">ਆਪਣੇ ਕਰੈਡਿਟ ਕਾਰਡ ਸੁਰੱਖਿਅਤ ਕਰੋ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਭੁਗਤਾਨ ਢੰਗਾਂ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰੋ</string>
+    <string name="credit_cards_warning_dialog_title_2">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਭੁਗਤਾਨ ਢੰਗਾਂ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰੋ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">ਆਪਣੀ ਡਿਵਾਇਸ ਲਈ ਲਾਕ ਪੈਟਰਨ, ਪਿੰਨ, ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ ਤਾਂ ਜੋ ਕਿਸੇ ਹੋਰ ਹੱਥ ਤੁਹਾਡਾ ਡਿਵਾਇਸ ਹੋਣ ਉੱਤੇ ਤੁਹਾਡੇ ਸੰਭਾਲੇ ਪਾਸਵਰਡ ਸੁਰੱਖਿਅਤ ਰਹਿਣ।</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ਆਪਣੀ ਡਿਵਾਇਸ ਲਈ ਲਾਕ ਪੈਟਰਨ, ਪਿੰਨ, ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ ਤਾਂ ਜੋ ਕਿਸੇ ਹੋਰ ਹੱਥ ਤੁਹਾਡਾ ਡਿਵਾਇਸ ਹੋਣ ਉੱਤੇ ਤੁਹਾਡੇ ਸੰਭਾਲੇ ਪਾਸਵਰਡ ਸੁਰੱਖਿਅਤ ਰਹਿਣ।</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡ ਢੰਗਾਂ ਨੂੰ ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਉੱਤੇ ਕਿਸੇ ਹੋਰ ਵੱਲੋਂ ਪਹੁੰਚ ਕਰਨ ਤੋਂ ਬਚਾਉਣ ਤੋਂ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਡਿਵਾਈਸ ਲਾਕ ਪੈਟਰਨ, ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ।</string>
+    <string name="credit_cards_warning_dialog_message_3">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਪਾਸਵਰਡ ਢੰਗਾਂ ਨੂੰ ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਉੱਤੇ ਕਿਸੇ ਹੋਰ ਵੱਲੋਂ ਪਹੁੰਚ ਕਰਨ ਤੋਂ ਬਚਾਉਣ ਤੋਂ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਡਿਵਾਈਸ ਲਾਕ ਪੈਟਰਨ, ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ।</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">ਹੁਣੇ ਸੈਟ ਅੱਪ ਕਰੋ</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1910,10 +1923,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">ਆਪਣਾ ਡਿਵਾਇਸ ਅਣ-ਲਾਕ ਕਰੋ</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">ਸੰਭਾਲੀ ਕਰੈਡਿਟ ਕਾਰਡ ਜਾਣਕਾਰੀ ਵਰਤਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ਸੰਭਾਲੀ ਕਰੈਡਿਟ ਕਾਰਡ ਜਾਣਕਾਰੀ ਵਰਤਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">ਸੰਭਾਲੇ ਹੋਏ ਭੁਗਤਾਨ ਢੰਗਾਂ ਨੂੰ ਵਰਤਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">ਸੰਭਾਲੇ ਹੋਏ ਭੁਗਤਾਨ ਢੰਗਾਂ ਨੂੰ ਵਰਤਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">ਸਿਰਨਾਵਾਂ ਜੋੜੋ</string>
     <!-- Title of the "Edit address" screen -->
@@ -1921,11 +1934,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">ਸਿਰਨਾਵਿਆਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">ਨਾਂ ਦਾ ਪਹਿਲਾਂ ਹਿੱਸਾ</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">ਨਾਂ ਦਾ ਪਹਿਲਾਂ ਹਿੱਸਾ</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">ਮੱਧ ਨਾਂ</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">ਮੱਧ ਨਾਂ</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">ਨਾਂ ਦਾ ਆਖਰੀ ਹਿੱਸਾ</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">ਨਾਂ ਦਾ ਆਖਰੀ ਹਿੱਸਾ</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">ਨਾਂ</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">ਸੜਕ ਸਿਰਨਾਵਾਂ</string>
     <!-- The header for the city of an address -->
@@ -1950,9 +1965,9 @@
     <string name="addressess_delete_address_button">ਸਿਰਨਾਵੇਂ ਨੂੰ ਹਟਾਓ</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">ਕੀ ਤੁਸੀਂ ਇਹ ਸਿਰਨਾਵੇਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ਕੀ ਤੁਸੀਂ ਇਹ ਸਿਰਨਾਵੇਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">ਇਹ ਸਿਰਨਾਵੇਂ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?</string>
+    <string name="addressess_confirm_dialog_message_2">ਇਹ ਸਿਰਨਾਵੇਂ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">ਹਟਾਓ</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2050,50 +2065,50 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">ਸੋਧੋ</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">ਕੀ ਤੁਸੀਂ ਇਹ ਲਾਗਇਨ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">ਕੀ ਤੁਸੀਂ ਇਹ ਲਾਗਇਨ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">ਕੀ ਤੁਸੀਂ ਇਸ ਪਾਸਵਰਡ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
+    <string name="login_deletion_confirmation_2">ਕੀ ਤੁਸੀਂ ਇਸ ਪਾਸਵਰਡ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">ਹਟਾਓ</string>
 
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">ਰੱਦ ਕਰੋ</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">ਲਾਗਇਨ ਚੋਣਾਂ</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">ਲਾਗਇਨ ਚੋਣਾਂ</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਚੋਣਾਂ</string>
+    <string name="login_options_menu_2">ਪਾਸਵਰਡ ਚੋਣਾਂ</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">ਲਾਗਇਨ ਦੇ ਵੈੱਬ ਐਡਰੈਸ ਲਈ ਸੋਧਣਯੋਗ ਲਿਖਤ ਖੇਤਰ ਹੈ।</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ਲਾਗਇਨ ਦੇ ਵੈੱਬ ਐਡਰੈਸ ਲਈ ਸੋਧਣਯੋਗ ਲਿਖਤ ਖੇਤਰ ਹੈ।</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">ਵੈੱਬਸਾਈਟ ਸਿਰਨਾਵਿਆਂ ਲਈ ਸੋਧ ਕਰਨ ਯੋਗ ਲਿਖਤ ਖੇਤਰ।</string>
+    <string name="saved_login_hostname_description_3">ਵੈੱਬਸਾਈਟ ਸਿਰਨਾਵਿਆਂ ਲਈ ਸੋਧ ਕਰਨ ਯੋਗ ਲਿਖਤ ਖੇਤਰ।</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">ਲਾਗਇਨ ਦੇ ਵਰਤੋਂਕਾਰ-ਨਾਂ ਲਈ ਸੋਧਣਯੋਗ ਲਿਖਤ ਖੇਤਰ ਹੈ।</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ਲਾਗਇਨ ਦੇ ਵਰਤੋਂਕਾਰ-ਨਾਂ ਲਈ ਸੋਧਣਯੋਗ ਲਿਖਤ ਖੇਤਰ ਹੈ।</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">ਵਰਤੋਂਕਾਰ-ਨਾਂ ਲਈ ਸੋਧ ਕਰਨ ਯੋਗ ਲਿਖਤ ਖੇਤਰ।</string>
+    <string name="saved_login_username_description_3">ਵਰਤੋਂਕਾਰ-ਨਾਂ ਲਈ ਸੋਧ ਕਰਨ ਯੋਗ ਲਿਖਤ ਖੇਤਰ।</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">ਲਾਗਇਨ ਦੇ ਪਾਸਵਰਡ ਲਈ ਸੋਧਣਯੋਗ ਲਿਖਤ ਖੇਤਰ ਹੈ।</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ਲਾਗਇਨ ਦੇ ਪਾਸਵਰਡ ਲਈ ਸੋਧਣਯੋਗ ਲਿਖਤ ਖੇਤਰ ਹੈ।</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਲਈ ਸੋਧ ਕਰਨ ਯੋਗ ਲਿਖਤ ਖੇਤਰ।</string>
+    <string name="saved_login_password_description_2">ਪਾਸਵਰਡ ਲਈ ਸੋਧ ਕਰਨ ਯੋਗ ਲਿਖਤ ਖੇਤਰ।</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">ਤਬਦੀਲੀਆਂ ਨੂੰ ਲਾਗਇਨ ਲਈ ਸੰਭਾਲੋ।</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">ਤਬਦੀਲੀਆਂ ਨੂੰ ਲਾਗਇਨ ਲਈ ਸੰਭਾਲੋ।</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">ਤਬਦੀਲੀਆਂ ਨੂੰ ਸੰਭਾਲੋ।</string>
+    <string name="save_changes_to_login_2">ਤਬਦੀਲੀਆਂ ਨੂੰ ਸੰਭਾਲੋ।</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">ਸੋਧੋ</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">ਸੋਧੋ</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਨੂੰ ਸੋਧੋ</string>
+    <string name="edit_2">ਪਾਸਵਰਡ ਨੂੰ ਸੋਧੋ</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">ਨਵਾਂ ਲਾਗਇਨ ਜੋੜੋ</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">ਨਵਾਂ ਲਾਗਇਨ ਜੋੜੋ</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਜੋੜੋ</string>
+    <string name="add_login_2">ਪਾਸਵਰਡ ਜੋੜੋ</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">ਪਾਸਵਰਡ ਦਿਓ</string>
+    <string name="saved_login_password_required_2">ਪਾਸਵਰਡ ਦਿਓ</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">ਵਰਤੋਂਕਾਰ-ਨਾਂ ਚਾਹੀਦਾ ਹੈ</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">ਵਰਤੋਂਕਾਰ-ਨਾਂ ਚਾਹੀਦਾ ਹੈ</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">ਵਰਤੋਂਕਾਰ-ਨਾਂ ਦਿਓ</string>
+    <string name="saved_login_username_required_2">ਵਰਤੋਂਕਾਰ-ਨਾਂ ਦਿਓ</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">ਹੋਸਟ-ਨਾਂ ਚਾਹੀਦਾ ਹੈ</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2204,7 +2219,7 @@
     <string name="radio_preference_info_content_description">ਹੋਰ ਵੇਰਵਿਆਂ ਲਈ ਕਲਿੱਕ ਕਰੋ</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">ਉੱਤੇ ਜਾਓ</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">ਉੱਤੇ ਜਾਓ</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">ਬੰਦ ਕਰੋ</string>
@@ -2244,8 +2259,6 @@
     <string name="review_quality_check_grade_title">ਇਹ ਰੀਵਿਊ ਕਿੰਨੇ ਭਰੋਸੇਯੋਗ ਹਨ?</string>
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">ਅਡਜੱਸਟ ਕੀਤੀ ਰੇਟਿੰਗ</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">ਗ਼ੈਰ-ਭਰੋਸੇਯੋਗ ਰੀਵਿਊ ਹਟਾਏ</string>
 
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">ਭਰੋਸੇਯੋਗ ਰੀਵਿਊਆਂ ਉੱਤੇ ਅਧਾਰਿਤ</string>
@@ -2303,10 +2316,6 @@
     <string name="review_quality_check_product_availability_warning_body">ਜੇ ਤੁਹਾਨੂੰ ਉਹ ਉਤਪਾਦ ਵਾਪਸ ਸਟਾਕ ਵਿੱਚ ਮਿਲੇ ਤਾਂ ਸਾਨੂੰ ਇਸ ਬਾਰੇ ਦੱਸਿਓ ਅਤੇ ਅਸੀਂ ਰੀਵਿਊ ਦੀ ਜਾਂਚ ਕਰਾਂਗੇ।</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">ਉਤਪਾਦ ਸਟਾਕ ਵਿੱਚ ਹੋਣ ਦੀ ਰਿਪੋਰਟ ਕਰੋ</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">ਰੀਵਿਊ ਕੁਆਲਟੀ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">ਰੀਵਿਊ ਕੁਆਲਟੀ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">ਰੀਵਿਊ ਕੁਆਲਟੀ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2352,13 +2361,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">ਹੋਰ ਜਾਣੋ</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">“ਹਾਂ, ਇਸ ਨੂੰ ਅਜ਼ਮਾਓ” ਚੁਣ ਕੇ ਤੁਸੀਂ Mozilla ਵਲੋਂ %1$s ਦੀ %2$s ਅਤੇ %3$s ਲਈ ਸਹਿਮਤ ਹੁੰਦੇ ਹੋ।</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">“ਹਾਂ, ਇਸ ਨੂੰ ਅਜ਼ਮਾਓ” ਚੁਣ ਕੇ ਤੁਸੀਂ Mozilla ਵਲੋਂ %1$s ਦੀ %2$s ਅਤੇ %3$s ਲਈ ਸਹਿਮਤ ਹੁੰਦੇ ਹੋ।</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">“ਹਾਂ, ਇਸ ਨੂੰ ਅਜ਼ਮਾਓ” ਨੂੰ ਚੁਣ ਕੇ ਤੁਸੀਂ %1$s ਤੋਂ ਹੇਠ ਦਿੱਤਿਆਂ ਨਾਲ ਸਹਿਮਤ ਹੁੰਦੇ ਹੋ:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">“ਹਾਂ, ਇਸ ਨੂੰ ਅਜ਼ਮਾਓ” ਚੁਣ ਕੇ ਤੁਸੀਂ %1$s ਦੀ %2$s ਅਤੇ %3$s ਦੀ %4$s ਨਾਲ ਸਹਿਮਤ ਹੁੰਦੇ ਹੋ।</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">“ਹਾਂ, ਇਸ ਨੂੰ ਅਜ਼ਮਾਓ” ਚੁਣ ਕੇ ਤੁਸੀਂ %1$s ਦੀ %2$s ਅਤੇ %3$s ਦੀ %4$s ਨਾਲ ਸਹਿਮਤ ਹੁੰਦੇ ਹੋ।</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">ਪਰਦੇਦਾਰੀ ਨੀਤੀ</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">ਪਰਦੇਦਾਰੀ ਨੀਤੀ</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">ਪਰਦੇਦਾਰੀ ਨੀਤੀ</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">ਪਰਦੇਦਾਰੀ ਸੂਚਨਾ</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">ਵਰਤਣ ਲਈ ਸ਼ਰਤਾਂ</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2430,6 +2445,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">ਇਹ ਸਫ਼ੇ ਦਾ ਉਲੱਥਾ ਕਰਨਾ ਹੈ?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">ਸਫ਼ੇ ਦਾ %1$s ਤੋਂ %2$s ਵਿੱਚ ਅਨੁਵਾਦ ਕੀਤਾ</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">%1$s ਵਿੱਚ ਪ੍ਰਾਈਵੇਟ ਉਲੱਥਾ ਅਜ਼ਮਾਓ</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2442,6 +2461,8 @@
     <string name="translations_bottom_sheet_translate_to">ਇਸ ਵਿੱਚ ਉਲੱਥਾ ਕਰੋ</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">ਹਾਲੇ ਨਹੀਂ</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">ਅਸਲ ਵੇਖਾਓ</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">ਮੁਕੰਮਲ</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2464,6 +2485,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">ਹੋਰ ਜਾਣੋ</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">…ਉਲੱਥਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">ਉਲੱਥੇ ਲਈ ਚੋਣਾਂ</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 9be4f869c..6fe0c6e8b 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -259,6 +259,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Preložiť stránku</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Stránka bola preložená z jazyka %1$s do jazyka %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Vybraný jazyk</string>
@@ -338,12 +343,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Vyhlásenie o ochrane osobných údajov Firefoxu</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Ďalšie informácie nájdete v našom Vyhlásení o ochrane osobných údajov</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Radi vás držíme v bezpečí</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Zistite, prečo milióny ľudí milujú Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Bezpečné prehliadanie s viacerými možnosťami</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Náš neziskový prehliadač pomáha zabrániť spoločnostiam, aby vás tajne sledovali na webe.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Viac ako 100 miliónov ľudí chráni svoje súkromie výberom prehliadača, ktorého tvorcom je nezisková organizácia.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Známi sledovacie prvky? Automaticky blokované. Rozšírenia? Vyskúšajte všetkých 700. Súbory PDF? Naša vstavaná čítačka uľahčuje prácu s nimi.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Náš neziskový prehliadač pomáha zabrániť spoločnostiam, aby vás tajne sledovali na webe.\n\nĎalšie informácie nájdete v našom Vyhlásení o ochrane osobných údajov.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -702,9 +717,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Záložky</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Prihlasovacie údaje</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Prihlasovacie údaje</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Heslá</string>
+    <string name="preferences_sync_logins_2">Heslá</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Otvorené karty</string>
     <!-- Preference for signing out -->
@@ -730,9 +745,9 @@
     <string name="default_device_name_2">%1$s na %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Platobné karty</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Platobné karty</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Spôsoby platby</string>
+    <string name="preferences_sync_credit_cards_2">Spôsoby platby</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresy</string>
 
@@ -1676,13 +1691,13 @@
     <string name="add_to_homescreen_description_2">Túto webovú stránku si môžete jednoducho pridať na svoju domovskú obrazovku a mať tak okamžitý prístup k prehliadaniu.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Prihlasovacie údaje</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Prihlasovacie údaje</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Heslá</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Heslá</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Ukladanie prihlasovacích údajov</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Ukladanie prihlasovacích údajov</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Ukladanie hesiel</string>
+    <string name="preferences_passwords_save_logins_2">Ukladanie hesiel</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Pred uložením sa opýtať</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1697,47 +1712,47 @@
     <string name="preferences_android_autofill_description">Vypĺňa používateľské mená a heslá v iných aplikáciách vo vašom zariadení.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Pridať prihlasovacie údaje</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Pridať prihlasovacie údaje</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Pridať heslo</string>
+    <string name="preferences_logins_add_login_2">Pridať heslo</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Synchronizácia prihlasovacích údajov</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synchronizácia hesiel</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Synchronizácia prihlasovacích údajov</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Synchronizácia hesiel</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Synchronizovať prihlasovacie údaje medzi zariadeniami</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Synchronizovať prihlasovacie údaje medzi zariadeniami</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synchronizovať heslá naprieč zariadeniami</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Synchronizovať heslá naprieč zariadeniami</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Uložené prihlasovacie údaje</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Uložené prihlasovacie údaje</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Uložené heslá</string>
+    <string name="preferences_passwords_saved_logins_2">Uložené heslá</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Uložené alebo synchronizované údaje v aplikácii %s sa zobrazia tu.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Uložené alebo synchronizované údaje v aplikácii %s sa zobrazia tu.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Heslá, ktoré uložíte alebo synchronizujete do %su budú zobrazené tu. Všetky heslá sú šifrované.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Heslá, ktoré uložíte alebo synchronizujete do %su budú zobrazené tu. Všetky heslá sú šifrované.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Ďalšie informácie o službe Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Ďalšie informácie o službe Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Ďalšie informácie o synchronizácii</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Ďalšie informácie o synchronizácii</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Výnimky</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Tu sa zobrazia prihlasovacie údaje, ktoré sa nebudú ukladať.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Tu sa zobrazia prihlasovacie údaje, ktoré sa nebudú ukladať.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s nebude ukladať heslá pre tu uvedené stránky.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s nebude ukladať heslá pre tu uvedené stránky.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Pre nasledujúce stránky sa nebudú ukladať prihlasovacie údaje.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Pre nasledujúce stránky sa nebudú ukladať prihlasovacie údaje.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s nebude ukladať heslá pre tieto stránky.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s nebude ukladať heslá pre tieto stránky.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Odstrániť všetky výnimky</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Hľadať</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Hľadať</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Hľadať v heslách</string>
+    <string name="preferences_passwords_saved_logins_search_2">Hľadať v heslách</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Stránka</string>
     <!-- The header for the username for a login -->
@@ -1765,17 +1780,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Skryť heslo</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Pre zobrazenie prihlasovacích údajov odomknite zariadenie</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Pre zobrazenie prihlasovacích údajov odomknite zariadenie</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Ak chcete zobraziť uložené heslá, odomknite zariadenie</string>
+    <string name="logins_biometric_prompt_message_2">Ak chcete zobraziť uložené heslá, odomknite zariadenie</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Zabezpečte svoje prihlasovacie údaje</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Zabezpečte svoje prihlasovacie údaje</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Zabezpečte svoje heslá</string>
+    <string name="logins_warning_dialog_title_2">Zabezpečte svoje heslá</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené prihlasovacie údaje v prípade, že vaše zariadenie bude používať niekto iný.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené prihlasovacie údaje v prípade, že vaše zariadenie bude používať niekto iný.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené heslá v prípade, že vaše zariadenie bude používať niekto iný.</string>
+    <string name="logins_warning_dialog_message_2">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené heslá v prípade, že vaše zariadenie bude používať niekto iný.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Neskôr</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1792,10 +1807,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">posledného použitia</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Zoradiť ponuku prihlasovacích údajov</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Zoradiť ponuku prihlasovacích údajov</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Ponuka pre zoradenie hesiel</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Ponuka pre zoradenie hesiel</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1803,43 +1818,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adresy</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Platobné karty</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Platobné karty</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Spôsoby platby</string>
+    <string name="preferences_credit_cards_2">Spôsoby platby</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Ukladať a automaticky dopĺňať údaje o platobných kartách</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Ukladať a automaticky dopĺňať údaje o platobných kartách</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Ukladať a dopĺňať spôsoby platby</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Ukladať a dopĺňať spôsoby platby</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Údaje sú šifrované</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Údaje sú šifrované</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s zašifruje všetky spôsoby platby, ktoré uložíte</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s zašifruje všetky spôsoby platby, ktoré uložíte</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synchronizovať platobné karty naprieč zariadeniami</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Synchronizovať platobné karty</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Pridať platobnú kartu</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Pridať platobnú kartu</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Pridať kartu</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Pridať kartu</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Spravovať uložené karty</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Spravovať uložené karty</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Spravovať karty</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Spravovať karty</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Pridať adresu</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Spravovať adresy</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Ukladať a automaticky dopĺňať adresy</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Ukladať a automaticky dopĺňať adresy</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Ukladať a dopĺňať adresy</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Ukladať a dopĺňať adresy</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Zahŕňa informácie ako sú čísla, e‑mailové adresy a dodacie adresy</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Zahŕňa informácie ako sú čísla, e‑mailové adresy a dodacie adresy</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Zahŕňa telefónne čísla a e‑mailové adresy</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Zahŕňa telefónne čísla a e‑mailové adresy</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Pridať kartu</string>
@@ -1860,9 +1875,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Odstrániť kartu</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Naozaj chcete odstrániť túto kreditnú kartu?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Naozaj chcete odstrániť túto kreditnú kartu?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Odstrániť kartu?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Odstrániť kartu?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Odstrániť</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1875,24 +1890,24 @@
     <string name="credit_cards_saved_cards">Uložené karty</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Prosím, zadajte platné číslo platobnej karty</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Prosím, zadajte platné číslo platobnej karty</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Zadajte platné číslo karty</string>
+    <string name="credit_cards_number_validation_error_message_2">Zadajte platné číslo karty</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Vyplňte toto pole</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Vyplňte toto pole</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Zadajte meno</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Zadajte meno</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Odomknutím zobrazíte svoje uložené kreditné karty</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Zabezpečte svoje kreditné karty</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Zabezpečte svoje kreditné karty</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Zabezpečte svoje uložené spôsoby platby</string>
+    <string name="credit_cards_warning_dialog_title_2">Zabezpečte svoje uložené spôsoby platby</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené kreditné karty v prípade, že vaše zariadenie bude používať niekto iný.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené kreditné karty v prípade, že vaše zariadenie bude používať niekto iný.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené spôsoby platby v prípade, že vaše zariadenie bude používať niekto iný.</string>
+    <string name="credit_cards_warning_dialog_message_3">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené spôsoby platby v prípade, že vaše zariadenie bude používať niekto iný.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Nastaviť teraz</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1900,10 +1915,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Odomknite svoje zariadenie</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Odomknutím použijete uložené informácie o kreditnej karte</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Odomknutím použijete uložené informácie o kreditnej karte</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Ak chcete použiť uložené spôsoby platby, odomknite zariadenie</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Ak chcete použiť uložené spôsoby platby, odomknite zariadenie</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Pridať adresu</string>
     <!-- Title of the "Edit address" screen -->
@@ -1911,11 +1926,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Spravovať adresy</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Krstné meno</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Krstné meno</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Stredné meno</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Stredné meno</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Priezvisko</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Priezvisko</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Meno</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Ulica</string>
     <!-- The header for the city of an address -->
@@ -1940,9 +1957,9 @@
     <string name="addressess_delete_address_button">Odstrániť adresu</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Naozaj chcete odstrániť túto adresu?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Naozaj chcete odstrániť túto adresu?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Chcete odstrániť túto adresu?</string>
+    <string name="addressess_confirm_dialog_message_2">Chcete odstrániť túto adresu?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Odstrániť</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2040,49 +2057,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Upraviť</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Naozaj chcete odstrániť tieto prihlasovacie údaje?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Naozaj chcete odstrániť tieto prihlasovacie údaje?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Naozaj chcete odstrániť toto heslo?</string>
+    <string name="login_deletion_confirmation_2">Naozaj chcete odstrániť toto heslo?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Odstrániť</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Zrušiť</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Možnosti prihlásenia</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Možnosti prihlásenia</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Možnosti hesiel</string>
+    <string name="login_options_menu_2">Možnosti hesiel</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Upraviteľné textové pole pre webovú adresu.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Upraviteľné textové pole pre webovú adresu.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Upraviteľné textové pole pre webovú adresu.</string>
+    <string name="saved_login_hostname_description_3">Upraviteľné textové pole pre webovú adresu.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Upraviteľné textové pole pre používateľské meno.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Upraviteľné textové pole pre používateľské meno.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Upraviteľné textové pole pre používateľské meno.</string>
+    <string name="saved_login_username_description_3">Upraviteľné textové pole pre používateľské meno.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Upraviteľné textové pole pre heslo.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Upraviteľné textové pole pre heslo.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Upraviteľné textové pole pre heslo.</string>
+    <string name="saved_login_password_description_2">Upraviteľné textové pole pre heslo.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Uložiť zmeny prihlasovacích údajov.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Uložiť zmeny prihlasovacích údajov.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Uložiť zmeny</string>
+    <string name="save_changes_to_login_2">Uložiť zmeny</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Upraviť</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Upraviť</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Upraviť heslo</string>
+    <string name="edit_2">Upraviť heslo</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Pridať nové prihlasovacie údaje</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Pridať nové prihlasovacie údaje</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Pridať heslo</string>
+    <string name="add_login_2">Pridať heslo</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Vyžaduje sa heslo</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Vyžaduje sa heslo</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Zadajte heslo</string>
+    <string name="saved_login_password_required_2">Zadajte heslo</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Vyžaduje sa používateľské meno</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Vyžaduje sa používateľské meno</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Zadajte používateľské meno</string>
+    <string name="saved_login_username_required_2">Zadajte používateľské meno</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Vyžaduje sa názov hostiteľa</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2195,7 +2212,7 @@
     <string name="radio_preference_info_content_description">Kliknutím zobrazíte viac podrobností</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Prejsť nahor</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Prejsť nahor</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Zavrieť</string>
@@ -2236,8 +2253,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Upravené hodnotenie</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Nespoľahlivé recenzie boli odstránené</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Na základe spoľahlivých recenzií</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">To najlepšie z nedávnych recenzií</string>
@@ -2293,10 +2308,6 @@
     <string name="review_quality_check_product_availability_warning_body">Ak zistíte, že tento produkt je opäť na sklade, nahláste to a my budeme pracovať na kontrole recenzií.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Oznámiť, že produkt je na sklade</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Kontroluje sa kvalita recenzií</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Kontroluje sa kvalita recenzií</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Kontroluje sa kvalita recenzií (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2343,13 +2354,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Ďalšie informácie</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Výberom možnosti “Áno, vyskúšať” vyjadrujete súhlas s %1$s a %2$s služby %3$s od Mozilly.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Výberom možnosti “Áno, vyskúšať” vyjadrujete súhlas s %1$s a %2$s služby %3$s od Mozilly.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Zvolením možnosti „Áno, vyskúšať“ vyjadrujete súhlas s nasledujúcim dokumentami od %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Výberom možnosti “Áno, vyskúšať” vyjadrujete súhlas s %2$s prehliadača %1$s a %4$s spoločnosti %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Výberom možnosti “Áno, vyskúšať” vyjadrujete súhlas s %2$s prehliadača %1$s a %4$s spoločnosti %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">Zásadami ochrany osobných údajov</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">Zásadami ochrany osobných údajov</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Zásady ochrany osobných údajov</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">Vyhlásení o ochrane osobných údajov</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">Podmienkami používania</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2420,6 +2437,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Preložiť túto stránku?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Stránka bola preložená z jazyka %1$s do jazyka %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Vyskúšajte súkromné preklady v aplikácii %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2432,6 +2453,8 @@
     <string name="translations_bottom_sheet_translate_to">Preložiť do jazyka</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Teraz nie</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Zobraziť pôvodnú stránku</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Hotovo</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2454,6 +2477,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Ďalšie informácie</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Prebieha preklad…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Nastavenia prekladov</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 4abd63817..0197a251f 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -332,9 +332,15 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Obvestilo o zasebnosti za Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Preberite več v obvestilu o zasebnosti</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Z veseljem skrbimo za vašo varnost</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Odkrijte, zakaj milijoni prisegajo na Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Varno brskanje z več izbire</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Naš neprofitni brskalnik preprečuje podjetjem, da bi vas skrivaj spremljala po spletu.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
@@ -693,9 +699,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Zaznamki</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Prijave</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Prijave</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Gesla</string>
+    <string name="preferences_sync_logins_2">Gesla</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Odprti zavihki</string>
     <!-- Preference for signing out -->
@@ -722,9 +728,9 @@
     <string name="default_device_name_2">%1$s na %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Kreditne kartice</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditne kartice</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Načini plačila</string>
+    <string name="preferences_sync_credit_cards_2">Načini plačila</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Naslove</string>
 
@@ -1674,13 +1680,13 @@
     <string name="add_to_homescreen_description_2">To stran lahko preprosto dodate na svoj domači zaslon naprave za lažji dostop in hitrejše brskanje v načinu, podobnem aplikaciji.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Prijave in gesla</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Prijave in gesla</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Gesla</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Gesla</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Shranjevanje prijav in gesel</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Shranjevanje prijav in gesel</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Shranjuj gesla</string>
+    <string name="preferences_passwords_save_logins_2">Shranjuj gesla</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Vprašaj pred shranjevanjem</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1697,43 +1703,43 @@
     <string name="preferences_android_autofill_description">Izpolnjuj uporabniška imena in gesla v drugih aplikacijah na napravi.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Dodaj prijavo</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Dodaj prijavo</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Dodaj geslo</string>
+    <string name="preferences_logins_add_login_2">Dodaj geslo</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sinhronizacija prijav</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sinhroniziraj gesla</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sinhronizacija prijav</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Sinhroniziraj gesla</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sinhroniziraj prijave med napravami</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sinhroniziraj prijave med napravami</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sinhroniziraj gesla med napravami</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Sinhroniziraj gesla med napravami</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Shranjene prijave</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Shranjene prijave</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Shranjena gesla</string>
+    <string name="preferences_passwords_saved_logins_2">Shranjena gesla</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Tu se prikažejo prijave, ki jih shranite ali sinhronizirate v %s.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Tu se prikažejo prijave, ki jih shranite ali sinhronizirate v %s.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Več o Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Več o Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Več o sinhronizaciji</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Več o sinhronizaciji</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Izjeme</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Tu bodo prikazane prijave in gesla, ki niso shranjena.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Tu bodo prikazane prijave in gesla, ki niso shranjena.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">Za tukaj navedena mesta %s ne bo shranjeval gesel.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">Za tukaj navedena mesta %s ne bo shranjeval gesel.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Prijave in gesla za te strani ne bodo shranjene.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Prijave in gesla za te strani ne bodo shranjene.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">Za ta spletna mesta %s ne bo shranjeval gesel.</string>
+    <string name="preferences_passwords_exceptions_description_2">Za ta spletna mesta %s ne bo shranjeval gesel.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Izbriši vse izjeme</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Iskanje prijav</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Iskanje prijav</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Stran</string>
     <!-- The header for the username for a login -->
@@ -1761,15 +1767,15 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Skrij geslo</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Odklenite za ogled shranjenih prijav</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Odklenite za ogled shranjenih prijav</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Zavarujte svoje prijave in gesla</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Zavarujte svoje prijave in gesla</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Zavarujte shranjena gesla</string>
+    <string name="logins_warning_dialog_title_2">Zavarujte shranjena gesla</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Nastavite vzorec za zaklepanje naprave, PIN ali geslo za zaščito pred dostopom do shranjenih prijav in gesel, če vašo napravo uporablja še kdo.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Nastavite vzorec za zaklepanje naprave, PIN ali geslo za zaščito pred dostopom do shranjenih prijav in gesel, če vašo napravo uporablja še kdo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Nastavite vzorec za zaklepanje naprave, PIN ali geslo za zaščito pred dostopom do shranjenih gesel, če vašo napravo uporablja še kdo.</string>
+    <string name="logins_warning_dialog_message_2">Nastavite vzorec za zaklepanje naprave, PIN ali geslo za zaščito pred dostopom do shranjenih gesel, če vašo napravo uporablja še kdo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Pozneje</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1789,7 +1795,7 @@
     <string name="saved_logins_sort_strategy_last_used">Času zadnje uporabe</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Meni razvrščanja prijav</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Meni razvrščanja prijav</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1797,41 +1803,41 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Naslovi</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Kreditne kartice</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditne kartice</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Shrani in samodejno izpolni kartice</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Shrani in samodejno izpolni kartice</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Shranjuj in izpolnjuj načine plačila</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Shranjuj in izpolnjuj načine plačila</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Podatki so šifrirani</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Podatki so šifrirani</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s šifrira vse načine plačila, ki jih shranite</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s šifrira vse načine plačila, ki jih shranite</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sinhroniziraj kartice med napravami</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sinhroniziraj kartice</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Dodaj kreditno kartico</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Dodaj kreditno kartico</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Dodaj kartico</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Dodaj kartico</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Upravljanje shranjenih kartic</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Upravljanje shranjenih kartic</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Upravljanje kartic</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Upravljanje kartic</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Dodaj naslov</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Upravljanje naslovov</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Shranjuj in samodejno izpolnjuj naslove</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Shranjuj in samodejno izpolnjuj naslove</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Shranjuj in izpolnjuj naslove</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Shranjuj in izpolnjuj naslove</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Vključi podatke, kot so številke, e-poštni naslovi in naslovi za dostavo</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Vključi podatke, kot so številke, e-poštni naslovi in naslovi za dostavo</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Vključuje telefonske številke in e-poštne naslove</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Vključuje telefonske številke in e-poštne naslove</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Dodaj kartico</string>
@@ -1852,7 +1858,7 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Izbriši kartico</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Ali ste prepričani, da želite izbrisati to kreditno kartico?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Ali ste prepričani, da želite izbrisati to kreditno kartico?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Izbriši</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1866,20 +1872,20 @@
     <string name="credit_cards_saved_cards">Shranjene kartice</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Vnesite veljavno številko kreditne kartice</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Vnesite veljavno številko kreditne kartice</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Vnesite veljavno številko kartice</string>
+    <string name="credit_cards_number_validation_error_message_2">Vnesite veljavno številko kartice</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Izpolnite to polje</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Izpolnite to polje</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Dodajte ime</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Dodajte ime</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Odklenite za ogled shranjenih kartic</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Zavarujte svoje kreditne kartice</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Zavarujte svoje kreditne kartice</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Nastavite vzorec za zaklepanje naprave, PIN ali geslo za zaščito pred dostopom do kreditnih kartic, če vašo napravo uporablja še kdo.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Nastavite vzorec za zaklepanje naprave, PIN ali geslo za zaščito pred dostopom do kreditnih kartic, če vašo napravo uporablja še kdo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Nastavi zdaj</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1888,7 +1894,7 @@
     <string name="credit_cards_biometric_prompt_message_pin">Odklenite svojo napravo</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Odklenite za uporabo shranjenih podatkov o kreditnih karticah</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Odklenite za uporabo shranjenih podatkov o kreditnih karticah</string>
 
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Dodaj naslov</string>
@@ -1897,11 +1903,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Upravljanje naslovov</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Ime</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Ime</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Drugo ime</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Drugo ime</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Priimek</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Priimek</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Ime</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Ulica</string>
     <!-- The header for the city of an address -->
@@ -1926,7 +1934,7 @@
     <string name="addressess_delete_address_button">Izbriši naslov</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Res želite izbrisati ta naslov?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Res želite izbrisati ta naslov?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Izbriši</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2026,49 +2034,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Uredi</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Ali ste prepričani, da želite izbrisati to prijavo?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Ali ste prepričani, da želite izbrisati to prijavo?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Ali ste prepričani, da želite izbrisati to geslo?</string>
+    <string name="login_deletion_confirmation_2">Ali ste prepričani, da želite izbrisati to geslo?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Izbriši</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Prekliči</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Možnosti prijave</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Možnosti prijave</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Možnosti gesel</string>
+    <string name="login_options_menu_2">Možnosti gesel</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Besedilno polje za urejanje spletnega naslova prijave.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Besedilno polje za urejanje spletnega naslova prijave.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Besedilno polje za urejanje spletnega naslova.</string>
+    <string name="saved_login_hostname_description_3">Besedilno polje za urejanje spletnega naslova.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Besedilno polje za urejanje uporabniškega imena prijave.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Besedilno polje za urejanje uporabniškega imena prijave.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Besedilno polje za urejanje uporabniškega imena.</string>
+    <string name="saved_login_username_description_3">Besedilno polje za urejanje uporabniškega imena.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Besedilno polje za urejanje gesla prijave.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Besedilno polje za urejanje gesla prijave.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Besedilno polje za urejanje gesla.</string>
+    <string name="saved_login_password_description_2">Besedilno polje za urejanje gesla.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Shrani spremembe v prijavo.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Shrani spremembe v prijavo.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Shrani spremembe.</string>
+    <string name="save_changes_to_login_2">Shrani spremembe.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Urejanje</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Urejanje</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Uredi geslo</string>
+    <string name="edit_2">Uredi geslo</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Dodaj novo prijavo</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Dodaj novo prijavo</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Dodaj geslo</string>
+    <string name="add_login_2">Dodaj geslo</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Zahtevano je geslo</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Zahtevano je geslo</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Vnesite geslo</string>
+    <string name="saved_login_password_required_2">Vnesite geslo</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Zahtevano je uporabniško ime</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Zahtevano je uporabniško ime</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Vnesite uporabniško ime</string>
+    <string name="saved_login_username_required_2">Vnesite uporabniško ime</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Zahtevano je ime domene</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2183,7 +2191,7 @@
     <string name="radio_preference_info_content_description">Kliknite za podrobnosti</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Pojdi gor</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Pojdi gor</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Zapri</string>
@@ -2223,8 +2231,6 @@
     <string name="review_quality_check_grade_title">Kako zanesljiva so ta mnenja?</string>
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Prilagojena ocena</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Nezanesljiva mnenja odstranjena</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Poudarki iz nedavnih mnenj</string>
     <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
@@ -2279,10 +2285,6 @@
     <string name="review_quality_check_product_availability_warning_body">Če opazite, da je izdelek znova na zalogi, nam to sporočite in preverili bomo mnenja.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Sporoči, da je izdelek znova na zalogi</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Preverjanje kakovosti mnenj</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Preverjanje kakovosti mnenj</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
     <string name="review_quality_check_analysis_in_progress_warning_body">To lahko traja približno 60 sekund.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
@@ -2326,11 +2328,11 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Več o tem</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Z izbiro “Da, poskusi” se strinjate z %2$s in %3$s Mozilla %1$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Z izbiro “Da, poskusi” se strinjate z %2$s in %3$s Mozilla %1$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Z izbiro “Da, poskusi” se strinjate z naslednjimi dokumenti %1$sa:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">pravilnikom o zasebnosti</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">pravilnikom o zasebnosti</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Pravilnik o zasebnosti</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->

From 45107be74d9ef73d553eff638268c24259438c89 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 00:32:42 +0000
Subject: [PATCH 201/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-bg/strings.xml     |   9 +-
 app/src/main/res/values-cy/strings.xml     |   7 +
 app/src/main/res/values-de/strings.xml     |   7 +
 app/src/main/res/values-dsb/strings.xml    |   7 +
 app/src/main/res/values-el/strings.xml     |   9 +-
 app/src/main/res/values-en-rGB/strings.xml |   9 +-
 app/src/main/res/values-es/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-fi/strings.xml     |   2 +
 app/src/main/res/values-fr/strings.xml     |  15 +-
 app/src/main/res/values-hsb/strings.xml    |   9 +-
 app/src/main/res/values-it/strings.xml     |   9 +-
 app/src/main/res/values-iw/strings.xml     |   7 +
 app/src/main/res/values-ko/strings.xml     |  11 +-
 app/src/main/res/values-pt-rBR/strings.xml |   9 +-
 app/src/main/res/values-pt-rPT/strings.xml |   9 +-
 app/src/main/res/values-sv-rSE/strings.xml |   9 +-
 app/src/main/res/values-th/strings.xml     | 218 ++++++++++++---------
 app/src/main/res/values-tr/strings.xml     |   6 +
 app/src/main/res/values-uk/strings.xml     |  33 ++++
 19 files changed, 400 insertions(+), 203 deletions(-)

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 3be6566bc..af7af27ea 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -340,7 +340,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">бележка за поверителността на Firefox</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Научете повече в нашата политика за поверителност</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Научете повече в нашата политика за поверителност</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Обичаме да ви пазим в безопасност</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2479,6 +2479,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Превеждане…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Изтегляне на езика в режим за икономия на данни (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Настройки на превода</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 0f2246e36..c99e4fbe5 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -2467,6 +2467,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Wrthi\'n cyfieithu…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Llwytho i lawr iaith yn y modd cadw data (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Dewisiadau Cyfieithu</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 42c36ab56..ed89e9a8c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2501,6 +2501,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Wird übersetzt…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Sprache im Datensparmodus herunterladen (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Übersetzungsoptionen</string>
diff --git a/app/src/main/res/values-dsb/strings.xml b/app/src/main/res/values-dsb/strings.xml
index d0cd466ea..4bff44e1d 100644
--- a/app/src/main/res/values-dsb/strings.xml
+++ b/app/src/main/res/values-dsb/strings.xml
@@ -2470,6 +2470,13 @@ To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produkt
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Pśełožujo se…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Rěc w datowem žarjeńskem modusu ześěgnuś (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Pśełožowańske nastajenja</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 56cdddaf8..613776f6d 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -344,7 +344,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Σημείωση απορρήτου του Firefox</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Μάθετε περισσότερα στη σημείωση απορρήτου μας</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Μάθετε περισσότερα στη σημείωση απορρήτου μας</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Μας αρέσει να σας προστατεύουμε</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2492,6 +2492,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Μετάφραση…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Λήψη γλώσσας στη λειτουργία εξοικονόμησης δεδομένων (%1$s);</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Επιλογές μετάφρασης</string>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index ac6f9be87..817537d14 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -335,7 +335,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox privacy notice</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Learn more in our privacy notice</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Learn more in our privacy notice</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">We love keeping you safe</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2458,6 +2458,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Translating…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Download language in data saving mode (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Translation Options</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e9888675a..65bc3a3e3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -258,6 +258,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Traducir página</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Página traducida de %1$s a %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Idioma seleccionado</string>
@@ -336,12 +341,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Aviso de privacidad de Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Saber más en nuestro aviso de privacidad</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Nos encanta mantenerte a salvo</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Descubre por qué millones aman Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Navegación segura con más opciones</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Nuestro navegador respaldado por una organización sin ánimo de lucro ayuda a evitar que las empresas te sigan en secreto por la web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Más de 100 millones de personas protegen su privacidad eligiendo un navegador respaldado por una organización sin ánimo de lucro.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">¿Rastreadores conocidos? Bloqueados automáticamente. ¿Extensiones? Más de 700. ¿PDF? Nuestro lector incorporado los hace fáciles de administrar.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Nuestro navegador respaldado por una organización sin ánimo de lucro ayuda a evitar que las empresas te sigan en secreto en la web.\n\nMás información en nuestro aviso de privacidad.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -697,9 +712,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Marcadores</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Inicios de sesión</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Inicios de sesión</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Contraseñas</string>
+    <string name="preferences_sync_logins_2">Contraseñas</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Pestañas abiertas</string>
     <!-- Preference for signing out -->
@@ -725,9 +740,9 @@
     <string name="default_device_name_2">%1$s en %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Tarjetas de crédito</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Tarjetas de crédito</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
+    <string name="preferences_sync_credit_cards_2">Métodos de pago</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Direcciones</string>
 
@@ -1694,13 +1709,13 @@
     <string name="add_to_homescreen_description_2">Puedes añadir fácilmente este sitio web a la pantalla de inicio de tu dispositivo para tener acceso instantáneo y navegar rápidamente, consiguiendo una experiencia similar a la de una aplicación real.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Inicios de sesión y contraseñas</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Inicios de sesión y contraseñas</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Contraseñas</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Contraseñas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Guardar inicios de sesión y contraseñas</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar inicios de sesión y contraseñas</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Guardar contraseñas</string>
+    <string name="preferences_passwords_save_logins_2">Guardar contraseñas</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Preguntar antes de guardar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1717,47 +1732,47 @@
     <string name="preferences_android_autofill_description">Completar nombres de usuarios y contraseñas en otras aplicaciones de tu dispositivo.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Añadir cuenta</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Añadir cuenta</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Añadir contraseña</string>
+    <string name="preferences_logins_add_login_2">Añadir contraseña</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Inicios de sesión sincronizados</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronizar contraseñas</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Inicios de sesión sincronizados</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Sincronizar contraseñas</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sincronizar inicios de sesión entre dispositivos</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizar inicios de sesión entre dispositivos</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronizar contraseñas entre dispositivos</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Sincronizar contraseñas entre dispositivos</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Inicios de sesión guardados</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Inicios de sesión guardados</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Contraseñas guardadas</string>
+    <string name="preferences_passwords_saved_logins_2">Contraseñas guardadas</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Los inicios de sesión que guardes o sincronices con %s se mostrarán aquí.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Los inicios de sesión que guardes o sincronices con %s se mostrarán aquí.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Las contraseñas que guardes o sincronices con %s aparecerán aquí. Todas las contraseñas que guardes quedan cifradas.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Las contraseñas que guardes o sincronices con %s aparecerán aquí. Todas las contraseñas que guardes quedan cifradas.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Saber más sobre Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Saber más sobre Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Descubre más sobre Sync</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Descubre más sobre Sync</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Excepciones</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Los inicios de sesión y contraseñas no guardados aparecerán aquí.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Los inicios de sesión y contraseñas no guardados aparecerán aquí.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s no guardará contraseñas para los sitios que se listen aquí.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s no guardará contraseñas para los sitios que se listen aquí.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">No se guardarán los inicios de sesión y contraseñas para estos sitios.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">No se guardarán los inicios de sesión y contraseñas para estos sitios.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s no guardará las contraseñas para estos sitios.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s no guardará las contraseñas para estos sitios.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eliminar todas las excepciones</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Buscar inicios de sesión</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Buscar inicios de sesión</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Buscar contraseñas</string>
+    <string name="preferences_passwords_saved_logins_search_2">Buscar contraseñas</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sitio</string>
     <!-- The header for the username for a login -->
@@ -1785,17 +1800,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Ocultar contraseña</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Desbloquear para ver tus inicios de sesión guardados</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquear para ver tus inicios de sesión guardados</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Desbloquea para ver tus contraseñas guardadas</string>
+    <string name="logins_biometric_prompt_message_2">Desbloquea para ver tus contraseñas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Asegurar tus usuarios y contraseñas</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Asegurar tus usuarios y contraseñas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Asegura tus contraseñas guardadas</string>
+    <string name="logins_warning_dialog_title_2">Asegura tus contraseñas guardadas</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Configura un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus usuarios y contraseñas guardados si alguien más tiene tu dispositivo.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configura un patrón de bloqueo del dispositivo, un PIN o una contraseña para proteger el acceso a tus usuarios y contraseñas guardados si alguien más tiene tu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Establece un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus contraseñas guardadas y evitar que sean accedidas por otras personas en caso de que alguien más tenga tu dispositivo.</string>
+    <string name="logins_warning_dialog_message_2">Establece un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus contraseñas guardadas y evitar que sean accedidas por otras personas en caso de que alguien más tenga tu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Más tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1814,10 +1829,10 @@
     <string name="saved_logins_sort_strategy_last_used">Usado por última vez</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordenar menú de inicio de sesión</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ordenar menú de inicio de sesión</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menú ordenar contraseñas</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menú ordenar contraseñas</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1825,44 +1840,44 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Direcciones</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Tarjetas de crédito</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Tarjetas de crédito</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Métodos de pago</string>
+    <string name="preferences_credit_cards_2">Métodos de pago</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Guardar y autocompletar tarjetas</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar y autocompletar tarjetas</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Guardar y completar métodos de pago</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Guardar y completar métodos de pago</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Los datos están cifrados</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Los datos están cifrados</string>
 
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s cifra todos los métodos de pago que guardes</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s cifra todos los métodos de pago que guardes</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar tarjetas entre dispositivos</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sincronizar tarjetas</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Añadir tarjeta de crédito</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Añadir tarjeta de crédito</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Añadir tarjeta</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Añadir tarjeta</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Administrar tarjetas guardadas</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Administrar tarjetas guardadas</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Administrar tarjetas</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Administrar tarjetas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Añadir dirección</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Administrar direcciones</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Guardar y autocompletar direcciones</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar y autocompletar direcciones</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Guardar y completar direcciones</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Guardar y completar direcciones</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Incluir información como números, correos electrónicos y direcciones de envío</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Incluir información como números, correos electrónicos y direcciones de envío</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Incluye números de teléfono y direcciones de correo electrónico</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Incluye números de teléfono y direcciones de correo electrónico</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Añadir tarjeta</string>
@@ -1883,9 +1898,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Eliminar tarjeta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">¿Seguro que quieres eliminar esta tarjeta de crédito?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">¿Seguro que quieres eliminar esta tarjeta de crédito?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">¿Eliminar tarjeta?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">¿Eliminar tarjeta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Eliminar</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1899,24 +1914,24 @@
     <string name="credit_cards_saved_cards">Tarjetas guardadas</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Por favor, escriba un número válido de tarjeta de crédito</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Por favor, escriba un número válido de tarjeta de crédito</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Introduce un número de tarjeta válido</string>
+    <string name="credit_cards_number_validation_error_message_2">Introduce un número de tarjeta válido</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Por favor, rellena este campo</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Por favor, rellena este campo</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Añadir un nombre</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Añadir un nombre</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Desbloquear para ver tus tarjetas guardadas</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Asegurar tus tarjetas de crédito</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Asegurar tus tarjetas de crédito</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Protege tus métodos de pago guardados</string>
+    <string name="credit_cards_warning_dialog_title_2">Protege tus métodos de pago guardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Configura un patrón de bloqueo, PIN o contraseña para proteger el acceso a tus tarjetas guardadas si alguien más accede a tu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configura un patrón de bloqueo, PIN o contraseña para proteger el acceso a tus tarjetas guardadas si alguien más accede a tu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Establece un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus métodos de pago guardados y evitar que sean accedidos por otras personas en caso de que alguien más tenga tu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message_3">Establece un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus métodos de pago guardados y evitar que sean accedidos por otras personas en caso de que alguien más tenga tu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1924,10 +1939,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Desbloquear tu dispositivo</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Desbloquear para usar la información de la tarjeta de crédito almacenada</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquear para usar la información de la tarjeta de crédito almacenada</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Desbloquea para utilizar métodos de pago guardados</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Desbloquea para utilizar métodos de pago guardados</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Añadir dirección</string>
     <!-- Title of the "Edit address" screen -->
@@ -1935,11 +1950,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Administrar direcciones</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Nombre</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Nombre</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Segundo nombre</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Segundo nombre</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Apellidos</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Apellidos</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nombre</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Domicilio</string>
     <!-- The header for the city of an address -->
@@ -1964,9 +1981,9 @@
     <string name="addressess_delete_address_button">Eliminar dirección</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">¿Seguro que quieres eliminar esta dirección?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">¿Seguro que quieres eliminar esta dirección?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">¿Eliminar esta dirección?</string>
+    <string name="addressess_confirm_dialog_message_2">¿Eliminar esta dirección?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Eliminar</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2065,49 +2082,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Editar</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">¿Seguro que quieres eliminar este inicio de sesión?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">¿Seguro que quieres eliminar este inicio de sesión?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">¿Estás seguro de que quieres eliminar esta contraseña?</string>
+    <string name="login_deletion_confirmation_2">¿Estás seguro de que quieres eliminar esta contraseña?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Eliminar</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancelar</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Opciones de inicio de sesión</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Opciones de inicio de sesión</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opciones de contraseña</string>
+    <string name="login_options_menu_2">Opciones de contraseña</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">El campo de texto editable para la dirección web del inicio de sesión.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">El campo de texto editable para la dirección web del inicio de sesión.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">El campo de texto editable para la dirección del sitio web.</string>
+    <string name="saved_login_hostname_description_3">El campo de texto editable para la dirección del sitio web.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">El campo de texto editable para el nombre de usuario del inicio de sesión.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario del inicio de sesión.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">El campo de texto editable para el nombre de usuario.</string>
+    <string name="saved_login_username_description_3">El campo de texto editable para el nombre de usuario.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">El campo de texto editable para la contraseña del inicio de sesión.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">El campo de texto editable para la contraseña del inicio de sesión.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">El campo de texto editable para la contraseña.</string>
+    <string name="saved_login_password_description_2">El campo de texto editable para la contraseña.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Guardar cambios para el inicio de sesión.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Guardar cambios para el inicio de sesión.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Guardar cambios.</string>
+    <string name="save_changes_to_login_2">Guardar cambios.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Editar</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Editar</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Editar contraseña</string>
+    <string name="edit_2">Editar contraseña</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Añadir nueva cuenta</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Añadir nueva cuenta</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Añadir contraseña</string>
+    <string name="add_login_2">Añadir contraseña</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Se necesita contraseña</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Se necesita contraseña</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Introduce una contraseña</string>
+    <string name="saved_login_password_required_2">Introduce una contraseña</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Se requiere nombre de usuario</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Se requiere nombre de usuario</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Introduce un nombre de usuario</string>
+    <string name="saved_login_username_required_2">Introduce un nombre de usuario</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Se requiere nombre de servidor</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2220,7 +2237,7 @@
     <string name="radio_preference_info_content_description">Clic para más detalles</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Ir arriba</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Ir arriba</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Cerrar</string>
@@ -2261,8 +2278,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Calificación ajustada</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Se han eliminado las reseñas no fiables</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Basado en revisiones fiables</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Aspectos destacados de reseñas recientes</string>
@@ -2318,10 +2333,6 @@
     <string name="review_quality_check_product_availability_warning_body">Si ves que este producto vuelve a estar disponible, infórmanos y trabajaremos para actualizar el análisis.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Informar que el producto está en stock</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Comprobando la calidad de la reseña</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Comprobando la calidad de la reseña</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Comprobando la calidad de la reseña (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2367,13 +2378,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Saber más</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Al seleccionar “Sí, probarlo”, aceptas %1$s de %2$s y %3$s de Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Al seleccionar “Sí, probarlo”, aceptas %1$s de %2$s y %3$s de Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Al seleccionar “Sí, probarlo”, aceptas lo siguiente de %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Al seleccionar “Sí, probarlo”, aceptas la %2$s de %1$s y los %4$s de %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Al seleccionar “Sí, probarlo”, aceptas la %2$s de %1$s y los %4$s de %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">política de privacidad</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">política de privacidad</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Política de privacidad</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">aviso de privacidad</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">términos de uso</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2444,6 +2461,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">¿Traducir esta página?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Página traducida de %1$s a %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Probar traducciones privadas en %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2456,6 +2477,8 @@
     <string name="translations_bottom_sheet_translate_to">Traducir a</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Ahora no</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Mostrar original</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Hecho</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2478,6 +2501,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Saber más</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Traduciendo…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opciones de traducción</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 2a7dfbb83..ec12a39c2 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -353,6 +353,8 @@
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Voittoa tavoittelemattoman tahon tukema selaimemme auttaa estämään yrityksiä seuraamasta sinua salaa verkossa.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Yli 100 miljoonaa ihmistä suojaa yksityisyyttään valitsemalla voittoa tavoittelemattoman järjestön tukeman selaimen.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Tunnetut seuraimet? Estetty automaattisesti. Laajennukset? Kokeile kaikkia 700:aa. PDF-tiedostoja? Sisäänrakennettu lukija tekee niistä helposti hallittavia.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Voittoa tavoittelemattoman tahon tukema selaimemme auttaa estämään yrityksiä seuraamasta sinua salaa verkossa.\n\nLisätietoja on tietosuojakäytännössämme.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a8bba84ea..39b7161c1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -258,6 +258,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Traduire la page</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Page traduite en %2$s, l’originale est en %1$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Langue sélectionnée</string>
@@ -337,17 +342,21 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Politique de confidentialité de Firefox</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">En savoir plus dans notre politique de confidentialité</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">En savoir plus dans notre politique de confidentialité</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Votre protection compte pour nous</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Découvrez pourquoi des millions de personnes aiment Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">La navigation sécurisée avec plus de choix</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Notre navigateur soutenu par une organisation à but non lucratif empêche les entreprises de vous suivre secrètement sur le Web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Plus de 100 millions de personnes protègent leur vie privée en choisissant un navigateur soutenu par une organisation à but non lucratif.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Les traqueurs connus ? Automatiquement bloqués. Des extensions ? Essayez les 700. Des fichiers PDF ? Notre lecteur intégré en facilite la gestion.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Notre navigateur soutenu par une organisation à but non lucratif empêche les entreprises de vous suivre secrètement sur le Web.\n\nPour en savoir plus, consultez notre politique de confidentialité.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -2450,6 +2459,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Traduire cette page ?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Page traduite en %2$s, l’originale est en %1$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Essayer les traductions privées de %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
diff --git a/app/src/main/res/values-hsb/strings.xml b/app/src/main/res/values-hsb/strings.xml
index 399f0453b..7c324220b 100644
--- a/app/src/main/res/values-hsb/strings.xml
+++ b/app/src/main/res/values-hsb/strings.xml
@@ -336,7 +336,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Zdźělenka priwatnosće Firefox</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Zhońće wjace w našej zdźělence priwatnosće</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Zhońće wjace w našej zdźělence priwatnosće</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Škitamy was rady</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2477,6 +2477,13 @@ To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produk
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Přełožuje so…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Rěč w datowym lutowanskim modusu sćahnyć (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Přełožowanske nastajenja</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c594721e0..ef06f7da1 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -342,7 +342,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Informativa sulla privacy di Firefox</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Ulteriori informazioni nella nostra informativa sulla privacy</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Ulteriori informazioni nella nostra informativa sulla privacy</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Ci piace mantenerti al sicuro</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2514,6 +2514,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Traduzione…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Scaricare la lingua in modalità Risparmio dati (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opzioni di traduzione</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 83f74c61e..891dd3b9f 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -2475,6 +2475,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">בתהליך תרגום…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">להוריד את השפה במצב חיסכון בנתונים (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">אפשרויות תרגום</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index b05f0fb1d..1dd052fbc 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -345,7 +345,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox 개인정보처리방침</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">개인정보 보호정책에서 자세히 알아보기</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">개인정보 보호정책에서 자세히 알아보기</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">우리는 사용자를 안전하게 지키는 것을 좋아합니다</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2522,6 +2522,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">번역 중…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">데이터 절약 모드에서 언어를 다운로드하시겠습니까 (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">번역 옵션</string>
@@ -2645,7 +2652,7 @@
     This dialog will be presented when the user attempts to download a language or perform
     a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
     The first parameter is the size in kilobytes or megabytes of the language file.-->
-    <string name="download_language_file_dialog_title">데이터 절약 모드(%1$s)에 있는 동안 다운로드하시겠습니까?</string>
+    <string name="download_language_file_dialog_title">데이터 절약 모드에 있는 동안 다운로드하시겠습니까 (%1$s)?</string>
 
     <!-- Additional information for the data saving mode warning dialog used by the translations feature. This text explains the reason a download is required for a translation. -->
     <string name="download_language_file_dialog_message_all_languages">개인 정보 보호를 위해 언어 일부분을 캐시에 다운로드합니다.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 763be5a58..ddaec266a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -340,7 +340,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Aviso de privacidade do Firefox</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Saiba mais em nosso aviso de privacidade</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Saiba mais em nosso aviso de privacidade</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Adoramos manter você seguro</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2483,6 +2483,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Traduzindo…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Baixar idioma no modo de economia de dados (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opções de tradução</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index a43beb0fa..a97fa318d 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -339,7 +339,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Política de privacidade do Firefox</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Saiba mais nas nossas informações de privacidade</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Saiba mais nas nossas informações de privacidade</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Adoramos mantê-lo(a) seguro(a)</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2475,6 +2475,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">A traduzir…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Transferir idioma no modo de poupança de dados (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opções de tradução</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 9ea2e40bc..45b3f0e31 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -343,7 +343,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox sekretessmeddelande</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Läs mer i vårt sekretessmeddelande</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Läs mer i vårt sekretessmeddelande</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Vi älskar att hålla dig säker</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2487,6 +2487,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Översätter…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Hämta språk i datasparläge (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Översättningsalternativ</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index f37d2d2b5..7761ed5cd 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -253,6 +253,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">แปลหน้า</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">แปลหน้าจาก%1$sเป็น%2$sแล้ว</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">ภาษาที่เลือก</string>
@@ -331,12 +336,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">ประกาศความเป็นส่วนตัวของ Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">เรียนรู้เพิ่มเติมในประกาศความเป็นส่วนตัวของเรา</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">เรารักที่จะดูแลคุณให้ปลอดภัย</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">ค้นพบว่าทำไมผู้คนนับล้านถึงรัก Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">ท่องเว็บอย่างปลอดภัยพร้อมตัวเลือกที่มากขึ้น</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">เบราว์เซอร์ที่สนับสนุนโดยองค์กรไม่แสวงหาผลกำไรของเราจะช่วยหยุดบริษัทต่างๆ ไม่ให้แอบติดตามคุณทางเว็บได้</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">ผู้คนมากกว่า 100 ล้านคนปกป้องความเป็นส่วนตัวของตัวเองด้วยการเลือกเบราว์เซอร์ที่ได้รับการสนับสนุนจากองค์กรไม่แสวงหาผลกำไร</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">เครื่องมือติดตามที่รู้จักล่ะ? จะปิดกั้นให้โดยอัตโนมัติเลย ส่วนขยายล่ะ? ลองดูส่วนขยายทั้งหมดกว่า 700 อันเลย ไฟล์ PDF ล่ะ? ใช้ตัวอ่านภายในตัวของเราเลยเพื่อให้จัดการไฟล์เหล่านั้นได้ง่าย</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">เบราว์เซอร์ที่ได้รับการสนับสนุนจากองค์กรไม่แสวงหาผลกำไรของเราช่วยหยุดบริษัทต่าง ๆ ไม่ให้แอบติดตามคุณทางเว็บได้\n\nเรียนรู้เพิ่มเติมในประกาศความเป็นส่วนตัวของเรา</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -695,9 +710,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">ที่คั่นหน้า</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">การเข้าสู่ระบบ</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">การเข้าสู่ระบบ</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">รหัสผ่าน</string>
+    <string name="preferences_sync_logins_2">รหัสผ่าน</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">แท็บที่เปิดอยู่</string>
     <!-- Preference for signing out -->
@@ -723,9 +738,9 @@
     <string name="default_device_name_2">%1$s บน %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">บัตรเครดิต</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">บัตรเครดิต</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">วิธีการชำระเงิน</string>
+    <string name="preferences_sync_credit_cards_2">วิธีการชำระเงิน</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">ที่อยู่</string>
 
@@ -1665,14 +1680,14 @@
     <string name="add_to_homescreen_description_2">คุณสามารถเพิ่มเว็บไซต์นี้ลงในหน้าจอหลักของอุปกรณ์ของคุณเพื่อเข้าถึงและเรียกดูได้เร็วขึ้นด้วยประสบการณ์ที่เหมือนแอป</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">การเข้าสู่ระบบและรหัสผ่าน</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">การเข้าสู่ระบบและรหัสผ่าน</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">รหัสผ่าน</string>
+    <string name="preferences_passwords_logins_and_passwords_2">รหัสผ่าน</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">บันทึกการเข้าสู่ระบบและรหัสผ่าน</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">บันทึกการเข้าสู่ระบบและรหัสผ่าน</string>
 
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">บันทึกรหัสผ่าน</string>
+    <string name="preferences_passwords_save_logins_2">บันทึกรหัสผ่าน</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">ถามเพื่อบันทึก</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1688,47 +1703,47 @@
     <!-- Description for the preference for autofilling logins from Fenix in other apps (e.g. autofilling the Twitter app) -->
     <string name="preferences_android_autofill_description">เติมชื่อผู้ใช้และรหัสผ่านในแอปอื่น ๆ บนอุปกรณ์ของคุณ</string>
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">เพิ่มการเข้าสู่ระบบ</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">เพิ่มการเข้าสู่ระบบ</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">เพิ่มรหัสผ่าน</string>
+    <string name="preferences_logins_add_login_2">เพิ่มรหัสผ่าน</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">ซิงค์การเข้าสู่ระบบ</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">ซิงค์รหัสผ่าน</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">ซิงค์การเข้าสู่ระบบ</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">ซิงค์รหัสผ่าน</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">ซิงค์การเข้าสู่ระบบระหว่างอุปกรณ์</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">ซิงค์การเข้าสู่ระบบระหว่างอุปกรณ์</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">ซิงค์รหัสผ่านระหว่างอุปกรณ์</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">ซิงค์รหัสผ่านระหว่างอุปกรณ์</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">การเข้าสู่ระบบที่บันทึกไว้</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">การเข้าสู่ระบบที่บันทึกไว้</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">รหัสผ่านที่บันทึกไว้</string>
+    <string name="preferences_passwords_saved_logins_2">รหัสผ่านที่บันทึกไว้</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">การเข้าสู่ระบบที่คุณบันทึกหรือซิงค์กับ %s จะปรากฏที่นี่</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">การเข้าสู่ระบบที่คุณบันทึกหรือซิงค์กับ %s จะปรากฏที่นี่</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">รหัสผ่านที่คุณบันทึกหรือซิงค์กับ %s จะแสดงอยู่ที่นี่ รหัสผ่านทั้งหมดที่คุณบันทึกจะถูกเข้ารหัสไว้</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">รหัสผ่านที่คุณบันทึกหรือซิงค์กับ %s จะแสดงอยู่ที่นี่ รหัสผ่านทั้งหมดที่คุณบันทึกจะถูกเข้ารหัสไว้</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">เรียนรู้เพิ่มเติมเกี่ยวกับ Sync</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">เรียนรู้เพิ่มเติมเกี่ยวกับ Sync</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">เรียนรู้เพิ่มเติมเกี่ยวกับซิงค์</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">เรียนรู้เพิ่มเติมเกี่ยวกับซิงค์</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">ข้อยกเว้น</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">การเข้าสู่ระบบและรหัสผ่านที่ไม่ได้บันทึกจะถูกแสดงที่นี่</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">การเข้าสู่ระบบและรหัสผ่านที่ไม่ได้บันทึกจะถูกแสดงที่นี่</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s จะไม่บันทึกรหัสผ่านสำหรับไซต์ที่แสดงอยู่ที่นี่</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s จะไม่บันทึกรหัสผ่านสำหรับไซต์ที่แสดงอยู่ที่นี่</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">การเข้าสู่ระบบและรหัสผ่านจะไม่ถูกบันทึกสำหรับไซต์เหล่านี้</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">การเข้าสู่ระบบและรหัสผ่านจะไม่ถูกบันทึกสำหรับไซต์เหล่านี้</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s จะไม่บันทึกรหัสผ่านสำหรับไซต์เหล่านี้</string>
+    <string name="preferences_passwords_exceptions_description_2">%s จะไม่บันทึกรหัสผ่านสำหรับไซต์เหล่านี้</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">ลบข้อยกเว้นทั้งหมด</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">ค้นหาการเข้าสู่ระบบ</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">ค้นหาการเข้าสู่ระบบ</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">ค้นหารหัสผ่าน</string>
+    <string name="preferences_passwords_saved_logins_search_2">ค้นหารหัสผ่าน</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">ไซต์</string>
     <!-- The header for the username for a login -->
@@ -1756,17 +1771,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">ซ่อนรหัสผ่าน</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">ปลดล็อกเพื่อดูการเข้าสู่ระบบที่บันทึกไว้ของคุณ</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ปลดล็อกเพื่อดูการเข้าสู่ระบบที่บันทึกไว้ของคุณ</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">ปลดล็อกเพื่อดูรหัสผ่านที่บันทึกไว้ของคุณ</string>
+    <string name="logins_biometric_prompt_message_2">ปลดล็อกเพื่อดูรหัสผ่านที่บันทึกไว้ของคุณ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">รักษาความปลอดภัยการเข้าสู่ระบบและรหัสผ่านของคุณ</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">รักษาความปลอดภัยการเข้าสู่ระบบและรหัสผ่านของคุณ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">รักษาความปลอดภัยให้กับรหัสผ่านที่บันทึกไว้ของคุณ</string>
+    <string name="logins_warning_dialog_title_2">รักษาความปลอดภัยให้กับรหัสผ่านที่บันทึกไว้ของคุณ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">ตั้งค่ารูปแบบการล็อกอุปกรณ์, PIN, หรือรหัสผ่านเพื่อปกป้องไม่ให้ใครเข้าถึงการเข้าสู่ระบบและรหัสผ่านที่บันทึกไว้ของคุณหากคนอื่นมีอุปกรณ์ของคุณ</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ตั้งค่ารูปแบบการล็อกอุปกรณ์, PIN, หรือรหัสผ่านเพื่อปกป้องไม่ให้ใครเข้าถึงการเข้าสู่ระบบและรหัสผ่านที่บันทึกไว้ของคุณหากคนอื่นมีอุปกรณ์ของคุณ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">ตั้งค่ารูปแบบการล็อกอุปกรณ์, PIN, หรือรหัสผ่านเพื่อปกป้องไม่ให้ใครเข้าถึงรหัสผ่านที่บันทึกไว้ของคุณหากคนอื่นมีอุปกรณ์ของคุณ</string>
+    <string name="logins_warning_dialog_message_2">ตั้งค่ารูปแบบการล็อกอุปกรณ์, PIN, หรือรหัสผ่านเพื่อปกป้องไม่ให้ใครเข้าถึงรหัสผ่านที่บันทึกไว้ของคุณหากคนอื่นมีอุปกรณ์ของคุณ</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">ภายหลัง</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1784,10 +1799,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">ใช้งานครั้งสุดท้าย</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">เรียงเมนูเข้าสู่ระบบ</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">เรียงเมนูเข้าสู่ระบบ</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">เมนูเรียงลำดับรหัสผ่าน</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">เมนูเรียงลำดับรหัสผ่าน</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1795,44 +1810,44 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">ที่อยู่</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">บัตรเครดิต</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">บัตรเครดิต</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">วิธีการชำระเงิน</string>
+    <string name="preferences_credit_cards_2">วิธีการชำระเงิน</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">บันทึกและเติมข้อมูลบัตรอัตโนมัติ</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">บันทึกและเติมข้อมูลบัตรอัตโนมัติ</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">บันทึกและเติมวิธีการชำระเงิน</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">บันทึกและเติมวิธีการชำระเงิน</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">ข้อมูลถูกเข้ารหัส</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">ข้อมูลถูกเข้ารหัส</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s จะเข้ารหัสลับวิธีการชำระเงินทั้งหมดที่คุณบันทึกไว้</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s จะเข้ารหัสลับวิธีการชำระเงินทั้งหมดที่คุณบันทึกไว้</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">ซิงค์บัตรระหว่างอุปกรณ์</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">ซิงค์บัตร</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">เพิ่มบัตรเครดิต</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">เพิ่มบัตรเครดิต</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">เพิ่มบัตร</string>
+    <string name="preferences_credit_cards_add_credit_card_2">เพิ่มบัตร</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">จัดการบัตรที่บันทึกไว้</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">จัดการบัตรที่บันทึกไว้</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">จัดการบัตร</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">จัดการบัตร</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">เพิ่มที่อยู่</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">จัดการที่อยู่</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">บันทึกและป้อนที่อยู่อัตโนมัติ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">บันทึกและป้อนที่อยู่อัตโนมัติ</string>
 
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">บันทึกและเติมที่อยู่อัตโนมัติ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">บันทึกและเติมที่อยู่อัตโนมัติ</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">รวมข้อมูลเช่นหมายเลข อีเมล และที่อยู่ในการจัดส่ง</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">รวมข้อมูลเช่นหมายเลข อีเมล และที่อยู่ในการจัดส่ง</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">รวมหมายเลขโทรศัพท์และที่อยู่อีเมล</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">รวมหมายเลขโทรศัพท์และที่อยู่อีเมล</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">เพิ่มบัตร</string>
@@ -1853,9 +1868,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">ลบบัตร</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">คุณแน่ใจหรือไม่ว่าต้องการลบบัตรเครดิตนี้?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">คุณแน่ใจหรือไม่ว่าต้องการลบบัตรเครดิตนี้?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">ลบบัตร?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">ลบบัตร?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">ลบ</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1869,23 +1884,23 @@
     <string name="credit_cards_saved_cards">บัตรที่บันทึกไว้</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">โปรดป้อนหมายเลขบัตรเครดิตที่ถูกต้อง</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">โปรดป้อนหมายเลขบัตรเครดิตที่ถูกต้อง</string>
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">ใส่หมายเลขบัตรที่ถูกต้อง</string>
+    <string name="credit_cards_number_validation_error_message_2">ใส่หมายเลขบัตรที่ถูกต้อง</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">โปรดกรอกช่องนี้</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">โปรดกรอกช่องนี้</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">เพิ่มชื่อ</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">เพิ่มชื่อ</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">ปลดล็อกเพื่อดูบัตรเครดิตที่บันทึกไว้ของคุณ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">รักษาความปลอดภัยให้กับบัตรเครดิตของคุณ</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">รักษาความปลอดภัยให้กับบัตรเครดิตของคุณ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">รักษาความปลอดภัยให้กับวิธีการชำระเงินที่บันทึกไว้ของคุณ</string>
+    <string name="credit_cards_warning_dialog_title_2">รักษาความปลอดภัยให้กับวิธีการชำระเงินที่บันทึกไว้ของคุณ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">ตั้งค่ารูปแบบการล็อกอุปกรณ์, PIN, หรือรหัสผ่านเพื่อปกป้องไม่ให้ใครเข้าถึงบัตรเครดิตที่บันทึกไว้ของคุณหากคนอื่นมีอุปกรณ์ของคุณ</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ตั้งค่ารูปแบบการล็อกอุปกรณ์, PIN, หรือรหัสผ่านเพื่อปกป้องไม่ให้ใครเข้าถึงบัตรเครดิตที่บันทึกไว้ของคุณหากคนอื่นมีอุปกรณ์ของคุณ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">ตั้งค่ารูปแบบการล็อกอุปกรณ์, PIN, หรือรหัสผ่านเพื่อปกป้องไม่ให้ใครเข้าถึงวิธีการชำระเงินที่บันทึกไว้ของคุณหากคนอื่นมีอุปกรณ์ของคุณ</string>
+    <string name="credit_cards_warning_dialog_message_3">ตั้งค่ารูปแบบการล็อกอุปกรณ์, PIN, หรือรหัสผ่านเพื่อปกป้องไม่ให้ใครเข้าถึงวิธีการชำระเงินที่บันทึกไว้ของคุณหากคนอื่นมีอุปกรณ์ของคุณ</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">ตั้งค่าตอนนี้</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1893,10 +1908,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">ปลดล็อกอุปกรณ์ของคุณ</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">ปลดล็อกเพื่อใช้ข้อมูลบัตรเครดิตที่เก็บไว้</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ปลดล็อกเพื่อใช้ข้อมูลบัตรเครดิตที่เก็บไว้</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">ปลดล็อกเพื่อใช้วิธีการชำระเงินที่บันทึกไว้</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">ปลดล็อกเพื่อใช้วิธีการชำระเงินที่บันทึกไว้</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">เพิ่มที่อยู่</string>
     <!-- Title of the "Edit address" screen -->
@@ -1904,11 +1919,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">จัดการที่อยู่</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">ชื่อจริง</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">ชื่อจริง</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">ชื่อกลาง</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">ชื่อกลาง</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">นามสกุล</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">นามสกุล</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">ชื่อ</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">ที่อยู่ถนน</string>
     <!-- The header for the city of an address -->
@@ -1933,9 +1950,9 @@
     <string name="addressess_delete_address_button">ลบที่อยู่</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">คุณแน่ใจหรือไม่ว่าต้องการลบที่อยู่นี้?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">คุณแน่ใจหรือไม่ว่าต้องการลบที่อยู่นี้?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">ลบที่อยู่นี้หรือไม่?</string>
+    <string name="addressess_confirm_dialog_message_2">ลบที่อยู่นี้หรือไม่?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">ลบ</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2033,49 +2050,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">แก้ไข</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">คุณแน่ใจหรือไม่ที่ต้องการจะลบการเข้าสู่ระบบนี้?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">คุณแน่ใจหรือไม่ที่ต้องการจะลบการเข้าสู่ระบบนี้?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">คุณแน่ใจหรือไม่ว่าต้องการลบรหัสผ่านนี้?</string>
+    <string name="login_deletion_confirmation_2">คุณแน่ใจหรือไม่ว่าต้องการลบรหัสผ่านนี้?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">ลบ</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">ยกเลิก</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">ตัวเลือกการเข้าสู่ระบบ</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">ตัวเลือกการเข้าสู่ระบบ</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">ตัวเลือกรหัสผ่าน</string>
+    <string name="login_options_menu_2">ตัวเลือกรหัสผ่าน</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">ช่องข้อความที่แก้ไขได้สำหรับที่อยู่เว็บของการเข้าสู่ระบบ</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ช่องข้อความที่แก้ไขได้สำหรับที่อยู่เว็บของการเข้าสู่ระบบ</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">ช่องข้อความที่แก้ไขได้สำหรับที่อยู่เว็บไซต์</string>
+    <string name="saved_login_hostname_description_3">ช่องข้อความที่แก้ไขได้สำหรับที่อยู่เว็บไซต์</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">ช่องข้อความที่แก้ไขได้สำหรับชื่อผู้ใช้ของการเข้าสู่ระบบ</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ช่องข้อความที่แก้ไขได้สำหรับชื่อผู้ใช้ของการเข้าสู่ระบบ</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">ช่องข้อความที่แก้ไขได้สำหรับชื่อผู้ใช้</string>
+    <string name="saved_login_username_description_3">ช่องข้อความที่แก้ไขได้สำหรับชื่อผู้ใช้</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">ช่องข้อความที่แก้ไขได้สำหรับรหัสผ่านของการเข้าสู่ระบบ</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ช่องข้อความที่แก้ไขได้สำหรับรหัสผ่านของการเข้าสู่ระบบ</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">ช่องข้อความที่แก้ไขได้สำหรับรหัสผ่าน</string>
+    <string name="saved_login_password_description_2">ช่องข้อความที่แก้ไขได้สำหรับรหัสผ่าน</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">บันทึกการเปลี่ยนแปลงเพื่อเข้าสู่ระบบ</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">บันทึกการเปลี่ยนแปลงเพื่อเข้าสู่ระบบ</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">บันทึกการเปลี่ยนแปลง</string>
+    <string name="save_changes_to_login_2">บันทึกการเปลี่ยนแปลง</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">แก้ไข</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">แก้ไข</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">แก้ไขรหัสผ่าน</string>
+    <string name="edit_2">แก้ไขรหัสผ่าน</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">เพิ่มการเข้าสู่ระบบใหม่</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">เพิ่มการเข้าสู่ระบบใหม่</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">เพิ่มรหัสผ่าน</string>
+    <string name="add_login_2">เพิ่มรหัสผ่าน</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">ต้องการรหัสผ่าน</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">ต้องการรหัสผ่าน</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">ใส่รหัสผ่าน</string>
+    <string name="saved_login_password_required_2">ใส่รหัสผ่าน</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">ต้องการชื่อผู้ใช้</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">ต้องการชื่อผู้ใช้</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">ป้อนชื่อผู้ใช้</string>
+    <string name="saved_login_username_required_2">ป้อนชื่อผู้ใช้</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">ต้องการชื่อโฮสต์</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2188,7 +2205,7 @@
     <string name="radio_preference_info_content_description">คลิกเพื่อดูรายละเอียดเพิ่มเติม</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">นำทางขึ้นไปด้านบน</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">นำทางขึ้นไปด้านบน</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">ปิด</string>
@@ -2229,8 +2246,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">คะแนนที่ปรับแล้ว</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">เอาบทวิจารณ์ที่ไม่น่าเชื่อถือออกแล้ว</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">อ้างอิงจากบทวิจารณ์ที่เชื่อถือได้</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">ไฮไลต์จากบทวิจารณ์ล่าสุด</string>
@@ -2286,10 +2301,6 @@
     <string name="review_quality_check_product_availability_warning_body">หากคุณเห็นว่าสินค้านี้มีอยู่ในสต็อกแล้ว โปรดรายงานแล้วเราจะทำการตรวจสอบบทวิจารณ์</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">รายงานสินค้ามีในสต็อก</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">กำลังตรวจสอบคุณภาพบทวิจารณ์</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">กำลังตรวจสอบคุณภาพบทวิจารณ์</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">กำลังตรวจสอบคุณภาพบทวิจารณ์ (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2335,13 +2346,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">เรียนรู้เพิ่มเติม</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">การเลือก “ใช่ ลองใช้เลย” ถือว่าคุณยอมรับ%2$sและ%3$sของ %1$s โดย Mozilla</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">การเลือก “ใช่ ลองใช้เลย” ถือว่าคุณยอมรับ%2$sและ%3$sของ %1$s โดย Mozilla</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">การเลือก “ใช่ ลองใช้เลย” ถือว่าคุณยอมรับข้อตกลงต่อไปนี้จาก %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">การเลือก “ใช่ ลองใช้เลย” ถือว่าคุณยอมรับ%2$sของ %1$s และ%4$sของ %3$s</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">การเลือก “ใช่ ลองใช้เลย” ถือว่าคุณยอมรับ%2$sของ %1$s และ%4$sของ %3$s</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">นโยบายความเป็นส่วนตัว</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">นโยบายความเป็นส่วนตัว</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">นโยบายความเป็นส่วนตัว</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">ประกาศความเป็นส่วนตัว</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">เงื่อนไขการใช้งาน</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2412,6 +2429,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">แปลหน้านี้?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">แปลหน้าจาก%1$sเป็น%2$sแล้ว</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">ลองใช้การแปลแบบส่วนตัวใน %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2424,6 +2445,8 @@
     <string name="translations_bottom_sheet_translate_to">แปลเป็น</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">ไม่ใช่ตอนนี้</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">แสดงต้นฉบับ</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">เสร็จสิ้น</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2446,6 +2469,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">เรียนรู้เพิ่มเติม</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">กำลังแปล…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">ตัวเลือกการแปล</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 3e0899c6d..94f173d37 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -340,9 +340,14 @@
     <string name="juno_onboarding_privacy_notice_text">Firefox gizlilik bildirimi</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Sizi güvende tutmayı seviyoruz</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Milyonların Firefox’u neden sevdiğini öğrenin</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Kâr amacı gütmeyen tarayıcımız, şirketlerin sizi web’de gizlice takip etmesini engelliyor.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">100 milyondan fazla insan, kâr amacı gütmeyen bir kuruluş tarafından desteklenen bu tarayıcıyla gizliliğini koruyor.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Kâr amacı gütmeyen tarayıcımız, şirketlerin sizi web’de gizlice takip etmesini engelliyor.\n\nAyrıntıları gizlilik bildirimimizde bulabilirsiniz.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -2461,6 +2466,7 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Çevriliyor…</string>
 
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Çeviri Seçenekleri</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 582150ceb..c926d4641 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -255,6 +255,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Перекласти сторінку</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Сторінку перекладено з %1$s на %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Обрана мова</string>
@@ -333,11 +338,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Положення про приватність Firefox</string>
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Докладніше в нашому положенні про приватність</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Ми дбаємо про вашу безпеку</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Дізнайтеся, чому мільйони користувачів люблять Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Безпечний перегляд із більшим вибором</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Наш некомерційний браузер допомагає блокувати таємне стеження компаній за вами в інтернеті.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Понад 100 мільйонів людей захищають свою приватність, обравши браузер від некомерційної організація.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Автоблокування відомих елементів стеження. 700 розширень для будь-яких завдань. Вбудований засіб читання файлів PDF і керування ними.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Наш некомерційний браузер не дозволяє компаніям таємно стежити за вами в інтернеті.\n\nДокладніше в нашому Положенні про приватність.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -1915,6 +1931,8 @@
     <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">По батькові</string>
     <!-- The header for the last name of an address -->
     <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Прізвище</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Ім’я</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Вулиця</string>
     <!-- The header for the city of an address -->
@@ -2338,10 +2356,16 @@
     <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Вибравши “Так, спробувати”, ви погоджуєтеся з %1$s %2$s і %3$s від Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Вибираючи “Спробувати”, ви погоджуєтеся з такими умовами від %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Вибравши “Так, спробувати”, ви погоджуєтеся з %2$s %1$s і %4$s %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Вибравши “Так, спробувати”, ви погоджуєтеся з %2$s %1$s і %4$s %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">політикою приватності</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Політика приватності</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">положенням про приватність</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">умовами користування</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2413,6 +2437,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Перекласти цю сторінку?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Сторінку перекладено з %1$s на %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Спробуйте приватні переклади у %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2425,6 +2453,8 @@
     <string name="translations_bottom_sheet_translate_to">Перекласти мовою</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Не зараз</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Показати оригінал</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Готово</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2447,6 +2477,9 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Докладніше</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Переклад…</string>
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Параметри перекладу</string>

From ae5f90854346a59d6b7c83b1e66a696d49a63af9 Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Wed, 28 Feb 2024 16:06:12 +0000
Subject: [PATCH 202/222] Bug 1882308 - Updated custom tab to support private
 mode

(cherry picked from commit de4214bda7dc5298098fc99e10ec5a077c29043d)
---
 app/src/main/java/org/mozilla/fenix/HomeActivity.kt       | 4 ++--
 .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index eb59219be..2ec05881f 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -879,8 +879,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
 
     private fun setupTheme() {
         themeManager = createThemeManager()
-        // ExternalAppBrowserActivity handles it's own theming as it can be customized.
-        if (this !is ExternalAppBrowserActivity) {
+        // ExternalAppBrowserActivity exclusively handles it's own theming unless in private mode.
+        if (this !is ExternalAppBrowserActivity || browsingModeManager.mode.isPrivate) {
             themeManager.setActivityTheme(this)
             themeManager.applyStatusBarTheme(this)
         }
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index ae27629bb..5476a21c4 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -266,8 +266,8 @@ abstract class BaseBrowserFragment :
         _binding = FragmentBrowserBinding.inflate(inflater, container, false)
 
         val activity = activity as HomeActivity
-        // ExternalAppBrowserActivity handles it's own theming as it can be customized.
-        if (activity !is ExternalAppBrowserActivity) {
+        // ExternalAppBrowserActivity exclusively handles it's own theming unless in private mode.
+        if (activity !is ExternalAppBrowserActivity || activity.browsingModeManager.mode.isPrivate) {
             activity.themeManager.applyStatusBarTheme(activity)
         }
 
@@ -1574,8 +1574,8 @@ abstract class BaseBrowserFragment :
             activity?.exitImmersiveMode()
             (view as? SwipeGestureLayout)?.isSwipeEnabled = true
             (activity as? HomeActivity)?.let { activity ->
-                // ExternalAppBrowserActivity handles it's own theming as it can be customized.
-                if (activity !is ExternalAppBrowserActivity) {
+                // ExternalAppBrowserActivity exclusively handles it's own theming unless in private mode.
+                if (activity !is ExternalAppBrowserActivity || activity.browsingModeManager.mode.isPrivate) {
                     activity.themeManager.applyStatusBarTheme(activity)
                 }
             }

From 36886c0d0ae69cc334e488786ea23fd38f558e0f Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Tue, 20 Feb 2024 19:27:37 -0500
Subject: [PATCH 203/222] Bug 1881128 - Add additional headers for Google
 requests

(cherry picked from commit 9bc558c887908470ee1746518cc9926a930ecc3e)
---
 .../fenix/components/UrlRequestInterceptor.kt |  6 +--
 .../components/UrlRequestInterceptorTest.kt   | 42 +++++++++++++++----
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/UrlRequestInterceptor.kt b/app/src/main/java/org/mozilla/fenix/components/UrlRequestInterceptor.kt
index d267a6043..74e270f70 100644
--- a/app/src/main/java/org/mozilla/fenix/components/UrlRequestInterceptor.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/UrlRequestInterceptor.kt
@@ -19,8 +19,8 @@ import mozilla.components.concept.engine.request.RequestInterceptor
  */
 class UrlRequestInterceptor(private val isDeviceRamAboveThreshold: Boolean) : RequestInterceptor {
 
-    private val isGoogleSearchRequest by lazy {
-        Regex("^https://www\\.google\\.(?:.+)/search")
+    private val isGoogleRequest by lazy {
+        Regex("^https://www\\.google\\..+")
     }
 
     @VisibleForTesting
@@ -41,7 +41,7 @@ class UrlRequestInterceptor(private val isDeviceRamAboveThreshold: Boolean) : Re
         uri: String,
         isSubframeRequest: Boolean,
     ): Boolean {
-        return !isSubframeRequest && isGoogleSearchRequest.containsMatchIn(uri)
+        return !isSubframeRequest && isGoogleRequest.containsMatchIn(uri)
     }
 
     override fun onLoadRequest(
diff --git a/app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt b/app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt
index 058c47e24..61edbff0a 100644
--- a/app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt
@@ -59,15 +59,21 @@ class UrlRequestInterceptorTest {
     fun `WHEN should intercept request is called THEN return the correct boolean value`() {
         val urlRequestInterceptor = getUrlRequestInterceptor()
 
-        assertFalse(
+        assertTrue(
             urlRequestInterceptor.shouldInterceptRequest(
-                uri = "https://getpocket.com",
+                uri = "https://www.google.com",
                 isSubframeRequest = false,
             ),
         )
-        assertFalse(
+        assertTrue(
             urlRequestInterceptor.shouldInterceptRequest(
-                uri = "https://www.google.com",
+                uri = "https://www.google.com/webhp",
+                isSubframeRequest = false,
+            ),
+        )
+        assertTrue(
+            urlRequestInterceptor.shouldInterceptRequest(
+                uri = "https://www.google.com/preferences",
                 isSubframeRequest = false,
             ),
         )
@@ -89,6 +95,13 @@ class UrlRequestInterceptorTest {
                 isSubframeRequest = false,
             ),
         )
+
+        assertFalse(
+            urlRequestInterceptor.shouldInterceptRequest(
+                uri = "https://getpocket.com",
+                isSubframeRequest = false,
+            ),
+        )
         assertFalse(
             urlRequestInterceptor.shouldInterceptRequest(
                 uri = "https://www.google.com/search?q=blue",
@@ -114,13 +127,24 @@ class UrlRequestInterceptorTest {
     }
 
     @Test
-    fun `WHEN a Google request is loaded THEN request is not intercepted`() {
+    fun `WHEN a Google request is loaded THEN request is intercepted`() {
         val uri = "https://www.google.com"
-        val response = getUrlRequestInterceptor().onLoadRequest(
-            uri = uri,
-        )
 
-        assertNull(response)
+        assertEquals(
+            RequestInterceptor.InterceptionResponse.Url(
+                url = uri,
+                flags = LoadUrlFlags.select(
+                    LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE,
+                    ALLOW_ADDITIONAL_HEADERS,
+                ),
+                additionalHeaders = mapOf(
+                    "X-Search-Subdivision" to "0",
+                ),
+            ),
+            getUrlRequestInterceptor().onLoadRequest(
+                uri = uri,
+            ),
+        )
     }
 
     @Test

From 96ca9c9ac00ef2fadff290242d4c6358952bcc95 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 6 Mar 2024 02:09:53 +0000
Subject: [PATCH 204/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-bg/strings.xml     |   2 +-
 app/src/main/res/values-es-rAR/strings.xml |   7 +
 app/src/main/res/values-fr/strings.xml     |   7 +
 app/src/main/res/values-gl/strings.xml     |  87 ++++++++
 app/src/main/res/values-ia/strings.xml     | 222 +++++++++++---------
 app/src/main/res/values-kk/strings.xml     |   7 +
 app/src/main/res/values-nb-rNO/strings.xml |   7 +
 app/src/main/res/values-nl/strings.xml     | 225 ++++++++++++---------
 app/src/main/res/values-ru/strings.xml     |   9 +-
 app/src/main/res/values-sk/strings.xml     |   7 +
 app/src/main/res/values-sl/strings.xml     |   5 +
 app/src/main/res/values-sq/strings.xml     | 224 +++++++++++---------
 app/src/main/res/values-vi/strings.xml     |   9 +-
 app/src/main/res/values-zh-rCN/strings.xml |   7 +
 app/src/main/res/values-zh-rTW/strings.xml |   9 +-
 15 files changed, 542 insertions(+), 292 deletions(-)

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index af7af27ea..c93fc22b4 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -2362,7 +2362,7 @@
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
     <string name="review_quality_check_contextual_onboarding_caption_4">Избирайки „Да, изпробвайте“ вие се съгласявате с %2$s на %1$s и %4$s на %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">декларация за поверителност</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">политика за личните данни</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Политика на поверителност</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index c7d503bd1..37c613a37 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -2494,6 +2494,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Traduciendo…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">¿Descargar idioma en modo de ahorro de datos (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opciones de traducción</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 39b7161c1..e45880b22 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -2502,6 +2502,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Traduction…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Télécharger la langue en mode d’économie de données (%1$s) ?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Options de traduction</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 2e4d402e5..0c6a0ead9 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1307,6 +1307,8 @@
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active for Android 14+ -->
     <string name="notification_erase_title_android_14">Pechar lapelas privadas?</string>
 
+    <string name="notification_erase_text_android_14">Toque ou pase o dedo nesta notificación para pechar as pestanas privadas.</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">Mercadotecnia</string>
 
@@ -1546,6 +1548,8 @@
     <string name="preference_enhanced_tracking_protection_custom_cookies_4">Todas as cookies (pode causar erros nos sitios web)</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
     <string name="preference_enhanced_tracking_protection_custom_cookies_5">Illar as cookies entre sitios</string>
+    <!-- Preference for Global Privacy Control for the custom privacy settings for Global Privacy Control. '&amp;' is replaced with the ampersand symbol: &-->
+    <string name="preference_enhanced_tracking_protection_custom_global_privacy_control">Dille aos sitios web que non compartan nin vendan datos</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content">Contido de rastrexo</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
@@ -1697,6 +1701,8 @@
     <string name="preferences_passwords_saved_logins_2">Contrasinais gardados</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Os inicios de sesión que garde ou sincronice co %s aparecerán aquí.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Os contrasinais que gardes ou sincronices con %s listaranse aquí. Todos os contrasinais que gardas están cifrados.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Obteña máis información sobre Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
@@ -1705,8 +1711,12 @@
     <string name="preferences_passwords_exceptions">Excepcións</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Aquí mostraranse os inicios de sesión e os contrasinais que non se garden.</string>
+    <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_empty_2">%s non gardará os contrasinais dos sitios que aparecen aquí.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Non se gardarán os inicios de sesión e os contrasinais para estes sitios.</string>
+    <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
+    <string name="preferences_passwords_exceptions_description_2">%s non gardará os contrasinais destes sitios.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Eliminar todas as excepcións</string>
     <!-- Hint for search box in logins list -->
@@ -1741,10 +1751,16 @@
     <string name="saved_login_hide_password">Agochar contrasinal</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquee para ver os seus inicios de sesión gardados</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
+    <string name="logins_biometric_prompt_message_2">Desbloquea para ver os teus contrasinais gardados</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Protexa os seus inicios de sesión e contrasinais</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title_2">Protexe os teus contrasinais gardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configure un padrón de bloqueo de dispositivo, PIN ou contrasinal para protexer os accesos e contrasinais gardados de que non sexan accedidos se outra persoa ten o seu dispositivo.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message_2">Configura un patrón de bloqueo do dispositivo, un PIN ou un contrasinal para protexer o acceso aos teus contrasinais gardados se outra persoa ten o teu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Máis tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1859,6 +1875,8 @@
     <string name="credit_cards_warning_dialog_title_2">Protexa os seus métodos de pago gardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configure un padrón de bloqueo de dispositivo, PIN ou contrasinal para evitar que outra persoa co seu dispositivo poida acceder a elas.</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message_3">Configura un patrón de bloqueo do dispositivo, un PIN ou un contrasinal para protexer o acceso aos teus métodos de pago gardados se outra persoa ten o teu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar agora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1867,6 +1885,8 @@
     <string name="credit_cards_biometric_prompt_message_pin">Desbloquear o dispositivo</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquee para empregar a información almacenada de tarxetas de crédito</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Desbloquea para usar os métodos de pago gardados</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Engadir enderezo</string>
     <!-- Title of the "Edit address" screen -->
@@ -2019,10 +2039,16 @@
     <string name="login_options_menu_2">Opcións de contrasinal</string>
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">O campo de texto editábel para o enderezo web do inicio de sesión.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3">O campo de texto editable para o enderezo do sitio web.</string>
     <!--  The editable text field for a login's username. -->
     <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">O campo de texto editábel para o nome de usuario do inicio de sesión.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3">O campo de texto editable para o nome de usuario.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">O campo de texto editábel para o contrasinal do inicio de sesión.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description_2">O campo de texto editable para o contrasinal.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Gardar os cambios para iniciar sesión.</string>
     <!--  The button description to save changes to an edited password. -->
@@ -2294,6 +2320,10 @@
     <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Ao seleccionar «Si, probalo», acepta %2$s e %3$s de %1$s de Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Ao seleccionar «Si, probalo», acepta o seguinte de %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Ao seleccionar &quot;Si, probalo&quot;, aceptas os %2$s de %1$s e os %4$s de %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Ao seleccionar &quot;Si, probalo&quot;, aceptas os %2$s de %1$s e os %4$s de %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">política de privacidade</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
@@ -2377,6 +2407,8 @@
     <string name="translations_bottom_sheet_title_translation_completed">Páxina traducida de %1$s a %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Probe as traducións privadas en %1$s</string>
+    <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
+    <string name="translations_bottom_sheet_info_message">Para a túa privacidade, as traducións nunca saen do teu dispositivo. Novos idiomas e melloras en breve! %1$s</string>
     <!-- Text that links to additional information about the Firefox translations feature. -->
     <string name="translations_bottom_sheet_info_message_learn_more">Máis información</string>
     <!-- Label for the dropdown to select which language to translate from on the translations dialog. Usually the translate from language selected will be the same as the page language. -->
@@ -2410,23 +2442,41 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Traducindo…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Descargar o idioma no modo de aforro de datos (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opcións de tradución</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to always offer or suggest translations when available. -->
     <string name="translation_option_bottom_sheet_always_translate">Ofrecer sempre a tradución</string>
+    <!-- Toggle switch label that allows a user to set if they would like a given language to automatically translate or not. The first parameter is the language name, for example, "Spanish". -->
+    <string name="translation_option_bottom_sheet_always_translate_in_language">Traduce sempre %1$s</string>
+    <!-- Toggle switch label that allows a user to set if they would like to never be offered a translation of the given language. The first parameter is the language name, for example, "Spanish". -->
+    <string name="translation_option_bottom_sheet_never_translate_in_language">Non traducir nunca %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Non traducir nunca este sitio</string>
     <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
     <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Sobrescribe todas as demais configuracións</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Anula as ofertas para traducir</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Configuración da tradución</string>
 
+    <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translation_option_bottom_sheet_about_translations">Acerca das traducións en %1$s</string>
+
     <!-- Translation settings dialog -->
     <!-- Title of the translation settings dialog that allows a user to set their preferred translation settings. -->
     <string name="translation_settings_toolbar_title">Traducións</string>
     <!-- Toggle switch label that indicates that the browser should signal or indicate when a translation is possible for any page. -->
     <string name="translation_settings_offer_to_translate">Ofrécese a traducir cando sexa posible</string>
+    <!-- Toggle switch label that indicates that downloading files required for translating is permitted when using data saver mode in Android. -->
+    <string name="translation_settings_always_download">Descarga sempre os idiomas no modo de aforro de datos</string>
     <!-- Section header text that begins the section of a list of different options the user may select to adjust their translation preferences. -->
     <string name="translation_settings_translation_preference">Preferencias de tradución</string>
     <!-- Button text for the button that will take the user to the automatic translations settings dialog. On the automatic translations settings dialog, the user can set if translations should occur automatically for a given language. -->
@@ -2440,11 +2490,29 @@
     <!-- Title of the automatic translation preference screen that will appear on the toolbar.-->
     <string name="automatic_translation_toolbar_title_preference">Tradución automática</string>
 
+    <!-- Screen header presenting the automatic translation preference feature. It will appear under the toolbar. -->
+    <string name="automatic_translation_header_preference">Selecciona un idioma para xestionar as preferencias de &quot;traducir sempre&quot; e &quot;nunca traducir&quot;.</string>
+
+    <!-- Automatic translation options preference screen -->
+    <!-- Preference option for offering to translate. Radio button title text.-->
+    <string name="automatic_translation_option_offer_to_translate_title_preference">Oferta para traducir (predeterminado)</string>
+    <!-- Preference option for offering to translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_offer_to_translate_summary_preference">%1$s ofrecerá traducir sitios neste idioma.</string>
     <!-- Preference option for always translate. Radio button title text. -->
     <string name="automatic_translation_option_always_translate_title_preference">Traduce sempre</string>
+    <!-- Preference option for always translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_always_translate_summary_preference">%1$s traducirá este idioma automaticamente cando se cargue a páxina.</string>
     <!-- Preference option for never translate. Radio button title text.-->
     <string name="automatic_translation_option_never_translate_title_preference">Non traducir nunca</string>
 
+    <!-- Preference option for never translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="automatic_translation_option_never_translate_summary_preference">%1$s nunca ofrecerá traducir sitios neste idioma.</string>
+
+    <!-- Never translate site preference screen -->
+    <!-- Title of the never translate site preference screen that will appear on the toolbar.-->
+    <string name="never_translate_site_toolbar_title_preference">Non traducir nunca estes sitios</string>
+    <!-- Screen header presenting the never translate site preference feature. It will appear under the toolbar. -->
+    <string name="never_translate_site_header_preference">Para engadir un sitio novo: visítao e selecciona &quot;Non traducir nunca este sitio&quot; no menú de tradución.</string>
     <!-- Content description (not visible, for screen readers etc.): For a never-translated site list item that is selected.
              The first parameter is web site url (for example:"wikipedia.com") -->
     <string name="never_translate_site_item_list_content_description_preference">Retirar %1$s</string>
@@ -2459,6 +2527,8 @@
     <!-- Download languages preference screen -->
     <!-- Title of the download languages preference screen toolbar.-->
     <string name="download_languages_toolbar_title_preference">Descargar idiomas</string>
+    <!-- Screen header presenting the download language preference feature. It will appear under the toolbar.The first parameter is "Learn More," a clickable text with a link. Talkback will append this to say "Double tap to open link to learn more". -->
+    <string name="download_languages_header_preference">Descarga idiomas completos para obter traducións máis rápidas e para traducir sen conexión. %1$s</string>
     <!-- Clickable text from the screen header that links to a website. -->
     <string name="download_languages_header_learn_more_preference">Máis información</string>
     <!-- The subhead of the download language preference screen will appear above the pivot language. -->
@@ -2486,11 +2556,28 @@
     The dialog will be presented when the user requests deletion of a language.
     The first parameter is the name of the language, for example, "Spanish" and the second parameter is the size in kilobytes or megabytes of the language file. -->
     <string name="delete_language_file_dialog_title">Eliminar %1$s (%2$s)?</string>
+    <!-- Additional information for the dialog used by the translations feature to confirm deleting a language. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="delete_language_file_dialog_message">Se eliminas este idioma, %1$s descargará idiomas parciais na túa caché mentres traduces.</string>
+    <!-- Title for the dialog used by the translations feature to confirm deleting all languages file.
+    The dialog will be presented when the user requests deletion of all languages file.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="delete_language_all_languages_file_dialog_title">Queres eliminar todos os idiomas (%1$s)?</string>
+    <!-- Additional information for the dialog used by the translations feature to confirm deleting all languages file. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="delete_language_all_languages_file_dialog_message">Se eliminas todos os idiomas, %1$s descargará linguas parciais na túa caché mentres traduces.</string>
     <!-- Button text on the dialog used by the translations feature to confirm deleting a language. -->
     <string name="delete_language_file_dialog_positive_button_text">Eliminar</string>
     <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
     <string name="delete_language_file_dialog_negative_button_text">Cancelar</string>
 
+    <!-- Title for the data saving mode warning dialog used by the translations feature.
+    This dialog will be presented when the user attempts to download a language or perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file.-->
+    <string name="download_language_file_dialog_title">Descargar mentres estás no modo de aforro de datos (%1$s)?</string>
+    <!-- Additional information for the data saving mode warning dialog used by the translations feature. This text explains the reason a download is required for a translation. -->
+    <string name="download_language_file_dialog_message_all_languages">Descargamos idiomas parciais na túa caché para manter as traducións privadas.</string>
+    <!-- Checkbox label text on the data saving mode warning dialog used by the translations feature. This checkbox allows users to ignore the data usage warnings. -->
+    <string name="download_language_file_dialog_checkbox_text">Descarga sempre no modo de aforro de datos</string>
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
     <string name="download_language_file_dialog_positive_button_text">Descargar</string>
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file and perform a translation. -->
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
index 0970b4b78..60e903034 100644
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@@ -257,6 +257,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Traducer le pagina</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Pagina traducite ab %1$s a %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Lingua seligite</string>
@@ -336,9 +341,15 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Aviso de confidentialitate de Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Lege nostre aviso de confidentialitate</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">A nos place mantener te secur</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Discoperi perque milliones ama Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Navigation secur con plus optiones</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Nostre navigator supportate per un organisation sin fin d lucro adjuta stoppar le companias de sequer secretemente tu movimentos circum le web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
@@ -699,9 +710,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Marcapaginas</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Credentiales</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Credentiales</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Contrasignos</string>
+    <string name="preferences_sync_logins_2">Contrasignos</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Schedas aperte</string>
     <!-- Preference for signing out -->
@@ -727,9 +738,9 @@
     <string name="default_device_name_2">%1$s sur %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Cartas de credito</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Cartas de credito</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Methodos de pagamento</string>
+    <string name="preferences_sync_credit_cards_2">Methodos de pagamento</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresses</string>
 
@@ -1707,14 +1718,14 @@
     <string name="add_to_homescreen_description_2">Tu pote facilemente adder iste sito web al Pagina initial de tu apparato pro haber accesso instantanee e navigar plus veloce con un experientia simile al app.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Credentiales e contrasignos
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Credentiales e contrasignos
 </string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Contrasignos</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Contrasignos</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Salvar credentiales e contrasignos</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Salvar credentiales e contrasignos</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Salvar contrasignos</string>
+    <string name="preferences_passwords_save_logins_2">Salvar contrasignos</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Demandar pro salvar</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1731,47 +1742,47 @@
     <string name="preferences_android_autofill_description">Plenar nomines de usator e contrasignos in altere apps sur tu apparato.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Adder credentiales</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Adder credentiales</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Adder contrasigno</string>
+    <string name="preferences_logins_add_login_2">Adder contrasigno</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Synchronisar credentiales</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synchronisar contrasignos</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Synchronisar credentiales</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Synchronisar contrasignos</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Synchronisar credentiales inter le apparatos</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Synchronisar credentiales inter le apparatos</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synchronisar contrasignos inter apparatos</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Synchronisar contrasignos inter apparatos</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Credentiales salvate</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Credentiales salvate</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Contrasignos salvate</string>
+    <string name="preferences_passwords_saved_logins_2">Contrasignos salvate</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Le credentiales que tu salva o synchronisa a in %s apparera hic.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Le credentiales que tu salva o synchronisa a in %s apparera hic.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Le contrasignos que tu salva o synchronisa in %s sera listate ci. Tote le contrasignos que tu salva es cryptate.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Le contrasignos que tu salva o synchronisa in %s sera listate ci. Tote le contrasignos que tu salva es cryptate.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Apprender plus re Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Apprender plus re Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Apprender plus re le synchronisation</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Apprender plus re le synchronisation</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Exceptiones</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Credentiales e contrasignos que non es salvate essera monstrate hic.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Credentiales e contrasignos que non es salvate essera monstrate hic.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s non salvara le password pro le sitos ci listate.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s non salvara le password pro le sitos ci listate.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Credentiales e contrasignos non sera salvate pro iste sitos.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Credentiales e contrasignos non sera salvate pro iste sitos.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s non salvara le contrasignos pro iste sitos.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s non salvara le contrasignos pro iste sitos.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Deler tote le exceptiones</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Cercar credentiales</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Cercar credentiales</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Cercar contrasignos</string>
+    <string name="preferences_passwords_saved_logins_search_2">Cercar contrasignos</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sito</string>
     <!-- The header for the username for a login -->
@@ -1799,17 +1810,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Celar contrasigno</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Disbloca pro vider tu credentiales salvate</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Disbloca pro vider tu credentiales salvate</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Disbloca pro vider tu contrasignos salvate</string>
+    <string name="logins_biometric_prompt_message_2">Disbloca pro vider tu contrasignos salvate</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Assecurar tu credentiales e contrasignos</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Assecurar tu credentiales e contrasignos</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Protege tu contrasignos salvate</string>
+    <string name="logins_warning_dialog_title_2">Protege tu contrasignos salvate</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu credentiales e contrasignos salvate de esser accedite, si alcuno altere ha tu apparato.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu credentiales e contrasignos salvate de esser accedite, si alcuno altere ha tu apparato.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu contrasignos de esser accedite, si alcuno altere ha tu apparato.</string>
+    <string name="logins_warning_dialog_message_2">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu contrasignos de esser accedite, si alcuno altere ha tu apparato.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Plus tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1827,10 +1838,10 @@
     <string name="saved_logins_sort_strategy_last_used">Ultimemente usate</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordinar menu de credentiales</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ordinar menu de credentiales</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Ordinar le menu del contrasignos</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Ordinar le menu del contrasignos</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1838,45 +1849,45 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adresses</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Cartas de credito</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Cartas de credito</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Methodos de pagamento</string>
+    <string name="preferences_credit_cards_2">Methodos de pagamento</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Gerer le cartas salvate</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Gerer le cartas salvate</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Salvar e compilar methodos de pagamento automaticamente</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Salvar e compilar methodos de pagamento automaticamente</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Datos es cryptate</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Datos es cryptate</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s crypta tote tu methodos de pagamento salvate</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s crypta tote tu methodos de pagamento salvate</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synchronisar cartas inter apparatos</string>
 
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Synchronisar cartas</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Adde un carta de credito</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Adde un carta de credito</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Adder carta</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Adder carta</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Gerer le cartas salvate</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Gerer le cartas salvate</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gerer le cartas</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Gerer le cartas</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adder adresse</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Gerer adresses</string>
 
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Salvar e autoplenar adresses</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Salvar e autoplenar adresses</string>
 
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Salvar e compilar automaticamente adresses</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Salvar e compilar automaticamente adresses</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Includer informationes como numeros, email e adresses de expedition</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Includer informationes como numeros, email e adresses de expedition</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Include numeros de telephono e adresses email</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Include numeros de telephono e adresses email</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Adder carta</string>
@@ -1897,9 +1908,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Deler carta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Desira tu vermente deler iste carta de credito?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Desira tu vermente deler iste carta de credito?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Deler carta?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Deler carta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Deler</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1913,24 +1924,24 @@
     <string name="credit_cards_saved_cards">Cartas salvate</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Insere un numero valide de carta de credito</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Insere un numero valide de carta de credito</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Insere un numero de carta valide</string>
+    <string name="credit_cards_number_validation_error_message_2">Insere un numero de carta valide</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Completa iste campo</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Completa iste campo</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Adde un nomine</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Adde un nomine</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Disbloca pro vider tu cartas salvate</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Protege tu carta de credito</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Protege tu carta de credito</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Protege tu methodo de pagamento salvate</string>
+    <string name="credit_cards_warning_dialog_title_2">Protege tu methodo de pagamento salvate</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu cartas de credito de esser accedite, si alcuno altere ha tu apparato.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu cartas de credito de esser accedite, si alcuno altere ha tu apparato.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu methodos de pagamento salvate de esser accedite, si alcun altere ha tu apparato.</string>
+    <string name="credit_cards_warning_dialog_message_3">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu methodos de pagamento salvate de esser accedite, si alcun altere ha tu apparato.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Implementar ora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1939,10 +1950,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Disbloca tu apparato</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Disbloca pro usar le informationes de carta de credito immagazinate</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Disbloca pro usar le informationes de carta de credito immagazinate</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Disblocar pro usar le methodo de pagamento salvate</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Disblocar pro usar le methodo de pagamento salvate</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adder adresse</string>
     <!-- Title of the "Edit address" screen -->
@@ -1950,11 +1961,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Gerer addresses</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Prenomine</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Prenomine</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Nomine intermedie</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Nomine intermedie</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Nomine de familia</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Nomine de familia</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nomine</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Adresse del strata</string>
     <!-- The header for the city of an address -->
@@ -1979,9 +1992,9 @@
     <string name="addressess_delete_address_button">Deler adresses</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Desira tu vermente deler iste adresses?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desira tu vermente deler iste adresses?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Deler iste adresses?</string>
+    <string name="addressess_confirm_dialog_message_2">Deler iste adresses?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Deler</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2081,50 +2094,50 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Rediger</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Desira tu vermente deler iste credentiales?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Desira tu vermente deler iste credentiales?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Desira tu vermente deler iste contrasigno?</string>
+    <string name="login_deletion_confirmation_2">Desira tu vermente deler iste contrasigno?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Deler</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Cancellar</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Optiones de apertura de session</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Optiones de apertura de session</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Optiones de contrasigno</string>
+    <string name="login_options_menu_2">Optiones de contrasigno</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Le campo de texto redigibile pro le adresse web del credentiales.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Le campo de texto redigibile pro le adresse web del credentiales.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Le campo de texto redigibile pro le adresse del sito web.</string>
+    <string name="saved_login_hostname_description_3">Le campo de texto redigibile pro le adresse del sito web.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Le campo de texto redigibile pro le nomine de usator del accesso.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Le campo de texto redigibile pro le nomine de usator del accesso.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Le campo de texto redigibile pro le nomine de usator.</string>
+    <string name="saved_login_username_description_3">Le campo de texto redigibile pro le nomine de usator.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Le campo de texto redigibile pro le contrasigno del credentiales.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Le campo de texto redigibile pro le contrasigno del credentiales.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Le campo de texto redigibile pro le contrasigno.</string>
+    <string name="saved_login_password_description_2">Le campo de texto redigibile pro le contrasigno.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Salvar cambiamentos a credentiales.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Salvar cambiamentos a credentiales.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Salvar le cambiamentos.</string>
+    <string name="save_changes_to_login_2">Salvar le cambiamentos.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Rediger</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Rediger</string>
 
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Modificar le contrasigno</string>
+    <string name="edit_2">Modificar le contrasigno</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Adder nove credential</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Adder nove credential</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Adder contrasigno</string>
+    <string name="add_login_2">Adder contrasigno</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Contrasigno requirite</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Contrasigno requirite</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Insere un contrasigno</string>
+    <string name="saved_login_password_required_2">Insere un contrasigno</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Nomine de usator necesse.</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Nomine de usator necesse.</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Insere un nomine de usator</string>
+    <string name="saved_login_username_required_2">Insere un nomine de usator</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Nomine de servitor necesse.</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2235,7 +2248,7 @@
     <string name="radio_preference_info_content_description">Clicca pro altere detalios</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Navigar</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Navigar</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Clauder</string>
@@ -2276,8 +2289,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Classification adjustate</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Recensiones non fidabile removite</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Basate sur recensiones fidabile</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Aspectos notabile ab recensiones recente</string>
@@ -2334,11 +2345,7 @@
     <string name="review_quality_check_product_availability_warning_body">Si tu videra que iste producto es retro in stock, reporta lo e nos laborara pro controlar le recensiones.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Reportar si le producto es in stock</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Controlante qualitate de recension</string>
 
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Controlante qualitate de recension</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Controlante qualitate de recension (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2384,13 +2391,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Pro saper plus</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Seligente “Si, prova lo” tu concorda con le %2$s e le %3$s de %1$s per Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Seligente “Si, prova lo” tu concorda con le %2$s e le %3$s de %1$s per Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Eligente “Si, essaya lo” tu concorda con le sequente ab %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Seligente “Si, prova lo” tu concorda con le %1$s’s %2$s e le  %4$s de %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Seligente “Si, prova lo” tu concorda con le %1$s’s %2$s e le  %4$s de %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">politica de confidentialitate</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">politica de confidentialitate</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Politica de confidentialitate</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">aviso de confidentialitate</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">terminos de uso</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2461,6 +2474,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Traducer iste pagina?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Pagina traducite ab %1$s a %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Tentar traductiones private in %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2473,6 +2490,8 @@
     <string name="translations_bottom_sheet_translate_to">Traducer in</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Non ora</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Monstrar original</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Facite</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2495,6 +2514,17 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Pro saper plus</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Traducente…</string>
+
+
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Discargar le lingua dum in modo sparnio de datos (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Optiones de traduction</string>
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index f3b52180b..6d75fe889 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -2469,6 +2469,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Аударуда…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Деректерді үнемдеу режимінде (%1$s) тілді жүктеп алу керек пе?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Аударма баптаулары</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index ad34c41c7..8e63ab505 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -2480,6 +2480,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Oversetter…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Last ned språk i datasparingsmodus (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Oversettelsesinnstillinger</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index bfd32fd02..62c3929c8 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -260,6 +260,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Pagina vertalen</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Pagina vertaald van het %1$s naar het %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Geselecteerde taal</string>
@@ -338,12 +343,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox-privacyverklaring</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Lees meer in onze privacyverklaring</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">We houden u graag veilig</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Ontdek waarom miljoenen zo gek zijn op Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Veilig surfen met meer keuzes</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Onze door een non-profitorganisatie gesteunde browser helpt voorkomen dat bedrijven u stiekem volgen op internet.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Meer dan 100 miljoen mensen beschermen hun privacy door een browser te kiezen die wordt ondersteund door een non-profitorganisatie.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Bekende trackers? Automatisch geblokkeerd. Extensies? Probeer ze alle 700. PDF’s? Door onze ingebouwde lezer zijn ze eenvoudig te beheren.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Onze door een non-profitorganisatie ondersteunde browser helpt voorkomen dat bedrijven u stiekem volgen op internet.\n\nMeer info in onze privacyverklaring.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -699,9 +714,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Bladwijzers</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Aanmeldingen</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Aanmeldingen</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Wachtwoorden</string>
+    <string name="preferences_sync_logins_2">Wachtwoorden</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Open tabbladen</string>
     <!-- Preference for signing out -->
@@ -727,9 +742,9 @@
     <string name="default_device_name_2">%1$s op %2$s  %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Creditcards</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Creditcards</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Betalingsmethoden</string>
+    <string name="preferences_sync_credit_cards_2">Betalingsmethoden</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adressen</string>
 
@@ -1675,13 +1690,13 @@
     <string name="add_to_homescreen_description_2">U kunt deze website eenvoudig aan het startscherm van uw apparaat toevoegen, om zo direct toegang te hebben en sneller te navigeren met een app-achtige ervaring.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Aanmeldingen en wachtwoorden</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Aanmeldingen en wachtwoorden</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Wachtwoorden</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Wachtwoorden</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Aanmeldingen en wachtwoorden opslaan</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Aanmeldingen en wachtwoorden opslaan</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Wachtwoorden opslaan</string>
+    <string name="preferences_passwords_save_logins_2">Wachtwoorden opslaan</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Vragen om op te slaan</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1696,47 +1711,47 @@
     <string name="preferences_android_autofill_description">Gebruikersnamen en wachtwoorden in andere apps op uw apparaat invullen.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Aanmelding toevoegen</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Aanmelding toevoegen</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Wachtwoord toevoegen</string>
+    <string name="preferences_logins_add_login_2">Wachtwoord toevoegen</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Aanmeldingen synchroniseren</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Wachtwoorden synchroniseren</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Aanmeldingen synchroniseren</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Wachtwoorden synchroniseren</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Aanmeldingen op apparaten synchroniseren</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Aanmeldingen op apparaten synchroniseren</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Wachtwoorden synchroniseren tussen apparaten</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Wachtwoorden synchroniseren tussen apparaten</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Opgeslagen aanmeldingen</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Opgeslagen aanmeldingen</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Opgeslagen wachtwoorden</string>
+    <string name="preferences_passwords_saved_logins_2">Opgeslagen wachtwoorden</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">De aanmeldingen die u opslaat of synchroniseert met %s worden hier getoond.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">De aanmeldingen die u opslaat of synchroniseert met %s worden hier getoond.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">De wachtwoorden die u opslaat of synchroniseert met %s zullen hier worden vermeld. Alle wachtwoorden die u opslaat, zijn versleuteld.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">De wachtwoorden die u opslaat of synchroniseert met %s zullen hier worden vermeld. Alle wachtwoorden die u opslaat, zijn versleuteld.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Meer info over Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Meer info over Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Meer info over synchronisatie</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Meer info over synchronisatie</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Uitzonderingen</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Niet-opgeslagen aanmeldingen en wachtwoorden worden hier weergegeven.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Niet-opgeslagen aanmeldingen en wachtwoorden worden hier weergegeven.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s zal geen wachtwoorden voor de hier vermelde websites opslaan.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s zal geen wachtwoorden voor de hier vermelde websites opslaan.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Aanmeldingen en wachtwoorden worden voor deze websites niet opgeslagen.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Aanmeldingen en wachtwoorden worden voor deze websites niet opgeslagen.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s zal geen wachtwoorden voor deze websites opslaan.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s zal geen wachtwoorden voor deze websites opslaan.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Alle uitzonderingen verwijderen</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Aanmeldingen zoeken</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Aanmeldingen zoeken</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Wachtwoorden zoeken</string>
+    <string name="preferences_passwords_saved_logins_search_2">Wachtwoorden zoeken</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Website</string>
     <!-- The header for the username for a login -->
@@ -1764,17 +1779,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Wachtwoord verbergen</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Ontgrendel om uw opgeslagen aanmeldingen te bekijken</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ontgrendel om uw opgeslagen aanmeldingen te bekijken</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Ontgrendel om uw opgeslagen wachtwoorden te bekijken</string>
+    <string name="logins_biometric_prompt_message_2">Ontgrendel om uw opgeslagen wachtwoorden te bekijken</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Beveilig uw aanmeldingen en wachtwoorden</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Beveilig uw aanmeldingen en wachtwoorden</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Beveilig uw opgeslagen wachtwoorden</string>
+    <string name="logins_warning_dialog_title_2">Beveilig uw opgeslagen wachtwoorden</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen aanmeldingen en wachtwoorden te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen aanmeldingen en wachtwoorden te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen wachtwoorden te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
+    <string name="logins_warning_dialog_message_2">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen wachtwoorden te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Later</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1791,10 +1806,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Laatst gebruikt</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menu Aanmeldingen sorteren</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Menu Aanmeldingen sorteren</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Wachtwoordmenu sorteren</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Wachtwoordmenu sorteren</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1802,43 +1817,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adressen</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Creditcards</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Creditcards</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Betalingsmethoden</string>
+    <string name="preferences_credit_cards_2">Betalingsmethoden</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Kaarten opslaan en automatisch invullen</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kaarten opslaan en automatisch invullen</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Betalingsmethoden opslaan en invullen</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Betalingsmethoden opslaan en invullen</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Gegevens zijn versleuteld</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Gegevens zijn versleuteld</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s versleutelt alle betalingsmethoden die u opslaat</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s versleutelt alle betalingsmethoden die u opslaat</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Kaarten synchroniseren tussen apparaten</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Kaarten synchroniseren</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Creditcard toevoegen</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Creditcard toevoegen</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Kaart toevoegen</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Kaart toevoegen</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Opgeslagen kaarten beheren</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Opgeslagen kaarten beheren</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Kaarten beheren</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Kaarten beheren</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adres toevoegen</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Adressen beheren</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Adressen opslaan en automatisch invullen</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Adressen opslaan en automatisch invullen</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Adressen opslaan en invullen</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Adressen opslaan en invullen</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Informatie zoals nummers, e-mail- en verzendadressen toevoegen</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Informatie zoals nummers, e-mail- en verzendadressen toevoegen</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Inclusief telefoonnummers en e-mailadressen</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Inclusief telefoonnummers en e-mailadressen</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Kaart toevoegen</string>
@@ -1859,9 +1874,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Kaart verwijderen</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Weet u zeker dat u deze creditcard wilt verwijderen?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Weet u zeker dat u deze creditcard wilt verwijderen?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Kaart verwijderen?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Kaart verwijderen?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Verwijderen</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1875,24 +1890,24 @@
     <string name="credit_cards_saved_cards">Opgeslagen kaarten</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Voer een geldig creditcardnummer in</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Voer een geldig creditcardnummer in</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Voer een geldig kaartnummer in</string>
+    <string name="credit_cards_number_validation_error_message_2">Voer een geldig kaartnummer in</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Vul dit veld in</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Vul dit veld in</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Voeg een naam toe</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Voeg een naam toe</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Ontgrendel om uw opgeslagen kaarten te bekijken</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Beveilig uw creditcards</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Beveilig uw creditcards</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Beveilig uw opgeslagen betalingsmethoden</string>
+    <string name="credit_cards_warning_dialog_title_2">Beveilig uw opgeslagen betalingsmethoden</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen creditcards te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen creditcards te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen betalingsmethoden te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
+    <string name="credit_cards_warning_dialog_message_3">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen betalingsmethoden te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Nu instellen</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1901,10 +1916,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Ontgrendel uw apparaat</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Ontgrendelen om opgeslagen creditcardgegevens te gebruiken</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ontgrendelen om opgeslagen creditcardgegevens te gebruiken</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Ontgrendel om opgeslagen betalingsmethoden te gebruiken</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Ontgrendel om opgeslagen betalingsmethoden te gebruiken</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adres toevoegen</string>
     <!-- Title of the "Edit address" screen -->
@@ -1912,11 +1927,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Adressen beheren</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Voornaam</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Voornaam</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Tweede naam</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Tweede naam</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Achternaam</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Achternaam</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Naam</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Adres</string>
     <!-- The header for the city of an address -->
@@ -1941,9 +1958,9 @@
     <string name="addressess_delete_address_button">Adres verwijderen</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Weet u zeker dat u dit adres wilt verwijderen?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Weet u zeker dat u dit adres wilt verwijderen?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Dit adres verwijderen?</string>
+    <string name="addressess_confirm_dialog_message_2">Dit adres verwijderen?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Verwijderen</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2041,49 +2058,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Bewerken</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Weet u zeker dat u deze aanmelding wilt verwijderen?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Weet u zeker dat u deze aanmelding wilt verwijderen?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Weet u zeker dat u dit wachtwoord wilt verwijderen?</string>
+    <string name="login_deletion_confirmation_2">Weet u zeker dat u dit wachtwoord wilt verwijderen?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Verwijderen</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Annuleren</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Aanmeldopties</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Aanmeldopties</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Wachtwoordopties</string>
+    <string name="login_options_menu_2">Wachtwoordopties</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Het bewerkbare tekstveld voor het webadres van de aanmelding.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Het bewerkbare tekstveld voor het webadres van de aanmelding.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Het bewerkbare tekstveld voor het websiteadres.</string>
+    <string name="saved_login_hostname_description_3">Het bewerkbare tekstveld voor het websiteadres.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Het bewerkbare tekstveld voor de gebruikersnaam van de aanmelding.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Het bewerkbare tekstveld voor de gebruikersnaam van de aanmelding.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Het bewerkbare tekstveld voor de gebruikersnaam.</string>
+    <string name="saved_login_username_description_3">Het bewerkbare tekstveld voor de gebruikersnaam.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Het bewerkbare tekstveld voor het wachtwoord van de aanmelding.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Het bewerkbare tekstveld voor het wachtwoord van de aanmelding.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Het bewerkbare tekstveld voor het wachtwoord.</string>
+    <string name="saved_login_password_description_2">Het bewerkbare tekstveld voor het wachtwoord.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Wijzigingen aan aanmelding opslaan.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Wijzigingen aan aanmelding opslaan.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Wijzigingen opslaan.</string>
+    <string name="save_changes_to_login_2">Wijzigingen opslaan.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Bewerken</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Bewerken</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Wachtwoord bewerken</string>
+    <string name="edit_2">Wachtwoord bewerken</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Nieuwe aanmelding toevoegen</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Nieuwe aanmelding toevoegen</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Wachtwoord toevoegen</string>
+    <string name="add_login_2">Wachtwoord toevoegen</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Wachtwoord vereist</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Wachtwoord vereist</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Vul een wachtwoord in</string>
+    <string name="saved_login_password_required_2">Vul een wachtwoord in</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Gebruikersnaam vereist</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Gebruikersnaam vereist</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Vul een gebruikersnaam in</string>
+    <string name="saved_login_username_required_2">Vul een gebruikersnaam in</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hostnaam vereist</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2196,7 +2213,7 @@
     <string name="radio_preference_info_content_description">Klik voor meer details</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Omhoog</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Omhoog</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Sluiten</string>
@@ -2237,8 +2254,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Aangepaste waardering</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Onbetrouwbare beoordelingen verwijderd</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Gebaseerd op betrouwbare beoordelingen</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Hoogtepunten uit recente beoordelingen</string>
@@ -2294,10 +2309,6 @@
     <string name="review_quality_check_product_availability_warning_body">Als u ziet dat dit product weer op voorraad is, meld dit dan aan ons en wij zullen eraan werken om de beoordelingen te controleren.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Rapporteren dat product op voorraad is</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Beoordelingskwaliteit controleren</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Beoordelingskwaliteit controleren</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Beoordelingskwaliteit controleren (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2343,13 +2354,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Meer info</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Door ‘Ja, proberen’ te selecteren, gaat u akkoord met het %2$s en de %3$s van %1$s door Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Door ‘Ja, proberen’ te selecteren, gaat u akkoord met het %2$s en de %3$s van %1$s door Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Door ‘Ja, proberen’ te selecteren, gaat u akkoord met het volgende van %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Door ‘Ja, proberen’ te selecteren, gaat u akkoord met de %2$s van %1$s en de %4$s van %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Door ‘Ja, proberen’ te selecteren, gaat u akkoord met de %2$s van %1$s en de %4$s van %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">privacybeleid</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">privacybeleid</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Privacybeleid</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">privacyverklaring</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">gebruiksvoorwaarden</string>
 
@@ -2423,6 +2440,10 @@
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Deze pagina vertalen?</string>
 
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Pagina vertaald van het %1$s naar het %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Probeer privévertalingen in %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2435,6 +2456,8 @@
     <string name="translations_bottom_sheet_translate_to">Vertalen naar het</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Niet nu</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Origineel tonen</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Gereed</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2457,6 +2480,16 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Meer info</string>
 
+
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Vertalen…</string>
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Taal downloaden in gegevensbesparingsmodus (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Vertaalopties</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index dd9f74980..7d854994e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -346,7 +346,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Уведомление о конфиденциальности Firefox</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Узнайте больше в нашем уведомлении о конфиденциальности</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Узнайте больше в нашем уведомлении о конфиденциальности</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Нам нравится обеспечивать вашу безопасность</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2497,6 +2497,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Перевод…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Загрузить язык в режиме сохранения трафика (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Настройки перевода</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 6fe0c6e8b..be463f672 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -2480,6 +2480,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Prebieha preklad…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Stiahnuť jazyk v režime šetrenia dát (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Nastavenia prekladov</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 0197a251f..9a6511ed1 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -344,6 +344,10 @@
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Naš neprofitni brskalnik preprečuje podjetjem, da bi vas skrivaj spremljala po spletu.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Več kot 100 milijonov ljudi ščiti svojo zasebnost z izbiro brskalnika, ki ga razvija neprofitna organizacija.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Znani sledilci? Samodejno blokirani. Razširitve? Preskusite vseh 700. PDF-ji? Naš vgrajeni bralnik omogoča enostavno pregledovanje.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Naš neprofitni brskalnik pomaga podjetjem preprečiti, da bi vam na skrivaj sledila po spletu.\n\nVeč o tem v našem pravilniku o zasebnosti.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -2441,6 +2445,7 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Več o tem</string>
 
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Možnosti prevajanja</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 84f717932..3ea61134b 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -253,6 +253,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Përktheje faqen</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Faqe e përkthyer nga %1$s në %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Gjuha e përzgjedhur</string>
@@ -328,12 +333,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Shënim mbi privatësinë në Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Mësoni më tepër te shënimi ynë mbi privatësinë</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Duam fort t’ju mbajmë të parrezik</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Zbuloni pse e duan Firefox-in miliona vetë</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Shfletim i parrezik, me më tepër zgjedhje</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Shfletuesi ynë, me entin jofitimprurës nga pas, ndihmon të ndalen shoqëri t’ju ndjekin fshehtazi nëpër internet.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Më tepër se 100 milionë vetëm e mbrojnë privatësinë e tyre duke zgjedhur një shfletues që ka nga pas një ent jofitimprurës.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Gjurmues të ditur? Të bllokuar automatikisht. Zgjerime? Provojini krejt të 700-ët. PDF? Lexuesi ynë i brendshëm i bën të administrohen me lehtësi.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Shfletuesi ynë, me entin jofitimprurës nga pas, ndihmon të ndalen shoqëri t’ju ndjekin fshehtazi nëpër internet.\n\nMësoni më tepër te shënimi ynë mbi privatësinë.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -690,9 +705,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Faqerojtës</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Kredenciale Hyrjesh</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Kredenciale Hyrjesh</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Fjalëkalime</string>
+    <string name="preferences_sync_logins_2">Fjalëkalime</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Skeda të hapura</string>
     <!-- Preference for signing out -->
@@ -719,9 +734,9 @@
     <string name="default_device_name_2">%1$s në %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Karta krediti</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Karta krediti</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Metoda pagesash</string>
+    <string name="preferences_sync_credit_cards_2">Metoda pagesash</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresa</string>
 
@@ -1661,13 +1676,13 @@
     <string name="add_to_homescreen_description_2">Këtë sajt mund ta shtoni lehtë te skena Kreu e pajisjes tuaj, që ta hapni në çast dhe të shfletoni më shpejt, si të ish aplikacion.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Kredenciale hyrjesh dhe fjalëkalime</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Kredenciale hyrjesh dhe fjalëkalime</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Fjalëkalime</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Fjalëkalime</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Ruaj kredenciale hyrjesh dhe fjalëkalime</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Ruaj kredenciale hyrjesh dhe fjalëkalime</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Ruani fjalëkalime</string>
+    <string name="preferences_passwords_save_logins_2">Ruani fjalëkalime</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Pyet të ruhet a jo</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1683,47 +1698,47 @@
     <!-- Description for the preference for autofilling logins from Fenix in other apps (e.g. autofilling the Twitter app) -->
     <string name="preferences_android_autofill_description">Plotësoni emra përdoruesish dhe fjalëkalime në aplikacione të tjera në pajisjen tuaj.</string>
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Shtoni kredenciale hyrjeje</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Shtoni kredenciale hyrjeje</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Shtoni fjalëkalim</string>
+    <string name="preferences_logins_add_login_2">Shtoni fjalëkalim</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Njëkohëso kredenciale hyrjeje</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Njëkohësoni fjalëkalime</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Njëkohëso kredenciale hyrjeje</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Njëkohësoni fjalëkalime</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Njëkohëso kredenciale hyrjesh nëpër pajisje</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Njëkohëso kredenciale hyrjesh nëpër pajisje</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Njëkohësoni fjalëkalime mes pajisjesh</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Njëkohësoni fjalëkalime mes pajisjesh</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Kredenciale hyrjesh të ruajtur</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Kredenciale hyrjesh të ruajtur</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Fjalëkalime të ruajtur</string>
+    <string name="preferences_passwords_saved_logins_2">Fjalëkalime të ruajtur</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Këtu do të shfaqen kredencialet e hyrjeve që ruani ose njëkohësoni në %s.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Këtu do të shfaqen kredencialet e hyrjeve që ruani ose njëkohësoni në %s.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Këtu do të shfaqen fjalëkalimet që ruani, ose njëkohësoni në %s. Krejt fjalëkalimet që ruani, fshehtëzohen.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Këtu do të shfaqen fjalëkalimet që ruani, ose njëkohësoni në %s. Krejt fjalëkalimet që ruani, fshehtëzohen.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Mësoni më tepër mbi Sync-un.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Mësoni më tepër mbi Sync-un.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Mësoni më tepër mbi njëkohësimin</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Mësoni më tepër mbi njëkohësimin</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Përjashtime</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Këtu do të shfaqen kredenciale hyrjesh dhe fjalëkalime që nuk janë ruajtur.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Këtu do të shfaqen kredenciale hyrjesh dhe fjalëkalime që nuk janë ruajtur.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s s’do të ruajë fjalëkalime për sajte të radhitur këtu.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s s’do të ruajë fjalëkalime për sajte të radhitur këtu.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Për këto sajte s’do të ruhen kredenciale hyrjesh dhe fjalëkalime.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Për këto sajte s’do të ruhen kredenciale hyrjesh dhe fjalëkalime.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s s’do të ruajë fjalëkalime për këta sajte.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s s’do të ruajë fjalëkalime për këta sajte.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Fshi krejt përjashtimet</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Kërkoni te kredenciale hyrjesh</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Kërkoni te kredenciale hyrjesh</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Kërko te fjalëkalimet</string>
+    <string name="preferences_passwords_saved_logins_search_2">Kërko te fjalëkalimet</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sajt</string>
     <!-- The header for the username for a login -->
@@ -1751,17 +1766,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Fshihe fjalëkalimin</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Që të shihni kredenciale tuajt hyrjesh të ruajtur, shkyçeni</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Që të shihni kredenciale tuajt hyrjesh të ruajtur, shkyçeni</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Që të shihni fjalëkalimet tuaj të ruajtura, shkyçeni</string>
+    <string name="logins_biometric_prompt_message_2">Që të shihni fjalëkalimet tuaj të ruajtura, shkyçeni</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Siguroni kredenciale hyrjesh dhe fjalëkalime tuajt</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Siguroni kredenciale hyrjesh dhe fjalëkalime tuajt</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Siguroni fjalëkalimet tuaj të ruajtur</string>
+    <string name="logins_warning_dialog_title_2">Siguroni fjalëkalimet tuaj të ruajtur</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur nga hyrja në to kredencialet e hyrjes dhe fjalëkalimet tuaj të ruajtur, nëse pajisjen tuaj e ka dikush tjetër.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur nga hyrja në to kredencialet e hyrjes dhe fjalëkalimet tuaj të ruajtur, nëse pajisjen tuaj e ka dikush tjetër.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur prej hyrjes në to fjalëkalimet tuaj të ruajtur, nëse pajisjen tuaj e ka dikush tjetër.</string>
+    <string name="logins_warning_dialog_message_2">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur prej hyrjes në to fjalëkalimet tuaj të ruajtur, nëse pajisjen tuaj e ka dikush tjetër.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Më vonë</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1779,10 +1794,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Përdorur së fundi</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Renditni menu kredencialesh</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Renditni menu kredencialesh</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu renditjeje fjalëkalimesh</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menu renditjeje fjalëkalimesh</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1790,43 +1805,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adresa</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Karta krediti</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Karta krediti</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Metoda pagesash</string>
+    <string name="preferences_credit_cards_2">Metoda pagesash</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Ruaj dhe plotëso vetvetiu të dhëna kartash</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Ruaj dhe plotëso vetvetiu të dhëna kartash</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Ruaj dhe plotëso metoda pagesash</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Ruaj dhe plotëso metoda pagesash</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Të dhënat janë të fshehtëzuara</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Të dhënat janë të fshehtëzuara</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s fshehtëzon krejt metodat e pagesave që ruani</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s fshehtëzon krejt metodat e pagesave që ruani</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Njëkohëso të dhëna kartash mes pajisjesh</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Njëkohëso karta</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Shtoni kartë krediti</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Shtoni kartë krediti</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Shtoni kartë</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Shtoni kartë</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Administroni karta të ruajtura</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Administroni karta të ruajtura</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Administroni karta</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Administroni karta</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Shtoni adresë</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Administroni adresa</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Ruaj dhe vetëplotëso adresa</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Ruaj dhe vetëplotëso adresa</string>
 
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Ruaj dhe vetëplotëso adresa</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Ruaj dhe vetëplotëso adresa</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Përfshini hollësi të tilla si numra, email dhe adresa dërgimi</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Përfshini hollësi të tilla si numra, email dhe adresa dërgimi</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Përfshin numra telefonash dhe adresa email</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Përfshin numra telefonash dhe adresa email</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Shtoni kartë</string>
@@ -1847,9 +1862,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Fshije kartën</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Jeni i sigurt se doni të fshihet kjo kartë krediti?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Jeni i sigurt se doni të fshihet kjo kartë krediti?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Të fshihet karta?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Të fshihet karta?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Fshije</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1862,24 +1877,24 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Karta të ruajtura</string>
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Ju lutemi, jepni një numër të vlefshëm karte krediti</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ju lutemi, jepni një numër të vlefshëm karte krediti</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Jepni një numër karte të vlefshme</string>
+    <string name="credit_cards_number_validation_error_message_2">Jepni një numër karte të vlefshme</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Ju lutemi, plotësojeni këtë fushë</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ju lutemi, plotësojeni këtë fushë</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Shtoni emër</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Shtoni emër</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Që të shihni kartat tuaja të ruajtura, shkyçeni</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Siguroni kartat tuaja të kreditit</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Siguroni kartat tuaja të kreditit</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Siguroni metodat tuaja të ruajtura të pagesave</string>
+    <string name="credit_cards_warning_dialog_title_2">Siguroni metodat tuaja të ruajtura të pagesave</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur nga hyrja në to kartat tuaja kreditit të ruajturar, nëse pajisjen tuaj e ka dikush tjetër.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur nga hyrja në to kartat tuaja kreditit të ruajturar, nëse pajisjen tuaj e ka dikush tjetër.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur prej hyrjes në to hollësitë e ruajtura për metodat tuaja të pagesave, nëse pajisjen tuaj e ka dikush tjetër.</string>
+    <string name="credit_cards_warning_dialog_message_3">Ujdisni një rregullsi, PIN, ose fjalëkalim kyçjeje pajisjeje për të mbrojtur prej hyrjes në to hollësitë e ruajtura për metodat tuaja të pagesave, nëse pajisjen tuaj e ka dikush tjetër.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Ujdiseni tani</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1887,10 +1902,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Shkyçni pajisjen tuaj</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Që të përdorni të dhëna karte krediti të depozituara, shkyçeni</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Që të përdorni të dhëna karte krediti të depozituara, shkyçeni</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Që të përdorni metoda të ruajtura pagesash, shkyçeni</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Që të përdorni metoda të ruajtura pagesash, shkyçeni</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Shtoni adresë</string>
     <!-- Title of the "Edit address" screen -->
@@ -1898,11 +1913,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Administroni adresa</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Emër</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Emër</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Emër i Mesit</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Emër i Mesit</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Mbiemër</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Mbiemër</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Emër</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Rrugë</string>
     <!-- The header for the city of an address -->
@@ -1926,9 +1943,9 @@
     <!-- The text for the "Delete address" button for deleting an address -->
     <string name="addressess_delete_address_button">Përzgjidhni adresë</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Jeni i sigurt se doni të fshihet kjo adresë?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Jeni i sigurt se doni të fshihet kjo adresë?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Të fshihet kjo adresë?</string>
+    <string name="addressess_confirm_dialog_message_2">Të fshihet kjo adresë?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Fshije</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2026,50 +2043,50 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Përpunoni</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Jeni i sigurt se doni të fshihen këto kredenciale hyrjeje?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Jeni i sigurt se doni të fshihen këto kredenciale hyrjeje?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Jeni i sigurt se doni të fshihet ky fjalëkalim?</string>
+    <string name="login_deletion_confirmation_2">Jeni i sigurt se doni të fshihet ky fjalëkalim?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Fshije</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Anuloje</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Mundësi hyrjesh</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Mundësi hyrjesh</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Mundësi fjalëkalimesh</string>
+    <string name="login_options_menu_2">Mundësi fjalëkalimesh</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Fusha e përpunueshme e teksteve për adresën web të kredencialeve të hyrjes.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Fusha e përpunueshme e teksteve për adresën web të kredencialeve të hyrjes.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Fusha e përpunueshme e teksteve për adresën e sajtit.</string>
+    <string name="saved_login_hostname_description_3">Fusha e përpunueshme e teksteve për adresën e sajtit.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Fusha e përpunueshme e teksteve për emrin e përdoruesit të kredencialeve të hyrjes.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Fusha e përpunueshme e teksteve për emrin e përdoruesit të kredencialeve të hyrjes.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Fusha e përpunueshme e teksteve për emrin e përdoruesit.</string>
+    <string name="saved_login_username_description_3">Fusha e përpunueshme e teksteve për emrin e përdoruesit.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Fusha e përpunueshme e teksteve për fjalëkalimin e kredencialeve të hyrjes.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Fusha e përpunueshme e teksteve për fjalëkalimin e kredencialeve të hyrjes.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Fusha e përpunueshme e teksteve për fjalëkalimin.</string>
+    <string name="saved_login_password_description_2">Fusha e përpunueshme e teksteve për fjalëkalimin.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Ruani ndryshimet te kredenciale hyrjesh.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Ruani ndryshimet te kredenciale hyrjesh.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Ruaji ndryshimet.</string>
+    <string name="save_changes_to_login_2">Ruaji ndryshimet.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Përpunoni</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Përpunoni</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Përpunoni fjalëkalimin</string>
+    <string name="edit_2">Përpunoni fjalëkalimin</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Shtoni kredenciale hyrjeje të re</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Shtoni kredenciale hyrjeje të re</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Shtoni fjalëkalim</string>
+    <string name="add_login_2">Shtoni fjalëkalim</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Lypset fjalëkalim</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Lypset fjalëkalim</string>
 
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Jepni një fjalëkalim</string>
+    <string name="saved_login_password_required_2">Jepni një fjalëkalim</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Emri i përdoruesit është i domosdoshëm</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Emri i përdoruesit është i domosdoshëm</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Jepni emër përdoruesi</string>
+    <string name="saved_login_username_required_2">Jepni emër përdoruesi</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Lypset strehëemër</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2181,7 +2198,7 @@
     <string name="radio_preference_info_content_description">Klikoni për më tepër hollësi</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Lëvizni për sipër</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Lëvizni për sipër</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Mbylle</string>
@@ -2222,8 +2239,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Vlerësim i rregulluar</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">U hoqën shqyrtime jo të besueshme</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Bazuar në shqyrtime të besueshme</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Gjëra në pah nga shqyrtimet së fundi</string>
@@ -2280,10 +2295,6 @@
     <string name="review_quality_check_product_availability_warning_body">Nëse e shihni sërish në stok këtë produkt, raportojeni dhe do të merremi me kontrollin e shqyrtimeve.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Njoftoni se për produktin ka prapë stok</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Kontroll cilësie shqyrtimesh</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Po kontrollohet cilësi shqyrtimesh</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Po kontrollohet cilësi shqyrtimesh (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2329,13 +2340,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Mësoni më tepër</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Duke përzgjedhur “Po, Provojeni”, pajtoheni me %1$s nga %2$s dhe %3$s të Mozilla-s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Duke përzgjedhur “Po, Provojeni”, pajtoheni me %1$s nga %2$s dhe %3$s të Mozilla-s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Duke përzgjedhur “Po, provojeni”, pajtoheni me sa vijon prej %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Duke përzgjedhur “Po, provojeni”, pajtoheni me %2$s e %1$s  dhe %4$s të %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Duke përzgjedhur “Po, provojeni”, pajtoheni me %2$s e %1$s  dhe %4$s të %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">rregulla privatësie</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">rregulla privatësie</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Rregulla privatësie</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">shënim privatësie</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">kushte përdorimi</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2407,6 +2424,10 @@
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Të përkthehet kjo faqe?</string>
 
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Faqe e përkthyer nga %1$s në %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Provoni përkthime private në %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2419,6 +2440,8 @@
     <string name="translations_bottom_sheet_translate_to">Përkthe në</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Jo tani</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Shfaq origjinalin</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">U bë</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2441,6 +2464,15 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Mësoni më tepër</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Po përkthehet…</string>
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Të shkarkohet nën mënyrën ruajtje të dhënash (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Mundësi Përkthimi</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 4dcf33075..4d4708141 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -336,7 +336,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Thông báo về quyền riêng tư Firefox</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Tìm hiểu thêm trong thông báo bảo mật của chúng tôi</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Tìm hiểu thêm trong thông báo bảo mật của chúng tôi</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Chúng tôi thích giữ an toàn cho bạn</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2458,6 +2458,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Đang dịch…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Tải xuống ngôn ngữ ở chế độ tiết kiệm dữ liệu (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Tuỳ chọn dịch</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e2d55dd2f..6dec4b7be 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2530,6 +2530,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">正在翻译…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">确定在流量节省模式开启时下载吗（%1$s）？</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">翻译设置</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 93bc63e62..e15582e6e 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -343,7 +343,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox 隱私權公告</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">可以到我們的隱私權公告了解更多資訊</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">可以到我們的隱私權公告了解更多資訊</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">我們希望確保您上網安全</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2501,6 +2501,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">翻譯中…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">裝置處於資料節省模式時，也下載翻譯語言檔（%1$s）嗎？</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">翻譯選項</string>

From c8aba76bae82269b8e9898dcbbb547ee7de25d19 Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Mon, 4 Mar 2024 16:03:55 -0500
Subject: [PATCH 205/222] Bug 1875668 - Bypass cache when intercepting site in
 desktop mode

(cherry picked from commit 775987289cb212ce0ef6cb843cc6f6954dcb9c5b)
---
 .../fenix/components/UrlRequestInterceptor.kt | 21 ++++++++++++++----
 .../components/UrlRequestInterceptorTest.kt   | 22 +++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/UrlRequestInterceptor.kt b/app/src/main/java/org/mozilla/fenix/components/UrlRequestInterceptor.kt
index 74e270f70..0c113755b 100644
--- a/app/src/main/java/org/mozilla/fenix/components/UrlRequestInterceptor.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/UrlRequestInterceptor.kt
@@ -8,6 +8,7 @@ import androidx.annotation.VisibleForTesting
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.EngineSession.LoadUrlFlags
 import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.ALLOW_ADDITIONAL_HEADERS
+import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.BYPASS_CACHE
 import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE
 import mozilla.components.concept.engine.request.RequestInterceptor
 
@@ -58,12 +59,24 @@ class UrlRequestInterceptor(private val isDeviceRamAboveThreshold: Boolean) : Re
             return null
         }
 
-        return RequestInterceptor.InterceptionResponse.Url(
-            url = uri,
-            flags = LoadUrlFlags.select(
+        // This is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1875668
+        // Remove this by implementing https://bugzilla.mozilla.org/show_bug.cgi?id=1883496
+        val loadUrlFlags = if (uri.endsWith("#ip=1", true)) {
+            LoadUrlFlags.select(
+                LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE,
+                ALLOW_ADDITIONAL_HEADERS,
+                BYPASS_CACHE,
+            )
+        } else {
+            LoadUrlFlags.select(
                 LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE,
                 ALLOW_ADDITIONAL_HEADERS,
-            ),
+            )
+        }
+
+        return RequestInterceptor.InterceptionResponse.Url(
+            url = uri,
+            flags = loadUrlFlags,
             additionalHeaders = getAdditionalHeaders(isDeviceRamAboveThreshold),
         )
     }
diff --git a/app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt b/app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt
index 61edbff0a..a53dde2d8 100644
--- a/app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt
@@ -8,6 +8,7 @@ import io.mockk.mockk
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.EngineSession.LoadUrlFlags
 import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.ALLOW_ADDITIONAL_HEADERS
+import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.BYPASS_CACHE
 import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE
 import mozilla.components.concept.engine.request.RequestInterceptor
 import org.junit.Assert.assertEquals
@@ -147,6 +148,27 @@ class UrlRequestInterceptorTest {
         )
     }
 
+    @Test
+    fun `WHEN a Google request end in #ip=1 is loaded THEN request bypass cache`() {
+        val uri = "https://www.google.com/search?q=test&ie=utf-8#ip=1"
+        assertEquals(
+            RequestInterceptor.InterceptionResponse.Url(
+                url = uri,
+                flags = LoadUrlFlags.select(
+                    BYPASS_CACHE,
+                    LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE,
+                    ALLOW_ADDITIONAL_HEADERS,
+                ),
+                additionalHeaders = mapOf(
+                    "X-Search-Subdivision" to "0",
+                ),
+            ),
+            getUrlRequestInterceptor().onLoadRequest(
+                uri = uri,
+            ),
+        )
+    }
+
     @Test
     fun `WHEN a Google search request is loaded THEN request is intercepted`() {
         val uri = "https://www.google.com/search?q=blue"

From d4ccb577a6f1d21fbabb20810ccc2cf285cda536 Mon Sep 17 00:00:00 2001
From: JohanLorenzo <JohanLorenzo@users.noreply.github.com>
Date: Wed, 6 Mar 2024 18:03:01 +0000
Subject: [PATCH 206/222] Update Fenix initial_experiments.json based on the
 current first-run experiments in experimenter

(cherry picked from commit 3d4d1ebe17cd367299c82e47566e57665e6eefa5)
---
 app/src/main/res/raw/initial_experiments.json | 169 ------------------
 1 file changed, 169 deletions(-)

diff --git a/app/src/main/res/raw/initial_experiments.json b/app/src/main/res/raw/initial_experiments.json
index 1d486af1d..29a20bc5f 100644
--- a/app/src/main/res/raw/initial_experiments.json
+++ b/app/src/main/res/raw/initial_experiments.json
@@ -220,175 +220,6 @@
       "localizations": null,
       "locales": null,
       "publishedDate": "2024-02-01T19:06:38.368231Z"
-    },
-    {
-      "schemaVersion": "1.12.0",
-      "slug": "beta-fx-122-android-set-to-default-notifications-timing-experiment",
-      "id": "beta-fx-122-android-set-to-default-notifications-timing-experiment",
-      "arguments": {},
-      "application": "org.mozilla.firefox",
-      "appName": "fenix",
-      "appId": "org.mozilla.firefox",
-      "channel": "release",
-      "userFacingName": "Fx 122 Android set to default notifications timing experiment",
-      "userFacingDescription": "Timing test for the set to default message on Firefox for Android (Fenix).",
-      "isEnrollmentPaused": true,
-      "isRollout": false,
-      "bucketConfig": {
-        "randomizationUnit": "nimbus_id",
-        "namespace": "fenix-messaging-release-19",
-        "start": 0,
-        "count": 10000,
-        "total": 10000
-      },
-      "featureIds": [
-        "messaging"
-      ],
-      "probeSets": [],
-      "outcomes": [
-        {
-          "slug": "default-browser",
-          "priority": "primary"
-        }
-      ],
-      "branches": [
-        {
-          "slug": "control",
-          "ratio": 1,
-          "feature": {
-            "featureId": "this-is-included-for-mobile-pre-96-support",
-            "enabled": false,
-            "value": {}
-          },
-          "features": [
-            {
-              "featureId": "messaging",
-              "enabled": true,
-              "value": {
-                "messages": {
-                  "{experiment}-en": {
-                    "is-control": true,
-                    "surface": "notification",
-                    "style": "NOTIFICATION",
-                    "action": "MAKE_DEFAULT_BROWSER",
-                    "trigger": [
-                      "I_AM_NOT_DEFAULT_BROWSER"
-                    ],
-                    "experiment": "{experiment}"
-                  }
-                }
-              }
-            }
-          ]
-        },
-        {
-          "slug": "treatment-a",
-          "ratio": 1,
-          "feature": {
-            "featureId": "this-is-included-for-mobile-pre-96-support",
-            "enabled": false,
-            "value": {}
-          },
-          "features": [
-            {
-              "featureId": "messaging",
-              "enabled": true,
-              "value": {
-                "messages": {
-                  "{experiment}-en": {
-                    "title": "Firefox is Fast and Private",
-                    "text": "Make Firefox your default browser",
-                    "surface": "notification",
-                    "style": "NOTIFICATION",
-                    "action": "MAKE_DEFAULT_BROWSER",
-                    "trigger": [
-                      "DAY_1_AFTER_INSTALL",
-                      "I_AM_NOT_DEFAULT_BROWSER"
-                    ],
-                    "experiment": "{experiment}"
-                  }
-                }
-              }
-            }
-          ]
-        },
-        {
-          "slug": "treatment-b",
-          "ratio": 1,
-          "feature": {
-            "featureId": "this-is-included-for-mobile-pre-96-support",
-            "enabled": false,
-            "value": {}
-          },
-          "features": [
-            {
-              "featureId": "messaging",
-              "enabled": true,
-              "value": {
-                "messages": {
-                  "{experiment}-en": {
-                    "title": "Firefox is Fast and Private",
-                    "text": "Make Firefox your default browser",
-                    "surface": "notification",
-                    "style": "NOTIFICATION",
-                    "action": "MAKE_DEFAULT_BROWSER",
-                    "trigger": [
-                      "DAY_3_AFTER_INSTALL",
-                      "I_AM_NOT_DEFAULT_BROWSER"
-                    ],
-                    "experiment": "{experiment}"
-                  }
-                }
-              }
-            }
-          ]
-        },
-        {
-          "slug": "treatment-c",
-          "ratio": 1,
-          "feature": {
-            "featureId": "this-is-included-for-mobile-pre-96-support",
-            "enabled": false,
-            "value": {}
-          },
-          "features": [
-            {
-              "featureId": "messaging",
-              "enabled": true,
-              "value": {
-                "messages": {
-                  "{experiment}-en": {
-                    "title": "Firefox is Fast and Private",
-                    "text": "Make Firefox your default browser",
-                    "surface": "notification",
-                    "style": "NOTIFICATION",
-                    "action": "MAKE_DEFAULT_BROWSER",
-                    "trigger": [
-                      "DAY_6_AFTER_INSTALL",
-                      "I_AM_NOT_DEFAULT_BROWSER"
-                    ],
-                    "experiment": "{experiment}"
-                  }
-                },
-                "triggers": {
-                  "DAY_6_AFTER_INSTALL": "days_since_install == 6"
-                }
-              }
-            }
-          ]
-        }
-      ],
-      "targeting": "((is_already_enrolled) || ((isFirstRun == 'true') && (app_version|versionCompare('122.!') >= 0) && (language in ['en'])))",
-      "startDate": "2024-01-23",
-      "enrollmentEndDate": "2024-02-14",
-      "endDate": null,
-      "proposedDuration": 43,
-      "proposedEnrollment": 14,
-      "referenceBranch": "control",
-      "featureValidationOptOut": false,
-      "localizations": null,
-      "locales": null,
-      "publishedDate": null
     }
   ]
 }

From 64bec401dc4dcfde8aa87ea74c64e58109957fbb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 7 Mar 2024 02:04:56 +0000
Subject: [PATCH 207/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-da/strings.xml  |  36 +++
 app/src/main/res/values-fi/strings.xml  |   7 +
 app/src/main/res/values-hu/strings.xml  |   9 +-
 app/src/main/res/values-ia/strings.xml  |   4 +
 app/src/main/res/values-ja/strings.xml  | 224 ++++++++++--------
 app/src/main/res/values-kab/strings.xml | 157 ++++++-------
 app/src/main/res/values-sat/strings.xml | 298 +++++++-----------------
 app/src/main/res/values-sl/strings.xml  |   8 +-
 8 files changed, 346 insertions(+), 397 deletions(-)

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index f6f164a0a..848d9413d 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -255,6 +255,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Oversæt side</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Side oversat fra %1$s til %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valgt sprog</string>
@@ -331,11 +336,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Privatlivserklæring for Firefox</string>
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Læs mere i vores privatlivserklæring</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Vi elsker at holde dig sikker</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Find ud af, hvorfor millioner elsker Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Sikker browsing med flere valgmuligheder</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Vores browser er støttet af en nonprofit-organisation og forhindrer virksomheder i at følge dig rundt på nettet i det skjulte.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Mere end 100 millioner mennesker beskytter deres privatliv ved at vælge en browser, der er støttet af en nonprofit-organisation.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Kendte sporings-mekanismer? Blokeret automatisk. Udvidelser? Prøv alle 700. PDF-filer? Vores indbyggede læser gør det nemt at håndtere dem.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Vores non-profit-støttede browser hjælper med at forhindre virksomheder i at følge dig rundt på nettet i hemmelighed.\n\nLæs mere i vores privatlivserklæring.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -1895,6 +1911,8 @@
     <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Mellemnavn</string>
     <!-- The header for the last name of an address -->
     <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Efternavn</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Navn</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Postadresse</string>
     <!-- The header for the city of an address -->
@@ -2323,6 +2341,8 @@
     <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">privatlivspolitik</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Privatlivspolitik</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">privatlivserklæring</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">betingelser for brug</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2394,6 +2414,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Oversæt siden?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Side oversat fra %1$s til %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Prøv private oversættelser i %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2406,6 +2430,8 @@
     <string name="translations_bottom_sheet_translate_to">Oversæt til</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Ikke nu</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Vis oprindelig</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Færdig</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2428,6 +2454,16 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Læs mere</string>
 
+
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Oversætter…</string>
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Hent sprog i datasparer-tilstand (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Oversættelses-indstillinger</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index ec12a39c2..45f742be2 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -2465,6 +2465,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Käännetään…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Ladataanko kieli datansäästötilassa (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Käännösasetukset</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index e08b93131..f373340e1 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -339,7 +339,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox adatvédelmi nyilatkozat</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">További információk az adatvédelmi nyilatkozatunkban</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">További információk az adatvédelmi nyilatkozatunkban</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Szeretjük biztonságban tartani Önt</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2486,6 +2486,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Fordítás…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Nyelv letöltése adattakarékos módban (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Fordítási beállítások</string>
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
index 60e903034..d5ee8f00d 100644
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@@ -353,6 +353,10 @@
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Nostre navigator supportate per un organisation sin fin d lucro adjuta stoppar le companias de sequer secretemente tu movimentos circum le web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Plus que 100 milliones de personas protege lor confidentialitate seligente un navigar supportate per un organisation a fin non lucrative.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Traciatores note? Blocate automaticamente. Extensiones? Prova tote le 700. PDFs? Nostre lector integrate los rende facile a gerer.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Nostre navigator supportate per un organisation sin fin de lucro adjuta stoppar le companias de sequer te secretemente per le Web.\n\nSape plus in nostre Aviso de confidentialitate.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e7af7cfc3..2f77186c2 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -259,6 +259,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">ページを翻訳</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">ページを %1$s から %2$s に翻訳しました。</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">選択した言語</string>
@@ -337,12 +342,20 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox のプライバシー通知</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">詳細はプライバシー通知をご覧ください</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">私たちはあなたの安全を守りたいと願っています</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Firefox が選ばれる理由</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">多くの選択肢を持つ安全なブラウジング</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">非営利で作られた私たちのブラウザーは、企業によるウェブ上の密かな追跡を阻止するのに役立ちます。</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">1 億人以上の人が、非営利団体が支援するブラウザーを選択してプライバシーを保護しています。</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">非営利で作られた私たちのブラウザーは、企業によるウェブ上の密かな追跡を阻止するのに役立ちます。\n\n詳細はプライバシー通知をご覧ください。</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -701,9 +714,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">ブックマーク</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">ログイン情報</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">ログイン情報</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">パスワード</string>
+    <string name="preferences_sync_logins_2">パスワード</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">開いているタブ</string>
     <!-- Preference for signing out -->
@@ -729,9 +742,9 @@
     <string name="default_device_name_2">%2$s %3$s 上の %1$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">クレジットカード情報</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">クレジットカード情報</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">支払い方法</string>
+    <string name="preferences_sync_credit_cards_2">支払い方法</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">住所</string>
 
@@ -1685,13 +1698,13 @@
     <string name="add_to_homescreen_description_2">このウェブサイトを端末のホーム画面に簡単な操作で追加できます。アプリのような感覚で素早くアクセスして閲覧しましょう。</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">ログイン情報とパスワード</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">ログイン情報とパスワード</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">パスワード</string>
+    <string name="preferences_passwords_logins_and_passwords_2">パスワード</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">ログイン情報を保存する</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">ログイン情報を保存する</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">パスワードを保存</string>
+    <string name="preferences_passwords_save_logins_2">パスワードを保存</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">保存するか確認する</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1707,47 +1720,47 @@
     <string name="preferences_android_autofill_description">端末上の他のアプリにユーザー名とパスワードを入力します。</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">ログイン情報を追加</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">ログイン情報を追加</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">パスワードを追加</string>
+    <string name="preferences_logins_add_login_2">パスワードを追加</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">ログイン情報を同期</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">パスワードを同期</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">ログイン情報を同期</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">パスワードを同期</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">端末間でログイン情報を同期します</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">端末間でログイン情報を同期します</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">端末間でパスワードを同期</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">端末間でパスワードを同期</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">保存されたログイン情報</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">保存されたログイン情報</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">保存されたパスワード</string>
+    <string name="preferences_passwords_saved_logins_2">保存されたパスワード</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">端末に保存または %s と同期したログイン情報がここに表示されます。</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">端末に保存または %s と同期したログイン情報がここに表示されます。</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">%s に保存または同期したパスワードがこのリストに表示されます。保存されたすべてのパスワードは暗号化されます。</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">%s に保存または同期したパスワードがこのリストに表示されます。保存されたすべてのパスワードは暗号化されます。</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Sync についての詳細情報。</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Sync についての詳細情報。</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Sync についての詳細情報</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Sync についての詳細情報</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">例外</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">ログイン情報が保存されないサイトがここに表示されます。</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">ログイン情報が保存されないサイトがここに表示されます。</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s は、このリストに表示されているサイトのパスワードを保存しません。</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s は、このリストに表示されているサイトのパスワードを保存しません。</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">これらのサイトではログイン情報が保存されません。</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">これらのサイトではログイン情報が保存されません。</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s はこれらのサイトのパスワードを保存しません。</string>
+    <string name="preferences_passwords_exceptions_description_2">%s はこれらのサイトのパスワードを保存しません。</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">すべての例外を削除</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">ログイン情報を検索</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">ログイン情報を検索</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">パスワードを検索</string>
+    <string name="preferences_passwords_saved_logins_search_2">パスワードを検索</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">サイト</string>
     <!-- The header for the username for a login -->
@@ -1775,17 +1788,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">パスワードを隠す</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">ロック解除して保存されたログイン情報を表示します</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ロック解除して保存されたログイン情報を表示します</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">保存されたパスワードを表示するにはロック解除してください</string>
+    <string name="logins_biometric_prompt_message_2">保存されたパスワードを表示するにはロック解除してください</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">ログイン情報とパスワードの保護</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">ログイン情報とパスワードの保護</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">保存されたパスワードを保護してください</string>
+    <string name="logins_warning_dialog_title_2">保存されたパスワードを保護してください</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">端末のロックパターンや PIN、パスワードを設定して、保存されたログイン情報とパスワードを他人の不正なアクセスから保護しましょう。</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">端末のロックパターンや PIN、パスワードを設定して、保存されたログイン情報とパスワードを他人の不正なアクセスから保護しましょう。</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">端末のロックパターンや PIN、パスワードを設定して、保存されたパスワードを他人の不正なアクセスから保護しましょう。</string>
+    <string name="logins_warning_dialog_message_2">端末のロックパターンや PIN、パスワードを設定して、保存されたパスワードを他人の不正なアクセスから保護しましょう。</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">後で</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1803,10 +1816,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">最終使用日時</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">ログイン情報メニューの並べ替え</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ログイン情報メニューの並べ替え</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">パスワードを並べ替えます</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">パスワードを並べ替えます</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1814,44 +1827,44 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">所在地フォーム</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">クレジットカード</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">クレジットカード</string>
 
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">支払い方法</string>
+    <string name="preferences_credit_cards_2">支払い方法</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">カード情報を保存して自動入力する</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">カード情報を保存して自動入力する</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">支払い方法を保存して入力する</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">支払い方法を保存して入力する</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">データは暗号化されています</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">データは暗号化されています</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s は保存したすべての支払い方法を暗号化します</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s は保存したすべての支払い方法を暗号化します</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">端末間でカード情報を同期する</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">クレジットカード情報を同期</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">クレジットカードを追加</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">クレジットカードを追加</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">カード情報を追加</string>
+    <string name="preferences_credit_cards_add_credit_card_2">カード情報を追加</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">保存したカードを管理</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">保存したカードを管理</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">カード情報を管理</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">カード情報を管理</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">アドレスを追加</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">アドレスの管理</string>
 
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">アドレスを保存して自動入力する</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">アドレスを保存して自動入力する</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">住所を保存して入力する</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">住所を保存して入力する</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">カード番号、メールアドレス、配送先などの情報を含める</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">カード番号、メールアドレス、配送先などの情報を含める</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">電話番号とメールアドレスを含みます</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">電話番号とメールアドレスを含みます</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">カードの追加</string>
@@ -1873,9 +1886,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">カードを削除</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">本当にこのクレジットカード情報を削除してもよろしいですか？</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">本当にこのクレジットカード情報を削除してもよろしいですか？</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">カード情報を削除しますか？</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">カード情報を削除しますか？</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">削除</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1889,25 +1902,25 @@
     <string name="credit_cards_saved_cards">保存したカード</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">有効なクレジットカード番号を入力してください</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">有効なクレジットカード番号を入力してください</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">正しいカード番号を入力してください</string>
+    <string name="credit_cards_number_validation_error_message_2">正しいカード番号を入力してください</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">このフィールドは入力必須です</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">このフィールドは入力必須です</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">名前を追加してください</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">名前を追加してください</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">保存されたカード情報を表示するにはロック解除してください</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">クレジットカード情報の保護</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">クレジットカード情報の保護</string>
 
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">保存された支払い方法を保護してください</string>
+    <string name="credit_cards_warning_dialog_title_2">保存された支払い方法を保護してください</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">端末のロックパターンや PIN、パスワードを設定して、保存されたクレジットカード情報とパスワードを他人の不正なアクセスから保護しましょう。</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">端末のロックパターンや PIN、パスワードを設定して、保存されたクレジットカード情報とパスワードを他人の不正なアクセスから保護しましょう。</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">端末のロックパターンや PIN、パスワードを設定して、保存された支払い方法を他人の不正なアクセスから保護しましょう。</string>
+    <string name="credit_cards_warning_dialog_message_3">端末のロックパターンや PIN、パスワードを設定して、保存された支払い方法を他人の不正なアクセスから保護しましょう。</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">今すぐ設定</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1916,10 +1929,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">端末のロック解除</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">ロックを解除して保存したクレジットカード情報を使用します</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ロックを解除して保存したクレジットカード情報を使用します</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">保存された支払い方法を使用するにはロック解除してください</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">保存された支払い方法を使用するにはロック解除してください</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">アドレスを追加</string>
     <!-- Title of the "Edit address" screen -->
@@ -1927,11 +1940,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">アドレスの管理</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">名</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">名</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">ミドルネーム</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">ミドルネーム</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">姓</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">姓</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">氏名</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">番地</string>
     <!-- The header for the city of an address -->
@@ -1956,9 +1971,9 @@
     <string name="addressess_delete_address_button">アドレスを削除</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">本当にこの住所を削除してもよろしいですか？</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">本当にこの住所を削除してもよろしいですか？</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">このアドレスを削除しますか？</string>
+    <string name="addressess_confirm_dialog_message_2">このアドレスを削除しますか？</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">削除</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2056,50 +2071,50 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">編集</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">このログイン情報を削除してもよろしいですか？</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">このログイン情報を削除してもよろしいですか？</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">本当にこのパスワードを削除してもよろしいですか？</string>
+    <string name="login_deletion_confirmation_2">本当にこのパスワードを削除してもよろしいですか？</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">削除</string>
 
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">キャンセル</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">ログインオプション</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">ログインオプション</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">パスワードのオプション</string>
+    <string name="login_options_menu_2">パスワードのオプション</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">ログイン情報のウェブアドレスの編集可能なテキストフィールド。</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ログイン情報のウェブアドレスの編集可能なテキストフィールド。</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">ウェブサイトのアドレスの編集可能なテキストフィールド。</string>
+    <string name="saved_login_hostname_description_3">ウェブサイトのアドレスの編集可能なテキストフィールド。</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">ログイン情報のユーザー名の編集可能なテキストフィールド。</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ログイン情報のユーザー名の編集可能なテキストフィールド。</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">ユーザー名の編集可能なテキストフィールド。</string>
+    <string name="saved_login_username_description_3">ユーザー名の編集可能なテキストフィールド。</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">ログイン情報のパスワードの編集可能なテキストフィールド。</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ログイン情報のパスワードの編集可能なテキストフィールド。</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">パスワードの編集可能なテキストフィールド。</string>
+    <string name="saved_login_password_description_2">パスワードの編集可能なテキストフィールド。</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">変更を保存してログインします。</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">変更を保存してログインします。</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">変更を保存します。</string>
+    <string name="save_changes_to_login_2">変更を保存します。</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">編集</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">編集</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">パスワードを編集</string>
+    <string name="edit_2">パスワードを編集</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">新しいログイン情報の追加</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">新しいログイン情報の追加</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">パスワードを追加</string>
+    <string name="add_login_2">パスワードを追加</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">パスワードが必要です</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">パスワードが必要です</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">パスワードを入力してください</string>
+    <string name="saved_login_password_required_2">パスワードを入力してください</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">ユーザー名は必須です</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">ユーザー名は必須です</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">ユーザー名を入力してください</string>
+    <string name="saved_login_username_required_2">ユーザー名を入力してください</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">ホスト名は必須です</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2212,7 +2227,7 @@
     <string name="radio_preference_info_content_description">詳細はこちら</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">上へ移動します</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">上へ移動します</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">閉じる</string>
@@ -2254,8 +2269,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">レートが調整されています</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">信頼できないレビューを削除しました</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">信頼できないレビューに基づきます</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">最近の注目レビュー</string>
@@ -2311,10 +2324,6 @@
     <string name="review_quality_check_product_availability_warning_body">この製品が再入荷されている場合はご報告ください。その製品レビューを確認します。</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">製品の在庫があることを報告する</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">レビューの品質の確認</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">レビューの品質の確認</string>
 
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">レビューの品質の確認 (%s)</string>
@@ -2363,13 +2372,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">詳細情報</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">「はい、試します」を選択すると、%1$s by Mozilla の%2$s および %3$s に同意したものとみなされます。</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">「はい、試します」を選択すると、%1$s by Mozilla の%2$s および %3$s に同意したものとみなされます。</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">「はい、試します」を選択すると、%1$s の以下の内容に同意したものとみなされます:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">「はい、試します」を選択すると、%1$s の%2$sおよび  %3$s の%4$sに同意したものとみなされます。</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">「はい、試します」を選択すると、%1$s の%2$sおよび  %3$s の%4$sに同意したものとみなされます。</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">プライバシーポリシー</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">プライバシーポリシー</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">プライバシーポリシー</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">プライバシー通知</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">利用規約</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2440,6 +2455,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">このページを翻訳しますか？</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">ページを %1$s から %2$s に翻訳しました</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">%1$s でプライベート翻訳を試してください</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2452,6 +2471,8 @@
     <string name="translations_bottom_sheet_translate_to">翻訳先</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">後で</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">元の言語で表示</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">完了</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2473,6 +2494,17 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">詳細情報</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">翻訳中…</string>
+
+
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">データ節約モードで言語をダウンロード (%1$s) しますか？</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">翻訳オプション</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 099ae1be7..853fa7d56 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -338,7 +338,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Tasertit tabaḍnit n Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Issin ugar deg tsertit-nneɣ n tbaḍnit</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Nḥemmel ad teqqimeḍ d aɣellsan</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
@@ -693,9 +694,9 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Ticraḍ n yisebtar</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Inekcam</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Inekcam</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Awalen uffiren</string>
+    <string name="preferences_sync_logins_2">Awalen uffiren</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Accaren yeldin</string>
     <!-- Preference for signing out -->
@@ -722,9 +723,9 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="default_device_name_2">%1$s deg %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Tikarḍiwin n usmad</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Tikarḍiwin n usmad</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Tarrayin n uxelleṣ</string>
+    <string name="preferences_sync_credit_cards_2">Tarrayin n uxelleṣ</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Tansiwin</string>
 
@@ -1676,13 +1677,13 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="add_to_homescreen_description_2">Tzemreḍ s sshal ad ternuḍ asmel-a web ɣer ugdil agejdan n yibenk-inek·inem i wakken ad tesɛuḍ anekcum askudan d tunigin taruradt s termt i icuban asnas.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Inekcam d wawalen uffiren</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Inekcam d wawalen uffiren</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Awalen uffiren</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Awalen uffiren</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Sekles inekcam d wawalen uffiren</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sekles inekcam d wawalen uffiren</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Sekles awalen uffiren</string>
+    <string name="preferences_passwords_save_logins_2">Sekles awalen uffiren</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Suter asekles</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1698,39 +1699,39 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="preferences_android_autofill_description">Ččar ismawen n useqdac d wawalen uffiren deg yisnasen-nniḍen ɣef yibenk-ik·im.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Rnu anekcum</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Rnu anekcum</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Rnu awal uffir</string>
+    <string name="preferences_logins_add_login_2">Rnu awal uffir</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Mtawi inekcam</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Mtawi awalen uffiren</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Mtawi inekcam</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Mtawi awalen uffiren</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Mtawi inekcam gqr yibenkan</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Mtawi inekcam gqr yibenkan</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Inekcam yettwakelsen</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Inekcam yettwakelsen</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Awalen uffiren yettwakelsen</string>
+    <string name="preferences_passwords_saved_logins_2">Awalen uffiren yettwakelsen</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Anekcum i tḥerzeḍ ɣer %s ad d-ittwasken da.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Anekcum i tḥerzeḍ ɣer %s ad d-ittwasken da.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Issin ugar ɣef umtawi.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Issin ugar ɣef umtawi.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Issin ugar ɣef umtawi</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Issin ugar ɣef umtawi</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Tisuraf</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Inekcam akked wawalen uffiren ur yettwaskelsen ara ad ttwaseknen dagi.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Inekcam akked wawalen uffiren ur yettwaskelsen ara ad ttwaseknen dagi.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Inekcam akked wawalen uffiren ur ttwaseklasen ara i yismal-a.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Inekcam akked wawalen uffiren ur ttwaseklasen ara i yismal-a.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Kkes akk tisuraf</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Nadi inekcam</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Nadi inekcam</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Nadi awalen uffiren</string>
+    <string name="preferences_passwords_saved_logins_search_2">Nadi awalen uffiren</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Asmel web</string>
     <!-- The header for the username for a login -->
@@ -1758,13 +1759,13 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Ffer awal uffir</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Serreḥ akken ad tsekneḍ inekcam-ik yettwaskelsen</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Serreḥ akken ad tsekneḍ inekcam-ik yettwaskelsen</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Mmesten inekcam d wawalen uffiren</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Mmesten inekcam d wawalen uffiren</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Seɣles awalen-ik·im uffiren i yettwaskelsen</string>
+    <string name="logins_warning_dialog_title_2">Seɣles awalen-ik·im uffiren i yettwaskelsen</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Sbadu azenziɣ n usekkeṛ, tangal PIN, neɣ awal uffir akken ad temmesteneḍ inekcam-ik akked wawlen-ik uffiren yettwaskelsen ticki yella win ikecmen ɣer yibenk-ik.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Sbadu azenziɣ n usekkeṛ, tangal PIN, neɣ awal uffir akken ad temmesteneḍ inekcam-ik akked wawlen-ik uffiren yettwaskelsen ticki yella win ikecmen ɣer yibenk-ik.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Ticki</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1783,7 +1784,7 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="saved_logins_sort_strategy_last_used">Aseqdec aneggaru</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Umuɣ n usemyizwer n yinekcam</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Umuɣ n usemyizwer n yinekcam</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1791,35 +1792,38 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Tansiwin</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Tikarḍiwin n usmad</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Tikarḍiwin n usmad</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Tarrayin n uxelleṣ</string>
+    <string name="preferences_credit_cards_2">Tarrayin n uxelleṣ</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Asekles d taččart tawurmant n tkarḍiwin</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Asekles d taččart tawurmant n tkarḍiwin</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Isefka ttwawgelhen</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Isefka ttwawgelhen</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Mtawi tikarḍiwin gar yibenkan</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Mtawi tikarḍiwin</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Rnu takarḍa n usmad</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Rnu takarḍa n usmad</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Rnu takarḍa</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Rnu takarḍa</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Sefrek tikerḍiwin yettwaskelsen</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Sefrek tikerḍiwin yettwaskelsen</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Sefrek tikarḍiwin</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Sefrek tikarḍiwin</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Rnu tansa</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Sefrek tansiwin</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Asekles d taččart tawurmant n tansiwin</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Asekles d taččart tawurmant n tansiwin</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Sekles; teččareḍ tansiwin</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Sekles; teččareḍ tansiwin</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Seddu talɣut am wuṭṭunen, imayl akked tansiwin n usiweḍ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Seddu talɣut am wuṭṭunen, imayl akked tansiwin n usiweḍ</string>
+
+    <!-- Preference summary for saving and filling address data -->
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Seddu ula uṭṭunen n tiliɣri d tansiwin n yimayl</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Rnu takarḍa</string>
@@ -1840,9 +1844,9 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Kkes takarḍa</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Tebɣiḍ s tidet ad tekkseḍ takarḍa-a n usmad?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Tebɣiḍ s tidet ad tekkseḍ takarḍa-a n usmad?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Kkes takarḍa?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Kkes takarḍa?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Kkes</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1855,20 +1859,20 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="credit_cards_saved_cards">Tikerḍiwin yettwasekles</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Ma ulac aɣilif sekcem uṭṭun ameɣtu n tkarḍa n usmad</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ma ulac aɣilif sekcem uṭṭun ameɣtu n tkarḍa n usmad</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Sekcem uṭṭun n tkarḍa ameɣtu</string>
+    <string name="credit_cards_number_validation_error_message_2">Sekcem uṭṭun n tkarḍa ameɣtu</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Ttxil-k·m ččar urti-a</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ttxil-k·m ččar urti-a</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Rnu isem</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Rnu isem</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Kkes asekkeṛ i wakken ad twaliḍ tikerḍiwin-ik·im yettwaskelsen</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Seɣles tikerḍiwin-ik·im n usmad</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Seɣles tikerḍiwin-ik·im n usmad</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Sbadu taneɣruft n usekkeṛ n yibenk, tangalt PIN neq awal uffir i ummesten n tkerḍiwin-ik·im n usmad yettwaskelsen ticki yella win ikecmen ɣer yibenk-inek·inem.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Sbadu taneɣruft n usekkeṛ n yibenk, tangalt PIN neq awal uffir i ummesten n tkerḍiwin-ik·im n usmad yettwaskelsen ticki yella win ikecmen ɣer yibenk-inek·inem.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Sbadu tura</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1876,7 +1880,7 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Serreḥ i ibenk-inek·inem</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Kkes asekkeṛ i wakken ad tesqedceḍ talɣut n tkarḍa n usmad</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Kkes asekkeṛ i wakken ad tesqedceḍ talɣut n tkarḍa n usmad</string>
 
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Rnu tansa</string>
@@ -1885,11 +1889,13 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Sefrek tansiwin</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Aɣara</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Aɣara</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Isem alemmas</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Isem alemmas</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Isem</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Isem</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Isem</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Tansa n taddart</string>
     <!-- The header for the city of an address -->
@@ -1914,9 +1920,9 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="addressess_delete_address_button">Kkes tansa</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">D tidet tebɣiḍ ad tekkseḍ tansa-a?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">D tidet tebɣiḍ ad tekkseḍ tansa-a?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Kkes tansa-a?</string>
+    <string name="addressess_confirm_dialog_message_2">Kkes tansa-a?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Kkes</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2016,41 +2022,41 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Ẓreg</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Tebɣiḍ ad tekseḍ anekcum-agi?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Tebɣiḍ ad tekseḍ anekcum-agi?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Kkes</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Sefsex</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Iɣewwaren n unekcum</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Iɣewwaren n unekcum</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Tixtiṛiyin n wawal uffir</string>
+    <string name="login_options_menu_2">Tixtiṛiyin n wawal uffir</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Urti n uḍris yettusenfal i tansa n unekcum n web.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Urti n uḍris yettusenfal i tansa n unekcum n web.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Urti n uḍris yettusenfal i yisem n useqdac n unekcum.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Urti n uḍris yettusenfal i yisem n useqdac n unekcum.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Urti n uḍris yettusenfal i wawal uffir n unekcum.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Urti n uḍris yettusenfal i wawal uffir n unekcum.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Sekles isenfaln unekcum.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Sekles isenfaln unekcum.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Sekles isenfal.</string>
+    <string name="save_changes_to_login_2">Sekles isenfal.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Ẓreg</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Ẓreg</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Ẓreg awal uffir</string>
+    <string name="edit_2">Ẓreg awal uffir</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Rnu anekcum amaynut</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Rnu anekcum amaynut</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Rnu awal uffir</string>
+    <string name="add_login_2">Rnu awal uffir</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Awal uffir yettusra</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Awal uffir yettusra</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Sekcem awal uffir</string>
+    <string name="saved_login_password_required_2">Sekcem awal uffir</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Isem n useqdac yettwasra</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Isem n useqdac yettwasra</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Sekcem isem n useqdac</string>
+    <string name="saved_login_username_required_2">Sekcem isem n useqdac</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Asenneftaɣ yettwasra</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2165,7 +2171,7 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="radio_preference_info_content_description">Sit i wugar n telqayt</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Inig d asawen</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Inig d asawen</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Mdel</string>
@@ -2205,8 +2211,6 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="review_quality_check_grade_title">D acu-tt tneflest n yilɣa-a?</string>
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Aktazal yettwaseɣta</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Yir alɣu yettwakkes</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Tamuɣli s wazal-is seg yilɣa imaynuten</string>
     <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
@@ -2241,10 +2245,6 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="review_quality_check_product_availability_warning_title">Afaris ulac-it</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Mmel tuɣalin n ufaris deg tawsa</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Adenqed n tɣara n yilɣa</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Adenqed n tɣara n yilɣa</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Adenqed n tɣara n yilɣa (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2274,7 +2274,7 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Issin ugar</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">Tasertit n tbaḍnit</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">Tasertit n tbaḍnit</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Tasertit n tbaḍnit</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2377,6 +2377,7 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Issin ugar</string>
 
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Tixtiṛiyin n usuqel</string>
diff --git a/app/src/main/res/values-sat/strings.xml b/app/src/main/res/values-sat/strings.xml
index db302a987..c172e7be8 100644
--- a/app/src/main/res/values-sat/strings.xml
+++ b/app/src/main/res/values-sat/strings.xml
@@ -220,6 +220,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">ᱚᱲᱟᱜᱥᱟᱦᱴᱟ ᱠᱩᱥᱤᱛᱮ ᱫᱚᱦᱚᱭ ᱢᱮ</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">ᱚᱲᱟᱜ ᱥᱠᱨᱤᱱ</string>
@@ -235,8 +236,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">ᱥᱠᱟᱱ</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button">ᱥᱮᱸᱫᱽᱨᱟ ᱤᱧᱡᱤᱱ</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">ᱥᱮᱸᱫᱽᱨᱟᱭ ᱤᱧᱡᱤᱱ ᱥᱟᱡᱟᱣ ᱠᱚ</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -292,56 +291,26 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">%s ᱮᱛᱞᱟᱤᱭᱟᱹ ᱥᱟᱞᱟᱜ ᱵᱟᱹᱲᱛᱤ ᱠᱟᱹᱢᱤ ᱠᱚᱨᱟᱣ ᱨᱮ ᱜᱚᱲᱚ ᱮᱢᱚᱜᱼᱟᱭ</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">%s ᱮᱛᱞᱟᱤᱭᱟᱹ ᱥᱟᱞᱟᱜ ᱵᱟᱹᱲᱛᱤ ᱠᱟᱹᱢᱤ ᱠᱚᱨᱟᱣ ᱨᱮ ᱜᱚᱲᱚ ᱮᱢᱚᱜᱼᱟᱭ</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">ᱟᱢᱟᱜ ᱴᱮᱵᱽ ᱠᱚ ᱥᱟᱫᱷᱚᱱ ᱠᱚ ᱢᱩᱫᱽ ᱨᱮ ᱥᱤᱱᱠᱨᱚᱱᱤᱠᱮᱥᱚᱱ ᱢᱮ, ᱰᱟᱣᱩᱱᱞᱚᱰ ᱠᱚ ᱢᱮᱱᱮᱡᱽ ᱢᱮ, %s ᱦᱟᱜ ᱯᱨᱟᱭᱵᱷᱮᱥᱤ ᱨᱩᱠᱷᱤᱭᱟᱹ ᱠᱷᱚᱱ ᱡᱚᱛᱚ ᱠᱷᱚᱱ ᱰᱷᱮᱨ ᱵᱮᱵᱷᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱴᱤᱯᱥ ᱧᱟᱢ ᱢᱮ, ᱟᱨᱦᱚᱸ ᱟᱭᱢᱟ ᱡᱤᱱᱤᱥ ᱵᱟᱲᱟᱭ ᱡᱚᱝ ᱢᱮ ᱾</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">ᱟᱢᱟᱜ ᱴᱮᱵᱽ ᱠᱚ ᱥᱟᱫᱷᱚᱱ ᱠᱚ ᱢᱩᱫᱽ ᱨᱮ ᱥᱤᱱᱠᱨᱚᱱᱤᱠᱮᱥᱚᱱ ᱢᱮ, ᱰᱟᱣᱩᱱᱞᱚᱰ ᱠᱚ ᱢᱮᱱᱮᱡᱽ ᱢᱮ, %s ᱦᱟᱜ ᱯᱨᱟᱭᱵᱷᱮᱥᱤ ᱨᱩᱠᱷᱤᱭᱟᱹ ᱠᱷᱚᱱ ᱡᱚᱛᱚ ᱠᱷᱚᱱ ᱰᱷᱮᱨ ᱵᱮᱵᱷᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱴᱤᱯᱥ ᱧᱟᱢ ᱢᱮ, ᱟᱨᱦᱚᱸ ᱟᱭᱢᱟ ᱡᱤᱱᱤᱥ ᱵᱟᱲᱟᱭ ᱡᱚᱝ ᱢᱮ ᱾</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">ᱞᱮᱛᱟᱲ</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">ᱞᱮᱛᱟᱲ</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">ᱱᱤᱛᱚᱜ ᱫᱚ ᱵᱟᱝᱟ</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">ᱱᱤᱛᱚᱜ ᱫᱚ ᱵᱟᱝᱟ</string>
 
-    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">%s ᱟᱢᱟᱜ ᱠᱩᱥᱤ ᱵᱽᱨᱟᱣᱡᱚᱨ ᱛᱮᱭᱟᱨ ᱢᱮ</string>
-    <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-        Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Firefox ᱫᱚ ᱟᱢᱟᱜ ᱱᱤᱡᱚᱨᱟᱜ ᱵᱽᱨᱟᱣᱡᱚᱨ ᱦᱟᱛᱟᱣ ᱢᱮ</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s ᱫᱚ ᱦᱚᱲ ᱠᱚ ᱵᱮᱯᱟᱨ ᱠᱷᱚᱱ ᱢᱩᱬᱩᱛ ᱨᱮ ᱫᱚᱦᱚᱭᱟ ᱟᱨ ᱠᱨᱚᱥ-ᱥᱟᱭᱤᱴ ᱴᱨᱮᱠᱚᱨ ᱵᱞᱚᱠ ᱠᱟᱛᱮ ᱟᱢᱟᱜ ᱯᱨᱟᱵᱷᱮᱴᱤ ᱫᱚᱦᱚᱭᱟ ᱾\n\n ᱟᱞᱮᱭᱟᱜ %2$s ᱨᱮ ᱰᱷᱮᱨ ᱵᱟᱲᱟᱭ ᱢᱮ ᱾</string>
-    <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-        Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox ᱫᱚ ᱦᱚᱲ ᱠᱚ ᱵᱮᱯᱟᱨ ᱠᱷᱚᱱ ᱢᱩᱬᱩᱛ ᱨᱮ ᱫᱚᱦᱚᱭᱟ ᱟᱨ ᱠᱨᱚᱥ-ᱥᱟᱭᱤᱴ ᱴᱨᱮᱠᱚᱨ ᱵᱞᱚᱠ ᱠᱟᱛᱮ ᱟᱢᱟᱜ ᱯᱨᱟᱵᱷᱮᱴᱤ ᱫᱚᱦᱚᱭᱟ ᱾\n\n ᱟᱞᱮᱭᱟᱜ ᱫᱟᱱᱟᱝ ᱠᱷᱚᱵᱚᱨ ᱨᱮ ᱰᱷᱮᱨ ᱵᱟᱲᱟᱭ ᱢᱮ ᱾</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">ᱱᱤᱥᱚᱱ ᱨᱮᱭᱟᱜ ᱱᱚᱴᱤᱥ</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">ᱱᱤᱥᱚᱱ ᱨᱮᱭᱟᱜ ᱱᱚᱴᱤᱥ</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">ᱢᱩᱞ ᱵᱽᱨᱟᱣᱩᱡᱟᱹᱨ ᱞᱮᱠᱷᱟ ᱥᱟᱡᱟᱣ ᱢᱮ</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_default_browser_negative_button" tools:ignore="UnusedResources">ᱱᱤᱛᱚᱜ ᱫᱚ ᱵᱟᱝᱟ</string>
-    <!-- Title for sign in to sync screen. -->
-    <string name="juno_onboarding_sign_in_title" tools:ignore="UnusedResources">ᱯᱷᱚᱱ ᱠᱷᱚᱱ ᱞᱮᱯᱴᱚᱯ ᱛᱮ ᱩᱪᱟᱹᱲ ᱢᱮ ᱵᱟᱨ ᱯᱟᱦᱴᱮ ᱞᱮᱠᱟᱛᱮ</string>
-    <!-- Description for sign in to sync screen. -->
-    <string name="juno_onboarding_sign_in_description" tools:ignore="UnusedResources">ᱴᱮᱵᱽ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫ ᱫᱚ ᱮᱴᱟᱜ ᱥᱟᱫᱷᱚᱱ ᱠᱷᱚᱱ ᱡᱟᱦᱟᱸ ᱨᱮ ᱟᱲᱟᱜ ᱞᱮᱫᱟᱢ ᱚᱱᱰᱮ ᱠᱷᱚᱱ ᱯᱟᱧᱡᱟ ᱫᱟᱲᱮᱭᱟᱜᱼᱟᱢ ᱾</string>
     <!-- Text for the button to sign in to sync on the device -->
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">ᱵᱚᱞᱚᱱ ᱥᱩᱦᱤ</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">ᱱᱤᱛᱚᱜ ᱫᱚ ᱵᱟᱝᱟ</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">%s ᱮᱛᱞᱟᱤᱭᱟᱹ ᱥᱟᱞᱟᱜ ᱵᱟᱹᱲᱛᱤ ᱠᱟᱹᱢᱤ ᱠᱚᱨᱟᱣ ᱨᱮ ᱜᱚᱲᱚ ᱮᱢᱚᱜᱼᱟᱭ</string>
-    <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-        Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Firefox ᱮᱛᱞᱟᱤᱭᱟᱹ ᱥᱟᱞᱟᱜ ᱵᱟᱹᱲᱛᱤ ᱠᱟᱹᱢᱤ ᱠᱚᱨᱟᱣ ᱨᱮ ᱜᱚᱲᱚ ᱮᱢᱚᱜᱼᱟᱭ</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">ᱥᱟᱫᱷᱚᱱ ᱠᱚ ᱛᱟᱞᱟᱨᱮ ᱴᱟᱵᱽ ᱠᱚ ᱩᱪᱟᱹᱲ ᱢᱮ, ᱰᱟᱣᱩᱱᱞᱚᱰ ᱠᱚ ᱢᱮᱱᱮᱡᱽ ᱢᱮ, ᱟᱨ %s ᱠᱷᱚᱱ ᱡᱚᱛᱚ ᱠᱷᱚᱱ ᱡᱟᱹᱥᱛᱤ ᱵᱮᱵᱷᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱴᱤᱯᱥ ᱧᱟᱢ ᱢᱮ ᱾</string>
-    <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-       Note: The word "Firefox" should NOT be translated   -->
-    <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">ᱥᱟᱫᱷᱚᱱ ᱠᱚ ᱛᱟᱞᱟᱨᱮ ᱴᱟᱵᱽ ᱠᱚ ᱩᱪᱟᱹᱲ ᱢᱮ, ᱰᱟᱣᱩᱱᱞᱚᱰ ᱠᱚ ᱢᱮᱱᱮᱡᱽ ᱢᱮ, ᱟᱨ Firefox ᱠᱷᱚᱱ ᱡᱚᱛᱚ ᱠᱷᱚᱱ ᱡᱟᱹᱥᱛᱤ ᱵᱮᱵᱷᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱴᱤᱯᱥ ᱧᱟᱢ ᱢᱮ ᱾</string>
     <!-- Text for the button to request notification permission on the device -->
     <string name="juno_onboarding_enable_notifications_positive_button" tools:ignore="UnusedResources">ᱠᱷᱚᱵᱚᱨ ᱠᱚ ᱦᱮᱡ ᱪᱷᱚᱭ ᱢᱮ</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -366,8 +335,6 @@
     <string name="preferences_category_about">ᱵᱟᱵᱚᱛ</string>
     <!-- Preference category for settings related to changing the default search engine -->
     <string name="preferences_category_select_default_search_engine">ᱢᱤᱫᱴᱟᱝ ᱵᱟᱪᱷᱟᱣ ᱢᱮ</string>
-    <!-- Preference for settings related to managing search shortcuts for the quick search menu -->
-    <string name="preferences_manage_search_shortcuts">ᱥᱮᱸᱫᱽᱨᱟ ᱠᱷᱟᱴᱚᱢᱟᱪᱷᱟ ᱢᱮᱱᱮᱡᱽ ᱢᱮ</string>
     <!-- Summary for preference for settings related to managing search shortcuts for the quick search menu -->
     <string name="preferences_manage_search_shortcuts_summary">ᱥᱮᱸᱫᱽᱨᱟ ᱢᱮᱱᱩ ᱨᱮ ᱧᱮᱞᱚᱜ ᱠᱟᱱ ᱤᱧᱡᱤᱱ ᱠᱚ ᱥᱟᱯᱲᱟᱣ ᱢᱮ</string>
     <!-- Preference category for settings related to managing search shortcuts for the quick search menu -->
@@ -378,8 +345,6 @@
     <string name="preferences_search">ᱥᱮᱸᱫᱽᱨᱟ</string>
     <!-- Preference for settings related to Search engines -->
     <string name="preferences_search_engines">ᱥᱮᱸᱫᱽᱨᱟ ᱤᱧᱡᱤᱱ</string>
-    <!-- Preference for settings related to Search address bar -->
-    <string name="preferences_search_address_bar">ᱴᱷᱤᱠᱟᱹᱱᱟ ᱦᱩᱨᱠᱟᱹᱬ</string>
     <!-- Preference link to rating Fenix on the Play Store -->
     <string name="preferences_rate">ᱜᱩᱜᱚᱞ ᱯᱞᱮ ᱨᱮ ᱫᱚᱨ ᱢᱮ</string>
     <!-- Preference linking to about page for Fenix
@@ -406,17 +371,6 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">ᱠᱷᱟᱹᱞᱤᱼHTTPS ᱢᱳᱰ</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction">ᱠᱩᱠᱤ ᱵᱮᱱᱚᱨ ᱠᱷᱟᱴᱚ</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option">ᱠᱩᱠᱤ ᱵᱮᱱᱚᱨ ᱠᱷᱟᱴᱚᱭ ᱢᱮ</string>
-
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off">ᱵᱚᱸᱫᱚ</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on">ᱪᱟᱹᱞᱩ</string>
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1">%1$s ᱫᱚ ᱠᱩᱠᱤ ᱵᱮᱱᱚᱨ ᱨᱮ ᱠᱩᱠᱤ ᱞᱟᱹᱱᱟᱹᱭ ᱠᱚ ᱚᱡ ᱞᱮᱠᱟᱛᱮ ᱵᱟᱭ ᱩᱫᱩᱜ ᱮᱫᱟᱭ ᱾</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">ᱱᱚᱶᱟ ᱥᱟᱭᱤᱴ ᱞᱟᱹᱜᱤᱫ ᱵᱚᱱᱫ ᱜᱮᱭᱟ</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -433,31 +387,10 @@
     <string name="reduce_cookie_banner_unsupported_site_request_submitted_2">ᱜᱚᱲᱚ ᱱᱮᱦᱚᱨ ᱵᱷᱮᱡᱟ ᱮᱱᱟ</string>
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">ᱥᱟᱭᱟᱴ ᱱᱤᱛᱚᱜ ᱥᱟᱵ ᱨᱮ ᱵᱟᱹᱱᱩᱜᱼᱟ</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site">%1$s ᱞᱟᱹᱜᱤᱫ ᱠᱩᱠᱤ ᱵᱮᱱᱚᱨ ᱨᱮᱰᱟᱹᱠᱥᱚᱱ ᱮᱢ ᱪᱷᱚᱭ ᱢᱮ?</string>
-
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site">%1$s ᱞᱟᱹᱜᱤᱫ ᱠᱩᱠᱤ ᱵᱮᱱᱚᱨ ᱨᱮᱰᱟᱹᱠᱥᱚᱱ ᱵᱚᱱᱫᱚᱭᱟᱢ ᱥᱮ?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">ᱱᱚᱶᱟ ᱥᱟᱭᱤᱴ ᱨᱮ %1$s ᱫᱚ ᱟᱡ ᱛᱮ ᱠᱩᱠᱤ ᱱᱚᱦᱚᱨ ᱵᱟᱝ ᱢᱟᱱᱟ ᱫᱟᱲᱮᱭᱟᱜ ᱠᱟᱱᱟᱭ ᱾ ᱵᱷᱚᱵᱤᱥᱚᱛ ᱨᱮ ᱱᱚᱶᱟ ᱥᱟᱭᱤᱴ ᱜᱚᱲᱚ ᱮᱢ ᱞᱟᱹᱜᱤᱫ ᱱᱮᱦᱚᱨ ᱵᱷᱮᱡᱟ ᱫᱟᱲᱮᱭᱟᱜᱼᱟᱢ ᱾
 </string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site">%1$s ᱫᱚ ᱱᱚᱶᱟ ᱥᱟᱭᱤᱴᱟᱜ ᱠᱩᱠᱤ ᱠᱚ ᱢᱮᱴᱟᱣᱟᱭ ᱟᱨ ᱥᱟᱦᱴᱟ ᱯᱷᱟᱨᱪᱟ ᱜᱚᱫ ᱠᱟᱜᱼᱟᱭ ᱾ ᱡᱷᱚᱛᱚ ᱠᱩᱠᱤ ᱠᱚ ᱢᱮᱴᱟᱣ ᱞᱮᱠᱷᱟᱱ ᱟᱢ ᱵᱟᱦᱨᱮ ᱛᱮ ᱚᱰᱚᱠᱚᱜᱼᱟᱢ ᱟᱨᱵᱟᱝ ᱠᱤᱨᱤᱧ ᱵᱚᱥᱛᱟ ᱫᱚ ᱠᱷᱟᱹᱞᱤᱜ ᱛᱟᱢᱟᱸ ᱾</string>
-
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2">%1$s ᱫᱚ ᱥᱚᱦᱚᱫ ᱮᱢᱚᱜ ᱥᱟᱭᱤᱴ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱟᱡ ᱛᱮ ᱡᱷᱚᱛᱚ ᱠᱩᱠᱤ ᱱᱮᱦᱚᱨ ᱵᱟᱹᱨᱜᱤᱞ ᱜᱤᱰᱤ ᱞᱟᱹᱜᱤᱫ ᱪᱮᱥᱴᱟ ᱮᱫᱟᱭ ᱾</string>
-
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title">ᱠᱩᱠᱤ ᱵᱮᱱᱚᱨ ᱵᱟᱹᱨᱜᱤᱞ ᱜᱤᱰᱤ ᱞᱟᱹᱜᱤᱫ %1$s ᱦᱚᱠ ᱮᱢᱟᱭ ᱟᱢ ᱥᱮ ?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body">%1$s ᱫᱚ ᱟᱡ ᱛᱮ ᱟᱹᱰᱤᱜᱟᱱ ᱠᱩᱠᱤ ᱵᱮᱱᱚᱨ ᱱᱮᱦᱚᱨ ᱵᱟᱹᱨᱜᱤᱞ ᱜᱤᱰᱤ ᱫᱟᱲᱮᱭᱟᱜᱼᱟᱭ ᱾</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button">ᱱᱤᱛᱚᱜ ᱫᱚ ᱵᱟᱝᱟ</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text">ᱟᱢ ᱫᱚ ᱠᱩᱠᱤ ᱱᱮᱦᱚᱨ ᱠᱚ ᱠᱚᱢ ᱜᱮ ᱧᱮᱞ ᱟᱢ</string>
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button">ᱦᱮᱥᱟᱨᱤᱭᱟᱹ</string>
 
     <!-- Description of the preference to enable "HTTPS-Only" mode. -->
     <string name="preferences_https_only_summary">ᱵᱮᱰᱷᱟᱣ ᱠᱟᱱᱟ ᱨᱩᱠᱷᱤᱭᱟᱹ ᱞᱟᱹᱜᱤᱫ ᱛᱮ HTTPS ᱫᱟᱱᱟᱝ ᱵᱮᱵᱷᱟᱨ ᱛᱮ ᱥᱟᱭᱤᱴ ᱠᱚ ᱥᱟᱞᱟᱜ ᱟᱡ ᱛᱮ ᱡᱩᱲᱟᱹᱣ ᱵᱤᱲᱟᱹᱣ ᱾</string>
@@ -481,12 +414,8 @@
     <string name="errorpage_httpsonly_message_summary">ᱢᱮᱱᱠᱷᱟᱱ, ᱱᱚᱶᱟ ᱦᱚᱸ ᱦᱩᱭ ᱫᱟᱲᱮᱭᱟᱜᱼᱟ ᱡᱮ ᱢᱤᱫᱴᱟᱝ ᱢᱩᱸᱦᱟᱹ ᱤᱡ ᱦᱚᱸ ᱛᱟᱦᱮᱸ ᱠᱚᱜᱼᱟᱭ ᱾ ᱟᱢ ᱡᱩᱫᱤ ᱣᱮᱵᱽᱥᱟᱭᱤᱴ ᱥᱮᱫ ᱞᱟᱦᱟᱜ ᱠᱷᱟᱱ ᱫᱚᱢ, ᱟᱢ ᱫᱚ ᱡᱟᱦᱟᱱᱟᱜ ᱥᱚᱢᱵᱮᱫᱚᱱ ᱡᱤᱱᱤᱥ ᱟᱞᱚᱢ ᱟᱫᱮᱨ ᱛᱟᱢᱟᱸ ᱾ ᱡᱤᱫᱤ ᱟᱢ ᱞᱟᱦᱟᱜ ᱠᱷᱟᱱ, HTTPSᱼᱢᱳᱰ ᱫᱚ ᱥᱟᱭᱤᱴ ᱞᱟᱹᱜᱤᱫ ᱛᱤᱱᱟᱹᱜ ᱜᱟᱱ ᱚᱠᱛᱚ ᱞᱟᱹᱜᱤᱫ ᱵᱚᱸᱫᱚᱜᱼᱟ ᱾</string>
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">ᱟᱹᱛᱩᱨ ᱫᱟᱲᱮᱭᱟᱜ</string>
-    <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">ᱠᱟᱹᱥᱴᱚᱢ Firefox  ᱠᱷᱟᱛᱟ ᱥᱟᱹᱨᱣᱟᱹᱨ</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">ᱠᱩᱥᱤᱭᱟᱜ ᱥᱭᱝᱠ ᱥᱟᱹᱨᱣᱟᱹᱨ</string>
-    <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox ᱠᱷᱟᱛᱟ/ ᱥᱭᱝᱠ ᱠᱟᱹᱨᱣᱟᱹᱨ ᱵᱚᱫᱚᱞᱮᱱᱟ ᱾ ᱵᱚᱫᱚᱞ ᱠᱚ ᱫᱚᱦᱚ ᱞᱟᱹᱜᱤᱫ ᱮᱯᱞᱤᱠᱮᱥᱚᱱ ᱵᱚᱸᱫᱚᱜ ᱠᱟᱱᱟ…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">ᱠᱷᱟᱛᱟ</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -501,8 +430,6 @@
     <string name="preferences_customize">ᱠᱩᱥᱤᱭᱟᱜ ᱛᱮᱭᱟᱨ</string>
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">ᱟᱢᱟᱜ ᱴᱮᱵᱽ ᱠᱚ, ᱵᱩᱠᱢᱟᱨᱠ ᱠᱚ, ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱠᱚ ᱟᱨ ᱵᱟᱹᱲᱛᱤ ᱠᱚ ᱛᱚᱞ ᱡᱚᱠᱷᱟᱭ ᱞᱟᱹᱜᱤᱫ ᱥᱩᱦᱤ ᱮᱢ ᱢᱮ ᱾</string>
-    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox ᱠᱷᱟᱛᱟ</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">ᱥᱭᱝᱠ ᱠᱚ ᱪᱟᱹᱞᱩ ᱫᱚᱦᱚ ᱞᱟᱹᱜᱤᱫ ᱫᱩᱦᱲᱟᱹ ᱡᱩᱰᱟᱹᱣ</string>
     <!-- Preference for language -->
@@ -513,8 +440,6 @@
     <string name="preferences_data_collection">ᱟᱸᱠᱲᱟ ᱛᱩᱢᱟᱹᱞ</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">ᱨᱤᱢᱳᱴ ᱰᱤᱵᱚᱜᱤᱝ ᱣᱟᱭᱟ USB</string>
-    <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">ᱥᱮᱸᱫᱽᱨᱟ ᱤᱧᱡᱤᱱ ᱠᱚ ᱩᱫᱩᱜ ᱢᱮ</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">ᱥᱮᱸᱫᱽᱨᱟ ᱦᱩᱫᱤᱥ ᱠᱚ ᱩᱫᱩᱜ</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -614,16 +539,10 @@
 
     <!-- Text for classic wallpapers title. The first parameter is the Firefox name. -->
     <string name="wallpaper_classic_title">ᱠᱞᱟᱥᱤᱠ %s</string>
-    <!-- Text for limited edition wallpapers title. -->
-    <string name="wallpaper_limited_edition_title" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱥᱤᱢᱤᱛ ᱮᱰᱤᱥᱚᱱ</string>
     <!-- Text for artist series wallpapers title. "Artist series" represents a collection of artist collaborated wallpapers. -->
     <string name="wallpaper_artist_series_title">ᱟᱴᱤᱥᱴ ᱥᱤᱨᱤᱡᱽ</string>
-    <!-- Description text for the limited edition wallpapers with learn more link. The first parameter is the learn more string defined in wallpaper_learn_more-->
-    <string name="wallpaper_limited_edition_description_with_learn_more" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱱᱟᱶᱟ ᱥᱟᱫᱤᱱ ᱨᱚᱲ ᱛᱩᱢᱟᱹᱞ ᱾%s</string>
     <!-- Description text for the artist series wallpapers with learn more link. The first parameter is the learn more string defined in wallpaper_learn_more. "Independent voices" is the name of the wallpaper collection -->
     <string name="wallpaper_artist_series_description_with_learn_more">ᱱᱟᱶᱟ ᱥᱟᱫᱤᱱ ᱨᱚᱲ ᱛᱩᱢᱟᱹᱞ ᱾%s</string>
-    <!-- Description text for the limited edition wallpapers. -->
-    <string name="wallpaper_limited_edition_description" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱱᱟᱶᱟ ᱥᱟᱫᱤᱱ ᱨᱚᱲ ᱛᱩᱢᱟᱹᱞ ᱾</string>
     <!-- Description text for the artist series wallpapers. "Independent voices" is the name of the wallpaper collection -->
     <string name="wallpaper_artist_series_description">ᱱᱟᱶᱟ ᱥᱟᱫᱤᱱ ᱨᱚᱲ ᱛᱩᱢᱟᱹᱞ ᱾</string>
     <!-- Wallpaper onboarding dialog header text. -->
@@ -633,12 +552,6 @@
     <!-- Wallpaper onboarding dialog learn more button text. The button navigates to the wallpaper settings screen. -->
     <string name="wallpapers_onboarding_dialog_explore_more_button_text">ᱰᱷᱮᱨ ᱠᱟᱱᱛᱷᱪᱤᱛᱟᱹᱨ ᱠᱚ ᱥᱮᱸᱫᱽᱨᱟᱭ ᱢᱮ</string>
 
-    <!-- Add-on Installation from AMO-->
-    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">ᱮᱰᱼᱚᱱ ᱫᱚ ᱵᱟᱭ ᱟᱠᱟᱱᱟ</string>
-    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">ᱮᱰᱼᱚᱱ ᱢᱟᱲᱟᱝ ᱠᱷᱚᱱ ᱵᱚᱦᱟᱞ ᱟᱠᱟᱱᱟ</string>
-
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">ᱠᱷᱟᱛᱟ ᱢᱮᱱᱮᱡᱽ ᱢᱮ</string>
@@ -651,7 +564,7 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">ᱵᱩᱠᱢᱟᱨᱠ ᱠᱚ</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">ᱵᱚᱞᱚᱱ ᱠᱚ</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱵᱚᱞᱚᱱ ᱠᱚ</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">ᱡᱷᱤᱡᱽ ᱠᱟᱱ ᱴᱮᱵᱽ ᱠᱚ</string>
     <!-- Preference for signing out -->
@@ -676,7 +589,7 @@
     <string name="default_device_name_2">%1$s on %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">ᱴᱷᱤᱠᱬᱟᱤᱭᱟᱹ</string>
 
@@ -945,9 +858,9 @@
     <!-- Hint for adding name of a collection -->
     <string name="collection_name_hint">ᱛᱩᱢᱟᱹᱞ ᱧᱩᱛᱩᱢ</string>
     <!-- Text for the menu button to rename a top site -->
-	<string name="rename_top_site">ᱨᱤᱱᱮᱢ</string>
-	<!-- Text for the menu button to remove a top site -->
-	<string name="remove_top_site">ᱚᱪᱚᱜ ᱢᱮ</string>
+    <string name="rename_top_site">ᱨᱤᱱᱮᱢ</string>
+    <!-- Text for the menu button to remove a top site -->
+    <string name="remove_top_site">ᱚᱪᱚᱜ ᱢᱮ</string>
     <!-- Text for the menu button to delete a top site from history -->
     <string name="delete_from_history">ᱱᱟᱜᱟᱢ ᱠᱷᱚᱱ ᱢᱮᱴᱟᱣ ᱢᱮ</string>
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
@@ -1222,8 +1135,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">ᱵᱚᱸᱫ</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">ᱪᱷᱟᱯᱟ ᱵᱟᱭ ᱜᱟᱱ ᱞᱮᱱᱟ</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">ᱱᱚᱶᱟ ᱥᱟᱦᱴᱟ ᱪᱷᱟᱯᱟ ᱵᱟᱭ ᱜᱟᱱᱚᱜ ᱠᱟᱱᱟ</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">ᱪᱷᱟᱯᱟ</string>
@@ -1268,6 +1179,7 @@
     <!-- Notifications -->
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">ᱯᱨᱟᱭᱣᱮᱴ ᱴᱮᱵᱽ ᱠᱚ ᱵᱚᱸᱫᱚᱭ ᱢᱮ</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">ᱢᱟᱨᱠᱮᱴᱤᱝ</string>
 
@@ -1368,14 +1280,11 @@
     <!-- Subtitle for the tabs item in Delete browsing data, parameter will be replaced with the number of open tabs -->
     <string name="preferences_delete_browsing_data_tabs_subtitle">%d ᱴᱮᱵᱽ ᱠᱚ</string>
     <!-- Title for the data and history items in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_browsing_data_title" moz:removedIn="118" tools:ignore="UnusedResources">ᱵᱽᱨᱟᱣᱩᱡᱤᱝ ᱱᱟᱜᱟᱢ ᱟᱨ ᱥᱟᱭᱤᱴ ᱰᱟᱴᱟ</string>
     <!-- Title for the history item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_browsing_history_title">ᱱᱟᱜᱟᱢ ᱯᱟᱱᱛᱮ</string>
     <!-- Subtitle for the data and history items in delete browsing data, parameter will be replaced with the
         number of history items the user has -->
     <string name="preferences_delete_browsing_data_browsing_data_subtitle">%d ᱴᱷᱤᱠᱬᱟᱹ ᱠᱚ</string>
-    <!-- Title for the cookies item in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_cookies" moz:removedIn="118" tools:ignore="UnusedResources">ᱠᱩᱠᱤᱡ ᱠᱚ</string>
     <!-- Title for the cookies and site data items in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cookies_and_site_data">ᱠᱩᱠᱤᱡᱽ ᱟᱨ ᱥᱟᱭᱤᱴ ᱰᱟᱴᱟ</string>
     <!-- Subtitle for the cookies item in Delete browsing data -->
@@ -1431,63 +1340,10 @@
     <string name="delete_history_group_snackbar">ᱫᱳᱞ ᱢᱮᱴᱟᱣ ᱦᱩᱭ</string>
 
     <!-- Onboarding -->
-    <!-- Text for onboarding welcome header. -->
-    <string name="onboarding_header_2" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱢᱤᱫᱴᱟᱝ ᱵᱮᱥ ᱤᱱᱴᱚᱨᱱᱮᱴ ᱨᱮ ᱟᱢᱟᱜ ᱥᱟᱹᱜᱩᱱ ᱫᱟᱨᱟᱢ</string>
-    <!-- Text for the onboarding welcome message. -->
-    <string name="onboarding_message" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱦᱚᱲ ᱠᱚ ᱞᱟᱹᱜᱤᱫ, ᱵᱤᱱ ᱞᱟᱵᱷ ᱨᱮᱭᱟᱜ ᱢᱤᱫᱴᱟᱝ ᱵᱽᱨᱟᱣᱡᱚᱨ ᱾</string>
-    <!-- Text for the Firefox account onboarding sign in card header. -->
-    <string name="onboarding_account_sign_in_header" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱪᱟᱞᱟᱜ ᱢᱮ ᱡᱟᱦᱟᱸ ᱨᱮ ᱢᱟᱲᱟᱝ ᱛᱟᱦᱮᱸ ᱠᱟᱱᱟᱢ</string>
-    <!-- Text for the button to learn more about signing in to your Firefox account. -->
-    <string name="onboarding_manual_sign_in_description" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱟᱨᱟᱢ ᱛᱮ ᱯᱚᱨᱫᱟ ᱠᱚ ᱩᱪᱟᱹᱲ ᱞᱟᱹᱜᱤᱫ ᱥᱟᱫᱷᱚᱱ ᱥᱟᱨᱟ ᱨᱮ ᱴᱮᱵᱽ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫ ᱠᱚᱨᱮ ᱟᱹᱭᱩᱨ ᱢᱤᱫ ᱢᱮ ᱾</string>
-    <!-- Text for the button to manually sign into Firefox account. -->
-    <string name="onboarding_firefox_account_sign_in" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱵᱚᱞᱚᱱ ᱥᱩᱦᱤ</string>
     <!-- text to display in the snackbar once account is signed-in -->
     <string name="onboarding_firefox_account_sync_is_on">ᱥᱭᱝᱠ ᱪᱟᱹᱞᱩ ᱢᱮᱱᱟᱜ-ᱟ</string>
-    <!-- Text for the tracking protection onboarding card header -->
-    <string name="onboarding_tracking_protection_header" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱢᱩᱞ ᱞᱮᱠᱷᱟᱛᱮ ᱱᱤᱥᱚᱱ ᱨᱩᱠᱷᱤᱭᱟᱹᱭ ᱢᱮ</string>
-    <!-- Text for the tracking protection card description. The first parameter is the name of the application.-->
-    <string name="onboarding_tracking_protection_description_old" moz:RemovedIn="118" tools:ignore="UnusedResources">%1$s ᱫᱚ ᱵᱟᱦᱨᱮ ᱠᱚᱢᱯᱟᱱᱤ ᱠᱚ ᱣᱮᱵᱽ ᱨᱮ ᱟᱢ ᱯᱟᱸᱡᱟ ᱠᱚ ᱵᱚᱸᱫᱚᱜᱼᱟ ᱾</string>
-    <!-- Text for the tracking protection card description. -->
-    <string name="onboarding_tracking_protection_description" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱡᱷᱚᱛᱚ ᱥᱟᱭᱤᱴ ᱠᱚᱨᱮ ᱠᱩᱠᱤ ᱯᱟᱧᱡᱟ ᱫᱟᱱᱟᱲ ᱠᱚ ᱵᱟᱹᱲ ᱪᱷᱚ ᱞᱟᱹᱜᱤᱫ ᱢᱩᱴ ᱠᱩᱠᱤ ᱨᱩᱠᱷᱤᱭᱟᱹ ᱫᱮᱠᱷᱟᱣᱜ ᱠᱟᱱᱟ ᱾</string>
-    <!-- text for tracking protection radio button option for standard level of blocking -->
-    <string name="onboarding_tracking_protection_standard_button_2" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱵᱮᱥᱟᱜ (ᱢᱩᱞ ᱯᱷᱮᱲᱟᱛ)</string>
-    <!-- text for standard blocking option button description -->
-    <string name="onboarding_tracking_protection_standard_button_description_3" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱯᱨᱟᱭᱣᱮᱥᱭ ᱟᱨ ᱯᱚᱨᱯᱷᱚᱨᱢᱮᱱᱥ ᱞᱟᱹᱜᱤᱫ ᱥᱚᱢᱟᱱ ᱾ ᱥᱟᱦᱴᱟ ᱢᱩᱞ ᱞᱮᱠᱷᱟᱛᱮ ᱞᱟᱫᱮᱜᱼᱟ ᱾</string>
-    <!-- text for tracking protection radio button option for strict level of blocking -->
-    <string name="onboarding_tracking_protection_strict_option" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱱᱤᱦᱟᱹᱛ</string>
-    <!-- text for strict blocking option button description -->
-    <string name="onboarding_tracking_protection_strict_button_description_3" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱥᱟᱦᱴᱟ ᱞᱚᱜᱚᱱ ᱞᱳᱰ ᱞᱟᱹᱜᱤᱫ ᱯᱟᱧᱡᱟ ᱫᱟᱱᱟᱲ ᱠᱚ ᱵᱞᱚᱠ ᱠᱚᱣᱟᱭ, ᱦᱮᱞᱮ ᱥᱟᱦᱴᱟ ᱞᱳᱰ ᱨᱮ ᱰᱤᱜᱟᱹᱣ ᱦᱩᱭ ᱫᱟᱲᱮᱭᱟᱜᱼᱟ ᱾</string>
-    <!-- text for the toolbar position card header  -->
-    <string name="onboarding_toolbar_placement_header_1" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱟᱢᱟᱜ ᱴᱩᱞᱵᱟᱨ ᱯᱞᱮᱥᱢᱮᱱᱴ ᱨᱟᱠᱟᱵᱽ ᱛᱟᱢ</string>
-
-    <!-- Text for the toolbar position card description -->
-    <string name="onboarding_toolbar_placement_description" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱞᱟᱛᱟᱨ ᱨᱮ ᱫᱚᱦᱚᱭ ᱢᱮ, ᱵᱟᱝᱠᱷᱟᱱ ᱪᱮᱛᱟᱱ ᱥᱮᱫ ᱩᱪᱟᱹᱲ ᱢᱮ ᱾</string>
-    <!-- Text for the privacy notice onboarding card header -->
-    <string name="onboarding_privacy_notice_header_1" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱟᱢᱟᱜ ᱰᱟᱴᱟ ᱟᱢᱟᱜ ᱠᱚᱵᱚᱡᱽ ᱨᱮ ᱛᱟᱦᱮᱱ ᱟ</string>
-    <!-- Text for the privacy notice onboarding card description. -->
-    <string name="onboarding_privacy_notice_description" moz:RemovedIn="118" tools:ignore="UnusedResources">Firefox ᱴᱷᱮᱱ ᱡᱟᱦᱱᱟᱜ ᱜᱮ ᱟᱢ ᱚᱱᱞᱟᱭᱤᱱ ᱦᱟᱹᱴᱤᱧ ᱮᱫᱟᱢ ᱟᱨ ᱟᱢ ᱟᱞᱮ ᱥᱟᱶ ᱪᱮᱫ ᱮᱢ ᱦᱟᱹᱴᱤᱧ ᱮᱫᱟᱢ ᱚᱱᱟ ᱨᱮᱭᱟᱜ ᱠᱚᱵᱚᱡᱽ ᱮᱢᱟᱢ ᱠᱟᱱᱟᱭ ᱾</string>
-    <!-- Text for the button to read the privacy notice -->
-    <string name="onboarding_privacy_notice_read_button" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱟᱞᱮᱭᱟᱜ ᱱᱤᱥᱚᱱ ᱱᱚᱴᱤᱥ ᱯᱟᱲᱦᱟᱣ ᱯᱮ</string>
-
-    <!-- Text for the conclusion onboarding message -->
-    <string name="onboarding_conclusion_header" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱟᱹᱰᱤ ᱱᱟᱯᱟᱭ ᱤᱱᱴᱚᱨᱱᱮᱴ ᱠᱷᱩᱞᱟᱹ ᱞᱟᱹᱜᱤᱫ ᱥᱚᱡᱽ ᱜᱮᱭᱟᱢ ᱥᱮ ?</string>
-    <!-- text for the button to finish onboarding -->
-    <string name="onboarding_finish" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱵᱽᱨᱟᱣᱩᱡᱤᱝ ᱮᱦᱚᱵᱽ ᱢᱮ</string>
 
     <!-- Onboarding theme -->
-    <!-- text for the theme picker onboarding card header -->
-    <string name="onboarding_theme_picker_header" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱩᱭᱦᱟᱹᱨ ᱵᱟᱪᱷᱟᱣ ᱛᱟᱢ</string>
-    <!-- text for the theme picker onboarding card description -->
-    <string name="onboarding_theme_picker_description_2" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱛᱤᱱᱟᱹᱜ ᱜᱟᱱ ᱵᱮᱴᱨᱭ ᱵᱚᱪᱚᱛ ᱢᱮ ᱟᱨ ᱟᱢᱟᱜ ᱢᱮᱫ ᱵᱟᱧᱪᱟᱣ ᱛᱟᱢ ᱧᱩᱛ ᱩᱭᱦᱟᱹᱨ ᱪᱟᱹᱞᱩ ᱠᱟᱛᱮ ᱾</string>
-    <!-- Automatic theme setting (will follow device setting) -->
-    <string name="onboarding_theme_automatic_title" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱟᱡ ᱛᱮ</string>
-    <!-- Summary of automatic theme setting (will follow device setting) -->
-    <string name="onboarding_theme_automatic_summary" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱟᱢᱟᱜ ᱥᱟᱫᱷᱚᱱ ᱨᱮᱭᱟᱜ ᱥᱟᱡᱟᱣ ᱦᱟᱛᱟᱣ ᱟᱭ</string>
-    <!-- Theme setting for dark mode -->
-    <string name="onboarding_theme_dark_title" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱧᱩᱛ ᱩᱭᱦᱟᱹᱨ</string>
-    <!-- Theme setting for light mode -->
-    <string name="onboarding_theme_light_title" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱢᱟᱨᱥᱟᱞ ᱩᱭᱦᱟᱹᱨ</string>
-
     <!-- Text shown in snackbar when multiple tabs have been sent to device -->
     <string name="sync_sent_tabs_snackbar">ᱴᱮᱵᱽ ᱠᱚ ᱠᱩᱞ ᱦᱩᱭᱮᱱᱟ!</string>
     <!-- Text shown in snackbar when one tab has been sent to device  -->
@@ -1673,9 +1529,9 @@
     <string name="add_to_homescreen_description_2">ᱟᱢ ᱞᱚᱜᱚᱱ ᱵᱽᱨᱟᱣᱩᱡᱽ ᱟᱨ ᱮᱯ ᱞᱮᱠᱷᱟᱱ ᱢᱟᱨᱠᱷᱤ ᱤᱫᱤ ᱞᱟᱹᱜᱤᱫ ᱣᱮᱵᱥᱟᱭᱤᱴ ᱫᱚ ᱥᱟᱫᱷᱚᱱ ᱨᱮᱭᱟᱜ ᱚᱲᱟᱜ ᱥᱠᱨᱤᱱ ᱨᱮ ᱥᱮᱞᱮᱫᱽ ᱫᱟᱲᱮᱟᱜᱼᱟᱢ ᱾</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">ᱵᱚᱞᱚᱱ ᱠᱚ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱠᱚ</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱵᱚᱞᱚᱱ ᱠᱚ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱠᱚ</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">ᱞᱚᱜᱤᱱ ᱠᱚ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱠᱚ ᱥᱟᱺᱪᱟᱣ ᱢᱮ</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱞᱚᱜᱤᱱ ᱠᱚ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱠᱚ ᱥᱟᱺᱪᱟᱣ ᱢᱮ</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">ᱥᱟᱺᱪᱟᱣ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱠᱩᱠᱞᱤ</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1691,28 +1547,28 @@
     <string name="preferences_android_autofill_description">ᱟᱢᱟᱜ ᱥᱟᱫᱷᱚᱱ ᱨᱮ ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱯᱩᱨᱟᱹᱣ ᱢᱮ ᱾</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">ᱵᱚᱞᱚ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱵᱚᱞᱚ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">ᱞᱚᱜᱤᱱ ᱠᱚ ᱥᱭᱝᱠ ᱢᱮ</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱞᱚᱜᱤᱱ ᱠᱚ ᱥᱭᱝᱠ ᱢᱮ</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">ᱡᱷᱚᱛᱚ ᱥᱟᱫᱷᱚᱱ ᱵᱷᱤᱛᱨᱤ ᱨᱮ ᱵᱚᱞᱚ ᱠᱚ ᱥᱭᱝᱠ ᱢᱮ</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱡᱷᱚᱛᱚ ᱥᱟᱫᱷᱚᱱ ᱵᱷᱤᱛᱨᱤ ᱨᱮ ᱵᱚᱞᱚ ᱠᱚ ᱥᱭᱝᱠ ᱢᱮ</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">ᱥᱟᱺᱪᱟᱣᱟᱠᱟᱱ ᱞᱚᱜᱤᱱ ᱠᱚ</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱥᱟᱺᱪᱟᱣᱟᱠᱟᱱ ᱞᱚᱜᱤᱱ ᱠᱚ</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">ᱞᱚᱜᱤᱱ ᱚᱠᱟ %s ᱨᱮ ᱥᱟᱺᱪᱟᱣ ᱟᱨ ᱥᱭᱝᱠ ᱥᱟᱱᱟᱢ ᱠᱟᱱᱟ ᱚᱱᱟ ᱠᱚ ᱱᱚᱰᱮ ᱫᱮᱠᱷᱟᱣᱜᱼᱟ ᱾</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱞᱚᱜᱤᱱ ᱚᱠᱟ %s ᱨᱮ ᱥᱟᱺᱪᱟᱣ ᱟᱨ ᱥᱭᱝᱠ ᱥᱟᱱᱟᱢ ᱠᱟᱱᱟ ᱚᱱᱟ ᱠᱚ ᱱᱚᱰᱮ ᱫᱮᱠᱷᱟᱣᱜᱼᱟ ᱾</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">ᱥᱭᱝᱠ ᱵᱟᱵᱚᱛ ᱡᱟᱹᱥᱛᱤ ᱵᱟᱰᱟᱭ ᱢᱮ ᱾</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱥᱭᱝᱠ ᱵᱟᱵᱚᱛ ᱡᱟᱹᱥᱛᱤ ᱵᱟᱰᱟᱭ ᱢᱮ ᱾</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">ᱪᱷᱟᱰᱟ ᱠᱚ</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">ᱵᱚᱞᱚᱱ ᱥᱩᱦᱤ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱠᱚ ᱡᱟ ᱵᱟᱝ ᱥᱟᱺᱪᱟᱣ ᱠᱟᱱᱟ ᱚᱱᱟᱠᱩ ᱱᱚᱰᱮ ᱩᱫᱩᱜᱚᱣᱟ ᱾</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱵᱚᱞᱚᱱ ᱥᱩᱦᱤ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱠᱚ ᱡᱟ ᱵᱟᱝ ᱥᱟᱺᱪᱟᱣ ᱠᱟᱱᱟ ᱚᱱᱟᱠᱩ ᱱᱚᱰᱮ ᱩᱫᱩᱜᱚᱣᱟ ᱾</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">ᱞᱚᱜᱤᱱᱥ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱱᱚᱶᱟ ᱥᱟᱭᱤᱴ ᱞᱟᱹᱜᱤᱫ ᱵᱟᱝ ᱥᱟᱺᱪᱟᱣᱜᱼᱟ ᱾</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱞᱚᱜᱤᱱᱥ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱱᱚᱶᱟ ᱥᱟᱭᱤᱴ ᱞᱟᱹᱜᱤᱫ ᱵᱟᱝ ᱥᱟᱺᱪᱟᱣᱜᱼᱟ ᱾</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">ᱡᱷᱚᱛᱚ ᱪᱷᱟᱰᱟᱠᱚ ᱢᱮᱴᱟᱣ ᱢᱮ</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">ᱞᱚᱜᱤᱱ ᱠᱚ ᱥᱮᱸᱫᱽᱨᱟᱭ ᱢᱮ</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱞᱚᱜᱤᱱ ᱠᱚ ᱥᱮᱸᱫᱽᱨᱟᱭ ᱢᱮ</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">ᱥᱟᱭᱤᱴ</string>
     <!-- The header for the username for a login -->
@@ -1740,11 +1596,11 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱩᱠᱩ</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">ᱥᱟᱺᱪᱟᱣᱠᱟᱱ ᱵᱚᱞᱚᱱ ᱥᱩᱦᱤ ᱠᱚ ᱧᱮᱞ ᱞᱟᱹᱜᱤᱫ ᱛᱮ ᱚᱱᱞᱚᱠ ᱢᱮ</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱥᱟᱺᱪᱟᱣᱠᱟᱱ ᱵᱚᱞᱚᱱ ᱥᱩᱦᱤ ᱠᱚ ᱧᱮᱞ ᱞᱟᱹᱜᱤᱫ ᱛᱮ ᱚᱱᱞᱚᱠ ᱢᱮ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">ᱟᱢᱟᱜ ᱞᱚᱜᱤᱱ ᱠᱚ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱠᱚ ᱡᱟᱯᱛᱤ ᱢᱮ</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱟᱢᱟᱜ ᱞᱚᱜᱤᱱ ᱠᱚ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱠᱚ ᱡᱟᱯᱛᱤ ᱢᱮ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">ᱥᱟᱫᱷᱚᱱ ᱠᱩᱞᱩᱯ ᱪᱤᱱᱦᱟᱹ, ᱯᱤᱱ, ᱟᱨ ᱵᱟᱝ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱞᱟᱜᱟᱣᱢᱮ ᱟᱢᱟᱜ ᱥᱟᱺᱪᱟᱣ ᱞᱚᱜᱤᱱ ᱠᱚ ᱮᱢᱟᱱ ᱨᱩᱠᱷᱭᱟ ᱞᱟᱹᱜᱤᱫ ᱡᱩᱫᱤ ᱚᱞᱜᱟ ᱦᱚᱲ ᱴᱷᱮᱱ ᱟᱢᱟᱜ ᱥᱟᱫᱷᱚᱱ ᱛᱟᱦᱮᱸᱱ ᱠᱷᱟᱱ ᱾</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱥᱟᱫᱷᱚᱱ ᱠᱩᱞᱩᱯ ᱪᱤᱱᱦᱟᱹ, ᱯᱤᱱ, ᱟᱨ ᱵᱟᱝ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱞᱟᱜᱟᱣᱢᱮ ᱟᱢᱟᱜ ᱥᱟᱺᱪᱟᱣ ᱞᱚᱜᱤᱱ ᱠᱚ ᱮᱢᱟᱱ ᱨᱩᱠᱷᱭᱟ ᱞᱟᱹᱜᱤᱫ ᱡᱩᱫᱤ ᱚᱞᱜᱟ ᱦᱚᱲ ᱴᱷᱮᱱ ᱟᱢᱟᱜ ᱥᱟᱫᱷᱚᱱ ᱛᱟᱦᱮᱸᱱ ᱠᱷᱟᱱ ᱾</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">ᱛᱟᱭᱚᱢ ᱛᱮ</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1761,7 +1617,7 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">ᱢᱟᱲᱟᱝ ᱵᱮᱵᱷᱟᱨᱟᱜ</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">ᱞᱚᱜᱤᱱ ᱢᱮᱱᱭᱩ ᱥᱟᱞᱟᱭ ᱢᱮ</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱞᱚᱜᱤᱱ ᱢᱮᱱᱭᱩ ᱥᱟᱞᱟᱭ ᱢᱮ</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1769,30 +1625,30 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">ᱴᱷᱤᱠᱬᱟᱤᱭᱟᱹ</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ</string>
 
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">ᱥᱟᱺᱪᱟᱣ ᱟᱨ ᱠᱟᱰ ᱠᱚ ᱟᱡ ᱛᱮ ᱯᱮᱨᱮᱡᱽ ᱢᱮ</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱥᱟᱺᱪᱟᱣ ᱟᱨ ᱠᱟᱰ ᱠᱚ ᱟᱡ ᱛᱮ ᱯᱮᱨᱮᱡᱽ ᱢᱮ</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">ᱰᱟᱴᱟ ᱫᱚ ᱮᱱᱠᱨᱤᱯᱴᱮᱰ ᱠᱟᱱᱟ</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱰᱟᱴᱟ ᱫᱚ ᱮᱱᱠᱨᱤᱯᱴᱮᱰ ᱠᱟᱱᱟ</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">ᱡᱷᱚᱛᱚ ᱥᱟᱫᱷᱚᱱ ᱵᱷᱤᱛᱨᱤ ᱨᱮ ᱠᱟᱰ ᱥᱭᱝᱠ ᱢᱮ</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">ᱠᱟᱰ ᱥᱭᱝᱠ ᱢᱮ</string>
 
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ ᱥᱮᱞᱮᱫᱽ ᱢᱮ</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ ᱥᱮᱞᱮᱫᱽ ᱢᱮ</string>
 
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">ᱥᱟᱺᱪᱟᱣ ᱠᱟᱰ ᱠᱚ ᱢᱮᱱᱮᱡᱽ ᱢᱮ</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱥᱟᱺᱪᱟᱣ ᱠᱟᱰ ᱠᱚ ᱢᱮᱱᱮᱡᱽ ᱢᱮ</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">ᱴᱷᱤᱠᱬᱟᱹ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">ᱴᱷᱤᱠᱬᱟᱹᱤᱭᱟᱹ ᱡᱚᱛᱚᱱ ᱮᱢ</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">ᱴᱷᱤᱬᱟᱹᱤᱭᱟᱹ ᱥᱟᱺᱪᱟᱣ ᱟᱨ ᱟᱡ ᱛᱮ ᱯᱮᱨᱮᱡ ᱢᱮ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱴᱷᱤᱬᱟᱹᱤᱭᱟᱹ ᱥᱟᱺᱪᱟᱣ ᱟᱨ ᱟᱡ ᱛᱮ ᱯᱮᱨᱮᱡ ᱢᱮ</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">ᱮᱞ, ᱤᱢᱮᱞ ᱟᱨ ᱵᱷᱮᱡᱟ ᱴᱷᱤᱠᱬᱟᱹ ᱞᱮᱠᱷᱟ ᱵᱤᱵᱨᱚᱬ ᱢᱮᱥᱟᱭ ᱢᱮ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱮᱞ, ᱤᱢᱮᱞ ᱟᱨ ᱵᱷᱮᱡᱟ ᱴᱷᱤᱠᱬᱟᱹ ᱞᱮᱠᱷᱟ ᱵᱤᱵᱨᱚᱬ ᱢᱮᱥᱟᱭ ᱢᱮ</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">ᱠᱟᱰ ᱥᱮᱞᱮᱫᱽ ᱢᱮ</string>
@@ -1814,7 +1670,7 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">ᱠᱟᱰ ᱢᱮᱴᱟᱣ ᱢᱮ</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">ᱪᱮᱫ ᱟᱢ ᱜᱚᱴᱟ ᱛᱮ ᱢᱮᱱᱟᱢᱼᱟ ᱱᱚᱶᱟ ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ ᱢᱮᱴᱟᱣ ᱞᱟ.ᱜᱤᱛ ᱛᱮ?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱪᱮᱫ ᱟᱢ ᱜᱚᱴᱟ ᱛᱮ ᱢᱮᱱᱟᱢᱼᱟ ᱱᱚᱶᱟ ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ ᱢᱮᱴᱟᱣ ᱞᱟ.ᱜᱤᱛ ᱛᱮ?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">ᱢᱮᱴᱟᱣ ᱢᱮ</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1826,15 +1682,15 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">ᱥᱟᱺᱪᱟᱣ ᱠᱟᱱ ᱠᱟᱰ</string>
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">ᱴᱷᱤᱠ ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ ᱮᱞ ᱟᱫᱮᱨ ᱢᱮ</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱴᱷᱤᱠ ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ ᱮᱞ ᱟᱫᱮᱨ ᱢᱮ</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">ᱱᱚᱶᱟ ᱡᱟᱭᱜᱟ ᱯᱮᱨᱮᱡᱽ ᱢᱮ</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱱᱚᱶᱟ ᱡᱟᱭᱜᱟ ᱯᱮᱨᱮᱡᱽ ᱢᱮ</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">ᱥᱟᱺᱪᱟᱣᱟᱠᱟᱱ ᱠᱟᱰ ᱠᱚ ᱧᱮᱞ ᱞᱟᱹᱜᱤᱫ ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮ</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">ᱟᱢᱟᱜ ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ ᱨᱩᱠᱷᱤᱭᱟᱹᱭ ᱢᱮ</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱟᱢᱟᱜ ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ ᱨᱩᱠᱷᱤᱭᱟᱹᱭ ᱢᱮ</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">ᱥᱟᱫᱷᱚᱱ ᱠᱩᱞᱩᱯ ᱪᱤᱱᱦᱟᱹ, ᱯᱤᱱ, ᱟᱨ ᱵᱟᱝ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱢᱟᱜ ᱥᱟᱺᱪᱟᱣ ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ ᱠᱚ ᱮᱢᱟᱱ ᱨᱩᱠᱷᱭᱟ ᱞᱟᱹᱜᱤᱫ ᱡᱩᱫᱤ ᱚᱞᱜᱟ ᱦᱚᱲ ᱴᱷᱮᱱ ᱟᱢᱟᱜ ᱥᱟᱫᱷᱚᱱ ᱛᱟᱦᱮᱸᱱ ᱠᱷᱟᱱ ᱾</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱥᱟᱫᱷᱚᱱ ᱠᱩᱞᱩᱯ ᱪᱤᱱᱦᱟᱹ, ᱯᱤᱱ, ᱟᱨ ᱵᱟᱝ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱢᱟᱜ ᱥᱟᱺᱪᱟᱣ ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ ᱠᱚ ᱮᱢᱟᱱ ᱨᱩᱠᱷᱭᱟ ᱞᱟᱹᱜᱤᱫ ᱡᱩᱫᱤ ᱚᱞᱜᱟ ᱦᱚᱲ ᱴᱷᱮᱱ ᱟᱢᱟᱜ ᱥᱟᱫᱷᱚᱱ ᱛᱟᱦᱮᱸᱱ ᱠᱷᱟᱱ ᱾</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">ᱱᱤᱛᱚᱜ ᱥᱟᱡᱟᱣ ᱢᱮ</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1842,7 +1698,7 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">ᱟᱢᱟᱜ ᱥᱟᱫᱷᱚᱱ ᱚᱱᱞᱚᱠ ᱢᱮ</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">ᱫᱚᱦᱚ ᱠᱟᱱ ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ ᱵᱤᱵᱨᱚᱬ ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮ</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱫᱚᱦᱚ ᱠᱟᱱ ᱠᱨᱮᱰᱤᱴ ᱠᱟᱰ ᱵᱤᱵᱨᱚᱬ ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮ</string>
 
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">ᱴᱷᱤᱠᱬᱟᱹ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
@@ -1851,11 +1707,11 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">ᱴᱷᱤᱠᱬᱟᱹᱤᱭᱟᱹ ᱡᱚᱛᱚᱱ ᱮᱢ</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">ᱯᱩᱭᱞᱩ ᱧᱩᱛᱩᱢ</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">ᱯᱩᱭᱞᱩ ᱧᱩᱛᱩᱢ</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">ᱛᱟᱞᱟ ᱧᱩᱛᱩᱢ</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">ᱛᱟᱞᱟ ᱧᱩᱛᱩᱢ</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">ᱢᱩᱪᱟᱹᱫ ᱧᱩᱛᱩᱢ</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">ᱢᱩᱪᱟᱹᱫ ᱧᱩᱛᱩᱢ</string>
 
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">ᱥᱚᱰᱚᱠ ᱴᱷᱤᱠᱬᱟᱹ</string>
@@ -1881,7 +1737,7 @@
     <string name="addressess_delete_address_button">ᱴᱷᱤᱠᱬᱟᱹ ᱢᱮᱴᱟᱣ ᱢᱮ</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">ᱪᱮᱫ ᱟᱢ ᱜᱚᱴᱟ ᱛᱮ ᱢᱮᱱᱟᱢᱼᱟ ᱱᱚᱶᱟ ᱴᱷᱤᱠᱬᱟᱹ ᱢᱮᱴᱟᱣ ᱞᱟ.ᱜᱤᱛ ᱛᱮ?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱪᱮᱫ ᱟᱢ ᱜᱚᱴᱟ ᱛᱮ ᱢᱮᱱᱟᱢᱼᱟ ᱱᱚᱶᱟ ᱴᱷᱤᱠᱬᱟᱹ ᱢᱮᱴᱟᱣ ᱞᱟ.ᱜᱤᱛ ᱛᱮ?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">ᱢᱮᱴᱟᱣ ᱢᱮ</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1898,29 +1754,19 @@
     <string name="search_engine_add_custom_search_engine_button_content_description">ᱢᱤᱫᱴᱟᱝ ᱱᱟᱶᱟ ᱥᱮᱸᱫᱽᱨᱟ ᱤᱧᱡᱤᱱ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
     <!-- Title of the Edit search engine screen -->
     <string name="search_engine_edit_custom_search_engine_title">ᱥᱮᱸᱫᱽᱨᱟ ᱤᱧᱡᱤᱱ ᱥᱟᱯᱲᱟᱣ ᱢᱮ</string>
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
-    <string name="search_engine_add_button_content_description">ᱥᱮᱞᱮᱫᱽ ᱢᱮ</string>
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">ᱥᱟᱺᱪᱟᱣ</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">ᱥᱟᱯᱲᱟᱣ</string>
     <!-- Text for the menu button to delete a search engine -->
     <string name="search_engine_delete">ᱢᱮᱴᱟᱣ ᱢᱮ</string>
 
-    <!-- Text for the button to create a custom search engine on the Add search engine screen -->
-    <string name="search_add_custom_engine_label_other">ᱮᱴᱟᱜ-ᱟᱜ</string>
     <!-- Label for the TextField in which user enters custom search engine name -->
     <string name="search_add_custom_engine_name_label">ᱧᱩᱛᱩᱢ</string>
-    <!-- Placeholder text shown in the Search Engine Name TextField before a user enters text -->
-    <string name="search_add_custom_engine_name_hint">ᱧᱩᱛᱩᱢ</string>
 
     <!-- Placeholder text shown in the Search Engine Name text field before a user enters text -->
     <string name="search_add_custom_engine_name_hint_2">ᱥᱮᱸᱫᱽᱨᱟ ᱤᱧᱡᱤᱱ ᱧᱩᱛᱩᱢ</string>
     <!-- Label for the TextField in which user enters custom search engine URL -->
     <string name="search_add_custom_engine_url_label">ᱥᱴᱨᱤᱝ URL ᱥᱮᱸᱫᱽᱨᱟᱭ ᱢᱮ</string>
     <!-- Placeholder text shown in the Search String TextField before a user enters text -->
-    <string name="search_add_custom_engine_search_string_hint">ᱵᱮᱵᱷᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱥᱴᱨᱭᱸᱜ ᱥᱮᱸᱫᱽᱨᱟᱭ ᱢᱮ</string>
-    <!-- Placeholder text shown in the Search String TextField before a user enters text -->
     <string name="search_add_custom_engine_search_string_hint_2">ᱥᱮᱸᱫᱽᱨᱟ ᱞᱟᱹᱜᱤᱫ URL ᱵᱮᱵᱷᱟᱨ</string>
     <!-- Description text for the Search String TextField. The %s is part of the string -->
     <string name="search_add_custom_engine_search_string_example" formatted="false">“%s” ᱥᱟᱞᱟᱜ ᱠᱣᱮᱨᱭ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾ ᱡᱮᱢᱚᱱ:\nhttps://www.google.com/search?q=%s</string>
@@ -1932,8 +1778,6 @@
     <!-- Placeholder text shown in the Search Suggestion String TextField before a user enters text -->
     <string name="search_add_custom_engine_suggest_string_hint">ᱥᱚᱞᱟᱦ ᱥᱮᱸᱫᱽᱨᱟ API URL</string>
     <!-- Description text for the Search Suggestion String TextField. The %s is part of the string -->
-    <string name="search_add_custom_engine_suggest_string_example" formatted="false" moz:RemovedIn="118" tools:ignore="UnusedResources">ᱯᱟᱱᱛᱮ ᱫᱚ “%s” ᱥᱟᱞᱟᱜ ᱛᱮ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾ ᱫᱟᱹᱭᱠᱟᱹ ᱺ \nhttp://suggestqueries.google.com/complete/search?client=firefox&amp;q=%s</string>
-    <!-- Description text for the Search Suggestion String TextField. The %s is part of the string -->
     <string name="search_add_custom_engine_suggest_string_example_2" formatted="false">ᱯᱟᱱᱛᱮ ᱫᱚ “%s” ᱥᱟᱞᱟᱜ ᱛᱮ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾ ᱫᱟᱹᱭᱠᱟᱹ ᱺ \nhttps://suggestqueries.google.com/complete/search?client=firefox&amp;q=%s</string>
     <!-- The text for the "Save" button for saving a custom search engine -->
     <string name="search_custom_engine_save_button">ᱥᱟᱺᱪᱟᱣ ᱢᱮ</string>
@@ -1992,29 +1836,29 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">ᱥᱟᱯᱲᱟᱣ</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">ᱪᱮᱫ ᱟᱢ ᱜᱚᱴᱟ ᱢᱮᱱᱟᱢᱼᱟ ᱱᱚᱶᱟ ᱞᱚᱜᱤᱱ ᱢᱮᱴᱟᱣ ᱞᱟ.ᱜᱤᱫ ᱛᱮ?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱪᱮᱫ ᱟᱢ ᱜᱚᱴᱟ ᱢᱮᱱᱟᱢᱼᱟ ᱱᱚᱶᱟ ᱞᱚᱜᱤᱱ ᱢᱮᱴᱟᱣ ᱞᱟ.ᱜᱤᱫ ᱛᱮ?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">ᱢᱮᱴᱟᱣ ᱢᱮ</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">ᱵᱟᱹᱰᱨᱟᱹ</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">ᱮᱴᱟᱜᱟᱜ ᱠᱚ ᱞᱚᱜᱤᱱ</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱮᱴᱟᱜᱟᱜ ᱠᱚ ᱞᱚᱜᱤᱱ</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">ᱣᱤᱵ ᱴᱷᱤᱠᱬᱟᱹ ᱞᱚᱜᱤᱱ ᱵᱚᱞᱚ ᱞᱟᱹᱜᱤᱫ ᱥᱟᱯᱲᱟᱣ ᱚᱞ ᱡᱟᱭᱜᱟ ᱾</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱣᱤᱵ ᱴᱷᱤᱠᱬᱟᱹ ᱞᱚᱜᱤᱱ ᱵᱚᱞᱚ ᱞᱟᱹᱜᱤᱫ ᱥᱟᱯᱲᱟᱣ ᱚᱞ ᱡᱟᱭᱜᱟ ᱾</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱞᱚᱜᱤᱱ ᱞᱟᱹᱜᱤᱫ ᱥᱟᱯᱲᱟᱣ ᱚᱞ ᱡᱟᱭᱜᱟ ᱾</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱞᱚᱜᱤᱱ ᱞᱟᱹᱜᱤᱫ ᱥᱟᱯᱲᱟᱣ ᱚᱞ ᱡᱟᱭᱜᱟ ᱾</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱞᱚᱜᱤᱱ ᱞᱟᱹᱜᱤᱫ ᱥᱟᱯᱲᱟᱣ ᱚᱞ ᱡᱟᱭᱜᱟ ᱾</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱞᱚᱜᱤᱱ ᱞᱟᱹᱜᱤᱫ ᱥᱟᱯᱲᱟᱣ ᱚᱞ ᱡᱟᱭᱜᱟ ᱾</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">ᱞᱚᱜᱤᱱ ᱵᱚᱫᱚᱞ ᱠᱚ ᱥᱟᱺᱪᱟᱣ ᱢᱮ ᱾</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱞᱚᱜᱤᱱ ᱵᱚᱫᱚᱞ ᱠᱚ ᱥᱟᱺᱪᱟᱣ ᱢᱮ ᱾</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">ᱥᱟᱯᱲᱟᱣ</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱥᱟᱯᱲᱟᱣ</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">ᱱᱟᱶᱟ ᱵᱚᱞᱚ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱱᱟᱶᱟ ᱵᱚᱞᱚ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱨᱮᱭᱟᱜ ᱫᱚᱨᱠᱟᱨ ᱢᱮᱱᱟᱜ-ᱟ</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱨᱮᱭᱟᱜ ᱫᱚᱨᱠᱟᱨ ᱢᱮᱱᱟᱜ-ᱟ</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱧᱩᱛᱩᱢ ᱫᱚᱨᱠᱟᱨ</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱧᱩᱛᱩᱢ ᱫᱚᱨᱠᱟᱨ</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">ᱦᱚᱥᱴᱧᱩᱛᱩᱢ ᱫᱚᱨᱠᱟᱨ ᱠᱟᱱᱟ</string>
     <!-- Voice search button content description  -->
@@ -2064,14 +1908,14 @@
 
     <!-- Label for the preference to show the shortcuts for the most visited top sites on the homepage -->
     <string name="top_sites_toggle_top_recent_sites_4">ᱠᱷᱟᱴᱚᱢᱟᱪᱷᱟ ᱠᱚ</string>
-	<!-- Title text displayed in the rename top site dialog. -->
-	<string name="top_sites_rename_dialog_title">ᱧᱩᱛᱩᱢ</string>
+    <!-- Title text displayed in the rename top site dialog. -->
+    <string name="top_sites_rename_dialog_title">ᱧᱩᱛᱩᱢ</string>
     <!-- Hint for renaming title of a shortcut -->
     <string name="shortcut_name_hint">ᱠᱷᱟᱴᱚᱢᱟᱪᱷᱟ ᱧᱩᱛᱩᱢ</string>
-	<!-- Button caption to confirm the renaming of the top site. -->
-	<string name="top_sites_rename_dialog_ok">ᱴᱷᱤᱠ</string>
-	<!-- Dialog button text for canceling the rename top site prompt. -->
-	<string name="top_sites_rename_dialog_cancel">ᱵᱟᱹᱰᱨᱟᱹ</string>
+    <!-- Button caption to confirm the renaming of the top site. -->
+    <string name="top_sites_rename_dialog_ok">ᱴᱷᱤᱠ</string>
+    <!-- Dialog button text for canceling the rename top site prompt. -->
+    <string name="top_sites_rename_dialog_cancel">ᱵᱟᱹᱰᱨᱟᱹ</string>
 
     <!-- Text for the menu button to open the homepage settings. -->
     <string name="top_sites_menu_settings">ᱥᱟᱡᱟᱣ ᱠᱚ</string>
@@ -2111,7 +1955,7 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">%s ᱥᱮᱸᱫᱽᱨᱟᱭ ᱢᱮ</string>
 
-    <!-- Default browser experiment -->
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Firefox ᱟᱡ ᱛᱮ ᱠᱷᱩᱞᱟᱹ ᱪᱷᱚ ᱞᱟᱹᱜᱤᱫ ᱣᱮᱵᱥᱟᱭᱤᱴ, ᱤᱢᱮᱞ, ᱟᱨ ᱢᱮᱥᱮᱡᱽ ᱨᱮᱭᱟᱜ ᱞᱤᱝᱠ ᱥᱮᱴ ᱢᱮ ᱾ </string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2121,7 +1965,7 @@
     <string name="radio_preference_info_content_description">ᱟᱨᱦᱚᱸ ᱵᱤᱵᱨᱚᱬ ᱞᱟᱹᱜᱤᱫ ᱱᱚᱰᱮ ᱚᱛᱟᱭ ᱢᱮ</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">ᱪᱮᱛᱟᱱ ᱥᱮᱱ ᱱᱮᱣᱤᱜᱮᱴ ᱢᱮ</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">ᱪᱮᱛᱟᱱ ᱥᱮᱱ ᱱᱮᱣᱤᱜᱮᱴ ᱢᱮ</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">ᱵᱚᱸᱫ</string>
@@ -2172,4 +2016,20 @@
     <string name="a11y_action_label_read_article">ᱚᱱᱚᱞ ᱯᱟᱲᱦᱟᱣ ᱢᱮ</string>
     <!-- Action label for links to the Firefox Pocket website. Talkback will append this to say "Double tap to open link to learn more". -->
     <string name="a11y_action_label_pocket_learn_more">ᱰᱷᱮᱨ ᱵᱟᱲᱟᱭ ᱞᱟᱹᱜᱤᱫ ᱞᱤᱝᱠ ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮ</string>
+
+    <!-- Translations feature-->
+
+
+    <!-- The total tab count category in the tab count section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_count_total">ᱢᱳᱴ</string>
+    <!-- The title of the tab creation tool section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_title">ᱴᱮᱵᱽ ᱛᱮᱭᱟᱨ ᱦᱟᱹᱛᱤᱭᱟᱨ</string>
+    <!-- The label of the text field in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_text_field_label">ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱴᱮᱵᱽ ᱨᱮᱭᱟᱜ ᱛᱚᱲᱟᱜᱟᱱ</string>
+    <!-- The button text to add tabs to the active tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_active">ᱠᱟᱹᱢᱤ ᱠᱟᱱ ᱴᱮᱵᱽ ᱠᱚ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
+    <!-- The button text to add tabs to the inactive tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_inactive">ᱵᱟᱝ ᱠᱟᱹᱢᱤ ᱴᱮᱵᱽᱠᱚᱨᱮ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
+    <!-- The button text to add tabs to the private tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_private">ᱱᱤᱡᱮᱨᱟᱜ ᱴᱮᱵᱽ ᱥᱮᱞᱮᱫᱽ ᱢᱮ</string>
 </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 9a6511ed1..25a69fae9 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -734,7 +734,7 @@
     <!-- Preference for syncing credit cards -->
     <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditne kartice</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2">Načini plačila</string>
+    <string name="preferences_sync_credit_cards_2">Plačilna sredstva</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Naslove</string>
 
@@ -1808,14 +1808,16 @@
     <string name="preferences_addresses">Naslovi</string>
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditne kartice</string>
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2">Plačilna sredstva</string>
     <!-- Preference for saving and autofilling credit cards -->
     <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Shrani in samodejno izpolni kartice</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2">Shranjuj in izpolnjuj načine plačila</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Shranjuj in izpolnjuj plačilna sredstva</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Podatki so šifrirani</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s šifrira vse načine plačila, ki jih shranite</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s šifrira vsa plačilna sredstva, ki jih shranite</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sinhroniziraj kartice med napravami</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->

From 23a137054ee5867186e6f9dff9063730fd8298d1 Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Mon, 26 Feb 2024 10:18:44 +0000
Subject: [PATCH 208/222] Bug 1879512 - Added experimental onboarding images
 for Nimbus

(cherry picked from commit 87f1f74d26dd5a96e9d664aca04b7deb2f2e6dfd)
---
 app/lint-baseline.xml                         |  10 +
 .../drawable/ic_onboarding_key_features.xml   | 423 ++++++++++++++++++
 .../ic_onboarding_key_features_icons_only.xml | 307 +++++++++++++
 app/src/main/res/raw/keep.xml                 |   2 +-
 4 files changed, 741 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/ic_onboarding_key_features.xml
 create mode 100644 app/src/main/res/drawable/ic_onboarding_key_features_icons_only.xml

diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index b4ce2b38e..c9eb994da 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1101,6 +1101,16 @@
             column="1"/>
     </issue>
 
+    <issue id="UnusedResources"
+        message="The resource R.drawable.ic_onboarding_key_features appears to be unused">
+        <location file="src/main/res/drawable/ic_onboarding_key_features.xml" />
+    </issue>
+
+    <issue id="UnusedResources"
+        message="The resource R.drawable.ic_onboarding_key_features_icons_only appears to be unused">
+        <location file="src/main/res/drawable/ic_onboarding_key_features_icons_only.xml" />
+    </issue>
+
     <issue
         id="IconXmlAndPng"
         message="The following images appear both as density independent `.xml` files and as bitmap files: /Users/oracle/Projects/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_normal.png, /Users/oracle/Projects/fenix/app/src/main/res/drawable-night/ic_logo_wordmark_normal.xml">
diff --git a/app/src/main/res/drawable/ic_onboarding_key_features.xml b/app/src/main/res/drawable/ic_onboarding_key_features.xml
new file mode 100644
index 000000000..c5eeaffcf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_onboarding_key_features.xml
@@ -0,0 +1,423 @@
+<vector xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android" android:height="320dp" android:viewportHeight="193.94" android:viewportWidth="200" android:width="329.99896dp">
+      
+    <path android:fillColor="#ab71ff" android:pathData="M179.44,129.92c-17.11,7.31 -23.09,39.17 -26.65,46.24 -7.44,15.67 -41.53,6.53 -54.54,6.53s-26.96,10.45 -47.73,11.23c-20.76,0.78 -33.16,-20.38 -33.16,-46.76S0,106.93 0,88.9s20.14,-16.72 33.16,-23.77c13.02,-7.05 23.55,-56.43 60.74,-63.48 37.19,-7.05 59.5,9.93 81.51,23.25 22,13.32 26.65,40.49 23.86,55.64 -2.79,15.15 1.55,40.23 -19.83,49.37Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#f9f9fb" android:pathData="M7.27,36.97c0,-3.35 2.71,-6.06 6.06,-6.06h173.33c3.35,0 6.06,2.71 6.06,6.06v112.73c0,3.35 -2.71,6.06 -6.06,6.06H13.33c-3.35,0 -6.06,-2.71 -6.06,-6.06V36.97Z" android:strokeColor="#ededf0" android:strokeWidth="1"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M19.06,49.9l-0.05,-1.69h0.24l2.86,-3.36h1.48l-2.84,3.28 -0.72,0.64 -0.97,1.13ZM17.87,52.12v-7.26h1.3v7.26h-1.3ZM22.23,52.12l-2.38,-3.36 0.92,-0.87 3.05,4.22h-1.58Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M26.75,52.23c-0.55,0 -1.02,-0.12 -1.41,-0.35 -0.39,-0.23 -0.69,-0.56 -0.9,-0.99s-0.32,-0.93 -0.32,-1.51v-0c0,-0.58 0.1,-1.08 0.31,-1.51 0.21,-0.43 0.51,-0.76 0.9,-1 0.39,-0.24 0.84,-0.36 1.36,-0.36 0.52,0 0.97,0.12 1.35,0.35 0.38,0.23 0.67,0.55 0.88,0.96 0.2,0.41 0.31,0.9 0.31,1.45v0.41h-4.47v-0.84h3.85l-0.59,0.78v-0.5c0,-0.37 -0.06,-0.67 -0.17,-0.91 -0.11,-0.24 -0.26,-0.42 -0.46,-0.54 -0.19,-0.12 -0.42,-0.18 -0.68,-0.18 -0.26,0 -0.49,0.06 -0.69,0.19 -0.2,0.12 -0.36,0.31 -0.47,0.55 -0.11,0.24 -0.17,0.54 -0.17,0.89v0.5c0,0.34 0.06,0.63 0.17,0.87 0.11,0.24 0.28,0.42 0.48,0.55 0.21,0.13 0.46,0.19 0.75,0.19 0.22,0 0.42,-0.03 0.58,-0.1 0.16,-0.07 0.3,-0.15 0.4,-0.24 0.1,-0.09 0.17,-0.18 0.21,-0.27l0.02,-0.04h1.19l-0.01,0.05c-0.04,0.18 -0.12,0.36 -0.24,0.54 -0.11,0.18 -0.27,0.35 -0.47,0.51 -0.19,0.15 -0.43,0.28 -0.71,0.38 -0.28,0.09 -0.61,0.14 -0.98,0.14Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M30.88,54.05c-0.08,0 -0.16,-0 -0.24,-0 -0.08,-0 -0.16,-0.01 -0.24,-0.02v-0.96c0.05,0.01 0.11,0.01 0.18,0.01 0.07,0 0.13,0 0.2,0 0.26,0 0.46,-0.06 0.62,-0.17 0.16,-0.11 0.27,-0.29 0.34,-0.54l0.07,-0.25 -1.97,-5.5h1.37l1.45,4.87 -0.34,-0.57h0.43l-0.33,0.57 1.45,-4.87h1.32l-1.97,5.62c-0.16,0.46 -0.34,0.82 -0.55,1.08 -0.2,0.26 -0.45,0.45 -0.73,0.56 -0.29,0.11 -0.63,0.17 -1.04,0.17Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M39.3,52.12v-4.53h-0.9v-0.97h0.9v-0.54c0,-0.37 0.06,-0.67 0.19,-0.92 0.13,-0.24 0.32,-0.42 0.59,-0.54 0.26,-0.12 0.6,-0.18 1.01,-0.18 0.13,0 0.26,0 0.37,0.02 0.11,0.01 0.22,0.02 0.32,0.04v0.88c-0.05,-0.01 -0.11,-0.01 -0.18,-0.02 -0.07,-0.01 -0.15,-0.01 -0.24,-0.01 -0.3,0 -0.5,0.07 -0.63,0.21 -0.12,0.13 -0.19,0.33 -0.19,0.6v0.47h1.19v0.97h-1.17v4.53h-1.25Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M45.04,52.23c-0.55,0 -1.02,-0.12 -1.41,-0.35 -0.39,-0.23 -0.69,-0.56 -0.9,-0.99s-0.32,-0.93 -0.32,-1.51v-0c0,-0.58 0.1,-1.08 0.31,-1.51 0.21,-0.43 0.51,-0.76 0.9,-1 0.39,-0.24 0.84,-0.36 1.36,-0.36 0.52,0 0.97,0.12 1.35,0.35 0.38,0.23 0.67,0.55 0.88,0.96 0.2,0.41 0.31,0.9 0.31,1.45v0.41h-4.47v-0.84h3.85l-0.59,0.78v-0.5c0,-0.37 -0.06,-0.67 -0.17,-0.91s-0.26,-0.42 -0.46,-0.54c-0.19,-0.12 -0.42,-0.18 -0.68,-0.18 -0.26,0 -0.49,0.06 -0.69,0.19 -0.2,0.12 -0.36,0.31 -0.47,0.55 -0.11,0.24 -0.17,0.54 -0.17,0.89v0.5c0,0.34 0.06,0.63 0.17,0.87 0.11,0.24 0.28,0.42 0.48,0.55 0.21,0.13 0.46,0.19 0.75,0.19 0.22,0 0.42,-0.03 0.58,-0.1 0.16,-0.07 0.3,-0.15 0.4,-0.24 0.1,-0.09 0.17,-0.18 0.21,-0.27l0.02,-0.04h1.19l-0.01,0.05c-0.04,0.18 -0.12,0.36 -0.24,0.54 -0.11,0.18 -0.27,0.35 -0.47,0.51 -0.19,0.15 -0.43,0.28 -0.71,0.38 -0.28,0.09 -0.61,0.14 -0.98,0.14Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M50.22,52.21c-0.35,0 -0.66,-0.07 -0.93,-0.2 -0.27,-0.13 -0.49,-0.32 -0.64,-0.57 -0.15,-0.25 -0.23,-0.54 -0.23,-0.88v-0.01c0,-0.33 0.08,-0.61 0.24,-0.84 0.16,-0.24 0.4,-0.42 0.71,-0.56 0.31,-0.13 0.69,-0.21 1.14,-0.24l2.03,-0.13v0.83l-1.86,0.12c-0.35,0.02 -0.61,0.09 -0.78,0.22 -0.17,0.13 -0.25,0.31 -0.25,0.53v0.01c0,0.23 0.09,0.42 0.27,0.55 0.18,0.13 0.41,0.2 0.69,0.2 0.25,0 0.48,-0.05 0.67,-0.15 0.2,-0.1 0.35,-0.24 0.47,-0.41 0.11,-0.17 0.17,-0.37 0.17,-0.59v-1.74c0,-0.28 -0.09,-0.48 -0.26,-0.63 -0.17,-0.15 -0.43,-0.22 -0.77,-0.22 -0.29,0 -0.52,0.05 -0.7,0.15 -0.18,0.1 -0.3,0.24 -0.37,0.42l-0.01,0.02h-1.18l0,-0.05c0.04,-0.31 0.16,-0.58 0.36,-0.81 0.2,-0.23 0.47,-0.41 0.8,-0.54 0.33,-0.13 0.71,-0.19 1.15,-0.19 0.48,0 0.88,0.07 1.21,0.22 0.33,0.14 0.58,0.36 0.75,0.63 0.17,0.28 0.26,0.61 0.26,0.99v3.76h-1.24v-0.75h-0.09c-0.1,0.17 -0.23,0.33 -0.39,0.45 -0.16,0.13 -0.34,0.22 -0.54,0.29 -0.2,0.07 -0.43,0.1 -0.67,0.1Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M56.78,52.15c-0.63,0 -1.08,-0.12 -1.36,-0.35s-0.42,-0.61 -0.42,-1.14v-3.07h-0.86v-0.97h0.86v-1.35h1.27v1.35h1.16v0.97h-1.16v2.77c0,0.27 0.06,0.47 0.17,0.6 0.12,0.12 0.31,0.19 0.56,0.19 0.09,0 0.16,-0 0.22,-0 0.06,-0.01 0.13,-0.01 0.2,-0.02v0.97c-0.09,0.02 -0.19,0.03 -0.3,0.04 -0.11,0.01 -0.23,0.02 -0.35,0.02Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M60.45,52.23c-0.41,0 -0.75,-0.08 -1.03,-0.24 -0.28,-0.16 -0.49,-0.39 -0.63,-0.7 -0.14,-0.31 -0.21,-0.68 -0.21,-1.12v-3.56h1.25v3.27c0,0.43 0.08,0.75 0.25,0.96 0.17,0.21 0.44,0.32 0.82,0.32 0.2,0 0.38,-0.03 0.53,-0.09 0.16,-0.06 0.29,-0.15 0.39,-0.27 0.1,-0.12 0.18,-0.26 0.24,-0.42 0.05,-0.17 0.08,-0.36 0.08,-0.56v-3.2h1.25v5.5h-1.25v-0.84h-0.09c-0.08,0.19 -0.2,0.36 -0.35,0.51 -0.15,0.14 -0.33,0.25 -0.54,0.33 -0.21,0.07 -0.45,0.11 -0.71,0.11Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M64.89,52.12v-5.5h1.25v0.85h0.09c0.09,-0.3 0.26,-0.52 0.5,-0.69 0.24,-0.16 0.55,-0.25 0.91,-0.25 0.09,0 0.19,0.01 0.28,0.02 0.09,0.01 0.17,0.02 0.23,0.04v1.12c-0.1,-0.02 -0.2,-0.04 -0.31,-0.05 -0.1,-0.01 -0.21,-0.02 -0.32,-0.02 -0.28,0 -0.52,0.05 -0.73,0.16 -0.21,0.1 -0.37,0.25 -0.48,0.45 -0.11,0.19 -0.17,0.42 -0.17,0.68v3.19h-1.25Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M71.34,52.23c-0.55,0 -1.02,-0.12 -1.41,-0.35 -0.39,-0.23 -0.69,-0.56 -0.9,-0.99 -0.21,-0.43 -0.32,-0.93 -0.32,-1.51v-0c0,-0.58 0.1,-1.08 0.31,-1.51 0.21,-0.43 0.51,-0.76 0.9,-1 0.39,-0.24 0.84,-0.36 1.36,-0.36 0.52,0 0.97,0.12 1.35,0.35 0.38,0.23 0.67,0.55 0.88,0.96 0.2,0.41 0.31,0.9 0.31,1.45v0.41h-4.47v-0.84h3.85l-0.59,0.78v-0.5c0,-0.37 -0.06,-0.67 -0.17,-0.91 -0.11,-0.24 -0.26,-0.42 -0.46,-0.54 -0.19,-0.12 -0.42,-0.18 -0.68,-0.18 -0.26,0 -0.49,0.06 -0.69,0.19 -0.2,0.12 -0.36,0.31 -0.47,0.55 -0.11,0.24 -0.17,0.54 -0.17,0.89v0.5c0,0.34 0.06,0.63 0.17,0.87 0.11,0.24 0.28,0.42 0.48,0.55 0.21,0.13 0.46,0.19 0.75,0.19 0.22,0 0.42,-0.03 0.58,-0.1 0.16,-0.07 0.3,-0.15 0.4,-0.24 0.1,-0.09 0.17,-0.18 0.21,-0.27l0.02,-0.04h1.19l-0.01,0.05c-0.04,0.18 -0.12,0.36 -0.24,0.54 -0.11,0.18 -0.27,0.35 -0.47,0.51 -0.19,0.15 -0.43,0.28 -0.71,0.38 -0.28,0.09 -0.61,0.14 -0.98,0.14Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M77.1,52.23c-0.47,0 -0.87,-0.07 -1.21,-0.2 -0.34,-0.13 -0.6,-0.32 -0.79,-0.55 -0.19,-0.24 -0.31,-0.51 -0.35,-0.83v-0.01h1.24l0,0.01c0.07,0.19 0.19,0.35 0.38,0.47 0.18,0.12 0.43,0.18 0.74,0.18 0.21,0 0.39,-0.03 0.55,-0.09 0.16,-0.06 0.28,-0.14 0.37,-0.25 0.09,-0.1 0.14,-0.22 0.14,-0.36v-0.01c0,-0.16 -0.07,-0.3 -0.2,-0.4 -0.13,-0.11 -0.35,-0.2 -0.65,-0.27l-0.89,-0.2c-0.35,-0.08 -0.64,-0.18 -0.87,-0.32 -0.23,-0.14 -0.4,-0.31 -0.51,-0.51 -0.11,-0.2 -0.17,-0.44 -0.17,-0.7v-0.01c0,-0.33 0.09,-0.62 0.28,-0.88 0.19,-0.25 0.45,-0.45 0.78,-0.59 0.33,-0.14 0.71,-0.21 1.15,-0.21 0.45,0 0.83,0.07 1.15,0.2 0.32,0.13 0.57,0.32 0.75,0.55 0.18,0.23 0.29,0.5 0.31,0.8v0.01h-1.18l-0,-0.02c-0.05,-0.17 -0.16,-0.32 -0.34,-0.44 -0.17,-0.12 -0.41,-0.19 -0.7,-0.19 -0.18,0 -0.35,0.03 -0.5,0.09 -0.14,0.06 -0.26,0.14 -0.34,0.24 -0.08,0.1 -0.12,0.22 -0.12,0.36v0c0,0.11 0.03,0.2 0.08,0.28 0.06,0.08 0.15,0.15 0.27,0.21 0.12,0.06 0.28,0.11 0.48,0.16l0.89,0.2c0.54,0.12 0.94,0.3 1.2,0.54 0.26,0.24 0.39,0.56 0.39,0.96v0.01c0,0.35 -0.1,0.65 -0.3,0.92 -0.2,0.26 -0.48,0.47 -0.83,0.61 -0.35,0.14 -0.75,0.22 -1.2,0.22Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M18.19,81.82v-0.71h1.98c0.48,0 0.85,-0.1 1.1,-0.29 0.25,-0.19 0.37,-0.47 0.37,-0.84v-0.01c0,-0.25 -0.06,-0.45 -0.17,-0.62 -0.12,-0.17 -0.29,-0.29 -0.52,-0.37 -0.23,-0.08 -0.51,-0.12 -0.85,-0.12h-1.9v-0.69h1.68c0.49,0 0.85,-0.09 1.09,-0.26 0.25,-0.17 0.37,-0.43 0.37,-0.76v-0.01c0,-0.33 -0.11,-0.58 -0.33,-0.75 -0.22,-0.18 -0.53,-0.27 -0.92,-0.27h-1.88v-0.71h2.05c0.39,0 0.73,0.07 1.01,0.2 0.28,0.13 0.5,0.32 0.65,0.55 0.15,0.24 0.23,0.52 0.23,0.84v0.01c0,0.22 -0.05,0.43 -0.15,0.63 -0.1,0.2 -0.23,0.36 -0.4,0.49 -0.17,0.13 -0.35,0.22 -0.56,0.26v0.07c0.29,0.04 0.55,0.12 0.76,0.26 0.21,0.14 0.38,0.32 0.49,0.54 0.12,0.22 0.18,0.47 0.18,0.75v0.01c0,0.37 -0.09,0.69 -0.26,0.96 -0.17,0.27 -0.42,0.47 -0.74,0.62 -0.32,0.14 -0.71,0.21 -1.17,0.21h-2.1ZM17.79,81.82v-6.41h0.8v6.41h-0.8Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M23.69,81.82v-6.69h0.77v6.69h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M27.89,81.9c-0.45,0 -0.84,-0.1 -1.18,-0.3 -0.33,-0.2 -0.58,-0.49 -0.76,-0.86 -0.18,-0.37 -0.27,-0.81 -0.27,-1.32v-0.01c0,-0.51 0.09,-0.95 0.27,-1.32 0.18,-0.37 0.44,-0.65 0.76,-0.85 0.33,-0.2 0.72,-0.3 1.18,-0.3 0.46,0 0.85,0.1 1.18,0.3 0.33,0.2 0.58,0.48 0.76,0.85 0.18,0.37 0.27,0.81 0.27,1.32v0.01c0,0.51 -0.09,0.95 -0.27,1.32 -0.18,0.37 -0.43,0.66 -0.76,0.86 -0.33,0.2 -0.72,0.3 -1.18,0.3ZM27.89,81.22c0.3,0 0.56,-0.07 0.77,-0.21 0.21,-0.14 0.37,-0.35 0.48,-0.61 0.11,-0.27 0.17,-0.59 0.17,-0.96v-0.01c0,-0.38 -0.06,-0.7 -0.17,-0.97 -0.11,-0.27 -0.27,-0.47 -0.48,-0.61 -0.21,-0.14 -0.47,-0.21 -0.77,-0.21 -0.3,0 -0.56,0.07 -0.77,0.21 -0.21,0.14 -0.37,0.34 -0.48,0.61 -0.11,0.27 -0.16,0.59 -0.16,0.97v0.01c0,0.38 0.05,0.7 0.16,0.96 0.11,0.27 0.27,0.47 0.48,0.61 0.21,0.14 0.47,0.21 0.77,0.21Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M33.23,81.9c-0.45,0 -0.83,-0.1 -1.16,-0.31 -0.33,-0.2 -0.58,-0.49 -0.76,-0.87 -0.18,-0.37 -0.27,-0.81 -0.27,-1.32v-0.01c0,-0.5 0.09,-0.93 0.27,-1.3 0.18,-0.37 0.44,-0.65 0.76,-0.85 0.33,-0.2 0.72,-0.31 1.16,-0.31 0.39,0 0.72,0.07 1,0.2 0.28,0.14 0.51,0.32 0.67,0.55 0.17,0.23 0.28,0.48 0.32,0.77l0,0.03h-0.77l-0,-0.01c-0.06,-0.24 -0.19,-0.44 -0.4,-0.6 -0.21,-0.17 -0.49,-0.25 -0.83,-0.25 -0.29,0 -0.54,0.07 -0.75,0.22 -0.21,0.14 -0.37,0.35 -0.49,0.62 -0.11,0.26 -0.17,0.58 -0.17,0.94v0.01c0,0.37 0.06,0.69 0.17,0.96 0.12,0.27 0.28,0.48 0.49,0.63 0.21,0.15 0.46,0.22 0.74,0.22 0.32,0 0.59,-0.07 0.79,-0.21 0.2,-0.14 0.35,-0.34 0.44,-0.61l0.01,-0.03 0.76,-0 -0.01,0.05c-0.07,0.29 -0.18,0.54 -0.35,0.77 -0.17,0.22 -0.38,0.4 -0.66,0.52 -0.27,0.13 -0.6,0.19 -0.99,0.19Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M36.38,81.82v-6.69h0.77v6.69h-0.77ZM39.4,81.82l-1.87,-2.34 0.57,-0.49 2.27,2.84h-0.97ZM37.06,80.1l-0.04,-0.97h0.2l2.07,-2.09h0.94l-2.27,2.19 -0.19,0.18 -0.71,0.69Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M42.72,81.9c-0.36,0 -0.67,-0.05 -0.94,-0.16 -0.27,-0.11 -0.49,-0.26 -0.66,-0.46 -0.16,-0.2 -0.26,-0.42 -0.29,-0.69h0.79c0.07,0.2 0.19,0.36 0.38,0.48 0.19,0.12 0.44,0.18 0.74,0.18 0.22,0 0.41,-0.03 0.57,-0.09 0.17,-0.07 0.3,-0.15 0.39,-0.26 0.09,-0.11 0.14,-0.24 0.14,-0.39v-0.01c0,-0.16 -0.07,-0.3 -0.2,-0.41 -0.13,-0.12 -0.34,-0.21 -0.64,-0.28l-0.74,-0.18c-0.3,-0.07 -0.54,-0.16 -0.74,-0.28 -0.19,-0.12 -0.33,-0.26 -0.43,-0.42 -0.09,-0.17 -0.14,-0.37 -0.14,-0.59v-0c0,-0.27 0.08,-0.5 0.23,-0.71 0.16,-0.21 0.37,-0.38 0.64,-0.5 0.27,-0.12 0.57,-0.18 0.91,-0.18 0.33,0 0.63,0.05 0.89,0.16 0.26,0.1 0.47,0.25 0.63,0.44 0.16,0.19 0.26,0.42 0.29,0.68h-0.76c-0.05,-0.19 -0.17,-0.34 -0.35,-0.46 -0.18,-0.12 -0.42,-0.18 -0.71,-0.18 -0.19,0 -0.36,0.03 -0.51,0.09 -0.15,0.06 -0.26,0.14 -0.35,0.25 -0.09,0.11 -0.13,0.23 -0.13,0.37v0.01c0,0.11 0.03,0.2 0.08,0.28 0.06,0.08 0.14,0.16 0.26,0.22 0.12,0.06 0.27,0.12 0.46,0.16l0.74,0.18c0.45,0.11 0.78,0.27 1,0.47 0.22,0.2 0.33,0.48 0.33,0.82v0.01c0,0.28 -0.08,0.54 -0.25,0.75 -0.17,0.22 -0.4,0.38 -0.69,0.51 -0.29,0.12 -0.61,0.18 -0.98,0.18Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M48.39,81.82v-6.69h0.77v6.69h-0.77ZM51.41,81.82l-1.87,-2.34 0.57,-0.49 2.27,2.84h-0.97ZM49.07,80.1l-0.04,-0.97h0.2l2.07,-2.09h0.94l-2.27,2.19 -0.19,0.18 -0.71,0.69Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M53.26,81.82v-4.79h0.77v0.72h0.07c0.12,-0.25 0.3,-0.45 0.52,-0.59 0.23,-0.14 0.52,-0.21 0.87,-0.21 0.54,0 0.95,0.15 1.24,0.46 0.29,0.3 0.44,0.74 0.44,1.31v3.1h-0.77v-2.91c0,-0.43 -0.09,-0.75 -0.28,-0.96 -0.18,-0.21 -0.46,-0.32 -0.84,-0.32 -0.25,0 -0.47,0.05 -0.66,0.16 -0.19,0.11 -0.33,0.26 -0.44,0.47 -0.1,0.2 -0.15,0.44 -0.15,0.72v2.83h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M60.52,81.9c-0.45,0 -0.84,-0.1 -1.18,-0.3 -0.33,-0.2 -0.58,-0.49 -0.76,-0.86 -0.18,-0.37 -0.27,-0.81 -0.27,-1.32v-0.01c0,-0.51 0.09,-0.95 0.27,-1.32 0.18,-0.37 0.44,-0.65 0.76,-0.85 0.33,-0.2 0.72,-0.3 1.18,-0.3 0.46,0 0.85,0.1 1.18,0.3 0.33,0.2 0.58,0.48 0.76,0.85 0.18,0.37 0.27,0.81 0.27,1.32v0.01c0,0.51 -0.09,0.95 -0.27,1.32 -0.18,0.37 -0.43,0.66 -0.76,0.86 -0.33,0.2 -0.72,0.3 -1.18,0.3ZM60.52,81.22c0.3,0 0.56,-0.07 0.77,-0.21 0.21,-0.14 0.37,-0.35 0.48,-0.61 0.11,-0.27 0.17,-0.59 0.17,-0.96v-0.01c0,-0.38 -0.06,-0.7 -0.17,-0.97 -0.11,-0.27 -0.27,-0.47 -0.48,-0.61 -0.21,-0.14 -0.47,-0.21 -0.77,-0.21 -0.3,0 -0.56,0.07 -0.77,0.21 -0.21,0.14 -0.37,0.34 -0.48,0.61 -0.11,0.27 -0.16,0.59 -0.16,0.97v0.01c0,0.38 0.05,0.7 0.16,0.96 0.11,0.27 0.27,0.47 0.48,0.61 0.21,0.14 0.47,0.21 0.77,0.21Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M64.65,81.82l-1.34,-4.79h0.77l0.94,3.83h0.07l1.07,-3.83h0.73l1.07,3.83h0.07l0.94,-3.83h0.77l-1.34,4.79h-0.78l-1.07,-3.7h-0.07l-1.07,3.7h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M70.74,81.82v-4.79h0.77v0.72h0.07c0.12,-0.25 0.3,-0.45 0.52,-0.59 0.23,-0.14 0.52,-0.21 0.87,-0.21 0.54,0 0.95,0.15 1.24,0.46 0.29,0.3 0.44,0.74 0.44,1.31v3.1h-0.77v-2.91c0,-0.43 -0.09,-0.75 -0.28,-0.96 -0.18,-0.21 -0.46,-0.32 -0.84,-0.32 -0.25,0 -0.47,0.05 -0.66,0.16 -0.19,0.11 -0.33,0.26 -0.44,0.47 -0.1,0.2 -0.15,0.44 -0.15,0.72v2.83h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M80.27,81.85c-0.49,0 -0.85,-0.1 -1.07,-0.3 -0.22,-0.2 -0.33,-0.53 -0.33,-0.98v-2.9h-0.75v-0.64h0.75v-1.24h0.8v1.24h1.05v0.64h-1.05v2.71c0,0.28 0.05,0.48 0.16,0.61 0.11,0.12 0.28,0.18 0.53,0.18 0.07,0 0.13,-0 0.17,-0 0.05,-0 0.11,-0.01 0.18,-0.01v0.66c-0.07,0.01 -0.15,0.02 -0.22,0.03 -0.07,0.01 -0.15,0.01 -0.23,0.01Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M81.85,81.82v-4.79h0.77v0.71h0.07c0.09,-0.25 0.25,-0.45 0.47,-0.59 0.22,-0.14 0.49,-0.21 0.81,-0.21 0.07,0 0.15,0 0.22,0.01 0.07,0.01 0.13,0.01 0.17,0.02v0.75c-0.08,-0.01 -0.16,-0.03 -0.24,-0.03 -0.07,-0.01 -0.15,-0.01 -0.24,-0.01 -0.25,0 -0.46,0.05 -0.65,0.15 -0.19,0.1 -0.34,0.23 -0.45,0.41 -0.11,0.17 -0.16,0.38 -0.16,0.61v2.97h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M86.61,81.9c-0.3,0 -0.57,-0.06 -0.82,-0.17 -0.24,-0.12 -0.43,-0.28 -0.57,-0.49 -0.14,-0.21 -0.21,-0.46 -0.21,-0.75v-0.01c0,-0.28 0.07,-0.53 0.2,-0.73 0.14,-0.2 0.33,-0.36 0.59,-0.48 0.26,-0.12 0.58,-0.18 0.95,-0.2l1.76,-0.11v0.62l-1.66,0.11c-0.36,0.02 -0.63,0.1 -0.8,0.23 -0.17,0.13 -0.25,0.31 -0.25,0.55v0.01c0,0.24 0.09,0.43 0.28,0.57 0.18,0.13 0.41,0.2 0.69,0.2 0.26,0 0.5,-0.05 0.7,-0.16 0.2,-0.11 0.36,-0.25 0.48,-0.43 0.12,-0.18 0.18,-0.38 0.18,-0.61v-1.49c0,-0.3 -0.09,-0.52 -0.27,-0.67 -0.18,-0.16 -0.45,-0.24 -0.8,-0.24 -0.29,0 -0.52,0.05 -0.71,0.16 -0.18,0.1 -0.31,0.24 -0.37,0.43l-0,0.01h-0.77l0,-0.03c0.04,-0.25 0.14,-0.47 0.31,-0.66 0.17,-0.19 0.39,-0.34 0.65,-0.44 0.27,-0.11 0.57,-0.16 0.91,-0.16 0.39,0 0.72,0.06 0.99,0.19 0.27,0.13 0.48,0.31 0.62,0.55 0.14,0.24 0.21,0.52 0.21,0.85v3.28h-0.77v-0.71h-0.07c-0.1,0.17 -0.22,0.31 -0.37,0.43 -0.14,0.12 -0.3,0.21 -0.48,0.27 -0.18,0.06 -0.38,0.09 -0.59,0.09Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M92.24,81.9c-0.45,0 -0.83,-0.1 -1.16,-0.31s-0.58,-0.49 -0.76,-0.87c-0.18,-0.37 -0.27,-0.81 -0.27,-1.32v-0.01c0,-0.5 0.09,-0.93 0.27,-1.3 0.18,-0.37 0.44,-0.65 0.76,-0.85 0.33,-0.2 0.72,-0.31 1.16,-0.31 0.39,0 0.72,0.07 1,0.2 0.28,0.14 0.51,0.32 0.67,0.55 0.17,0.23 0.28,0.48 0.32,0.77l0,0.03h-0.77l-0,-0.01c-0.06,-0.24 -0.19,-0.44 -0.4,-0.6 -0.21,-0.17 -0.49,-0.25 -0.83,-0.25 -0.29,0 -0.54,0.07 -0.75,0.22 -0.21,0.14 -0.37,0.35 -0.49,0.62 -0.11,0.26 -0.17,0.58 -0.17,0.94v0.01c0,0.37 0.06,0.69 0.17,0.96 0.12,0.27 0.28,0.48 0.49,0.63 0.21,0.15 0.46,0.22 0.74,0.22 0.32,0 0.59,-0.07 0.79,-0.21 0.2,-0.14 0.35,-0.34 0.44,-0.61l0.01,-0.03 0.76,-0 -0.01,0.05c-0.07,0.29 -0.18,0.54 -0.35,0.77 -0.17,0.22 -0.38,0.4 -0.66,0.52 -0.27,0.13 -0.6,0.19 -0.99,0.19Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M95.4,81.82v-6.69h0.77v6.69h-0.77ZM98.41,81.82l-1.87,-2.34 0.57,-0.49 2.27,2.84h-0.97ZM96.07,80.1l-0.04,-0.97h0.2l2.07,-2.09h0.94l-2.27,2.19 -0.19,0.18 -0.71,0.69Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M102,81.9c-0.46,0 -0.85,-0.1 -1.18,-0.3 -0.32,-0.2 -0.58,-0.49 -0.75,-0.85 -0.17,-0.37 -0.26,-0.8 -0.26,-1.3v-0c0,-0.49 0.09,-0.93 0.26,-1.3 0.18,-0.37 0.43,-0.66 0.75,-0.87 0.32,-0.21 0.7,-0.32 1.13,-0.32 0.44,0 0.81,0.1 1.12,0.3 0.31,0.2 0.55,0.48 0.72,0.84 0.17,0.36 0.25,0.78 0.25,1.25v0.3h-3.84v-0.62h3.44l-0.38,0.56v-0.31c0,-0.38 -0.06,-0.69 -0.17,-0.93 -0.11,-0.24 -0.27,-0.42 -0.47,-0.54 -0.2,-0.12 -0.43,-0.18 -0.68,-0.18 -0.26,0 -0.49,0.06 -0.69,0.19 -0.2,0.12 -0.36,0.31 -0.48,0.55 -0.12,0.25 -0.18,0.55 -0.18,0.91v0.31c0,0.34 0.06,0.63 0.17,0.87 0.12,0.24 0.28,0.42 0.49,0.55 0.21,0.13 0.47,0.19 0.75,0.19 0.22,0 0.4,-0.03 0.56,-0.09 0.16,-0.06 0.29,-0.13 0.4,-0.23 0.1,-0.09 0.18,-0.19 0.22,-0.28l0.02,-0.04h0.77l-0.01,0.04c-0.04,0.16 -0.12,0.32 -0.22,0.47 -0.1,0.15 -0.24,0.29 -0.4,0.41 -0.17,0.12 -0.36,0.22 -0.59,0.29 -0.23,0.07 -0.48,0.11 -0.76,0.11Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M105.22,81.82v-4.79h0.77v0.71h0.07c0.09,-0.25 0.25,-0.45 0.47,-0.59 0.22,-0.14 0.49,-0.21 0.81,-0.21 0.07,0 0.15,0 0.22,0.01 0.07,0.01 0.13,0.01 0.17,0.02v0.75c-0.08,-0.01 -0.16,-0.03 -0.23,-0.03 -0.07,-0.01 -0.15,-0.01 -0.24,-0.01 -0.25,0 -0.46,0.05 -0.65,0.15 -0.19,0.1 -0.34,0.23 -0.45,0.41 -0.11,0.17 -0.16,0.38 -0.16,0.61v2.97h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M110.21,81.9c-0.35,0 -0.67,-0.05 -0.94,-0.16 -0.27,-0.11 -0.49,-0.26 -0.66,-0.46 -0.16,-0.2 -0.26,-0.42 -0.29,-0.69h0.79c0.06,0.2 0.19,0.36 0.38,0.48 0.19,0.12 0.44,0.18 0.74,0.18 0.22,0 0.41,-0.03 0.57,-0.09 0.17,-0.07 0.3,-0.15 0.39,-0.26 0.09,-0.11 0.14,-0.24 0.14,-0.39v-0.01c0,-0.16 -0.06,-0.3 -0.19,-0.41 -0.13,-0.12 -0.34,-0.21 -0.64,-0.28l-0.74,-0.18c-0.3,-0.07 -0.54,-0.16 -0.74,-0.28 -0.19,-0.12 -0.33,-0.26 -0.43,-0.42 -0.09,-0.17 -0.14,-0.37 -0.14,-0.59v-0c0,-0.27 0.08,-0.5 0.23,-0.71 0.16,-0.21 0.37,-0.38 0.64,-0.5 0.27,-0.12 0.57,-0.18 0.91,-0.18 0.34,0 0.63,0.05 0.89,0.16 0.26,0.1 0.47,0.25 0.63,0.44 0.16,0.19 0.26,0.42 0.29,0.68h-0.76c-0.05,-0.19 -0.17,-0.34 -0.35,-0.46 -0.18,-0.12 -0.42,-0.18 -0.71,-0.18 -0.19,0 -0.36,0.03 -0.51,0.09 -0.15,0.06 -0.26,0.14 -0.35,0.25 -0.09,0.11 -0.13,0.23 -0.13,0.37v0.01c0,0.11 0.03,0.2 0.08,0.28s0.14,0.16 0.26,0.22c0.12,0.06 0.27,0.12 0.46,0.16l0.74,0.18c0.45,0.11 0.78,0.27 1,0.47 0.22,0.2 0.33,0.48 0.33,0.82v0.01c0,0.28 -0.08,0.54 -0.25,0.75 -0.17,0.22 -0.4,0.38 -0.69,0.51 -0.29,0.12 -0.61,0.18 -0.98,0.18Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M17.58,111.52v-0.71h1.98c0.48,0 0.85,-0.1 1.1,-0.29 0.25,-0.19 0.37,-0.47 0.37,-0.84v-0.01c0,-0.25 -0.06,-0.45 -0.17,-0.62s-0.29,-0.29 -0.52,-0.37c-0.23,-0.08 -0.51,-0.12 -0.85,-0.12h-1.9v-0.69h1.68c0.49,0 0.85,-0.09 1.09,-0.26 0.25,-0.17 0.37,-0.43 0.37,-0.76v-0.01c0,-0.33 -0.11,-0.58 -0.33,-0.75 -0.22,-0.18 -0.53,-0.27 -0.92,-0.27h-1.88v-0.7h2.05c0.39,0 0.73,0.06 1.01,0.19 0.28,0.13 0.5,0.31 0.65,0.56 0.15,0.24 0.23,0.52 0.23,0.84v0.01c0,0.22 -0.05,0.43 -0.15,0.63 -0.1,0.19 -0.23,0.36 -0.4,0.49 -0.17,0.13 -0.35,0.22 -0.56,0.26v0.07c0.29,0.04 0.55,0.12 0.76,0.26 0.21,0.14 0.38,0.32 0.49,0.54 0.12,0.22 0.18,0.47 0.18,0.75v0.01c0,0.37 -0.09,0.69 -0.26,0.96 -0.17,0.27 -0.42,0.47 -0.74,0.62 -0.32,0.14 -0.71,0.21 -1.17,0.21h-2.1ZM17.18,111.52v-6.41h0.8v6.41h-0.8Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M23.04,111.52v-4.78h0.77v0.71h0.07c0.09,-0.25 0.25,-0.45 0.47,-0.59s0.49,-0.21 0.81,-0.21c0.07,0 0.15,0 0.22,0.01 0.07,0.01 0.13,0.01 0.17,0.02v0.75c-0.08,-0.01 -0.16,-0.03 -0.24,-0.03 -0.07,-0.01 -0.15,-0.01 -0.24,-0.01 -0.25,0 -0.46,0.05 -0.65,0.15 -0.19,0.1 -0.34,0.23 -0.45,0.41 -0.11,0.17 -0.16,0.38 -0.16,0.61v2.96h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M28.31,111.6c-0.45,0 -0.84,-0.1 -1.18,-0.3 -0.33,-0.2 -0.58,-0.49 -0.76,-0.86 -0.18,-0.37 -0.27,-0.81 -0.27,-1.32v-0.01c0,-0.51 0.09,-0.95 0.27,-1.32 0.18,-0.37 0.44,-0.65 0.76,-0.85 0.33,-0.2 0.72,-0.3 1.18,-0.3 0.46,0 0.85,0.1 1.18,0.3s0.58,0.48 0.76,0.85c0.18,0.37 0.27,0.81 0.27,1.32v0.01c0,0.51 -0.09,0.95 -0.27,1.32 -0.18,0.37 -0.43,0.66 -0.76,0.86 -0.33,0.2 -0.72,0.3 -1.18,0.3ZM28.31,110.92c0.3,0 0.56,-0.07 0.77,-0.21 0.21,-0.14 0.37,-0.35 0.48,-0.61 0.11,-0.27 0.17,-0.59 0.17,-0.96v-0.01c0,-0.38 -0.06,-0.7 -0.17,-0.97 -0.11,-0.27 -0.27,-0.47 -0.48,-0.61 -0.21,-0.14 -0.47,-0.21 -0.77,-0.21 -0.3,0 -0.56,0.07 -0.77,0.21 -0.21,0.14 -0.37,0.34 -0.48,0.61 -0.11,0.27 -0.16,0.59 -0.16,0.97v0.01c0,0.38 0.05,0.7 0.16,0.96 0.11,0.27 0.27,0.47 0.48,0.61 0.21,0.14 0.47,0.21 0.77,0.21Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M32.44,111.52l-1.34,-4.78h0.77l0.94,3.83h0.07l1.07,-3.83h0.73l1.07,3.83h0.07l0.94,-3.83h0.77l-1.34,4.78h-0.78l-1.07,-3.7h-0.07l-1.07,3.7h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M40.05,111.6c-0.36,0 -0.67,-0.05 -0.94,-0.16 -0.27,-0.11 -0.49,-0.26 -0.66,-0.46 -0.16,-0.19 -0.26,-0.42 -0.29,-0.69h0.79c0.07,0.2 0.19,0.36 0.38,0.48 0.19,0.12 0.44,0.18 0.74,0.18 0.22,0 0.41,-0.03 0.57,-0.09 0.17,-0.06 0.3,-0.15 0.39,-0.26 0.09,-0.11 0.14,-0.24 0.14,-0.39v-0.01c0,-0.16 -0.07,-0.3 -0.2,-0.41 -0.13,-0.12 -0.34,-0.21 -0.64,-0.28l-0.74,-0.18c-0.3,-0.07 -0.54,-0.16 -0.74,-0.28 -0.19,-0.12 -0.33,-0.26 -0.43,-0.42 -0.09,-0.17 -0.14,-0.37 -0.14,-0.6v-0c0,-0.27 0.08,-0.5 0.23,-0.71 0.16,-0.21 0.37,-0.38 0.64,-0.5 0.27,-0.12 0.57,-0.18 0.91,-0.18 0.33,0 0.63,0.05 0.89,0.16 0.26,0.1 0.47,0.25 0.63,0.44 0.16,0.19 0.26,0.42 0.29,0.68h-0.76c-0.05,-0.19 -0.17,-0.34 -0.35,-0.46 -0.18,-0.12 -0.42,-0.18 -0.71,-0.18 -0.19,0 -0.36,0.03 -0.51,0.09 -0.15,0.06 -0.26,0.14 -0.35,0.25 -0.09,0.11 -0.13,0.23 -0.13,0.37v0.01c0,0.11 0.03,0.2 0.08,0.28 0.06,0.08 0.14,0.16 0.26,0.22 0.12,0.06 0.27,0.12 0.46,0.17l0.74,0.18c0.45,0.11 0.78,0.27 1,0.47 0.22,0.2 0.33,0.48 0.33,0.82v0.01c0,0.28 -0.08,0.54 -0.25,0.75 -0.17,0.22 -0.4,0.38 -0.69,0.51 -0.29,0.12 -0.61,0.18 -0.98,0.18Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M45.09,111.6c-0.46,0 -0.85,-0.1 -1.18,-0.3 -0.33,-0.2 -0.58,-0.48 -0.75,-0.85 -0.17,-0.37 -0.26,-0.81 -0.26,-1.3v-0c0,-0.49 0.09,-0.93 0.26,-1.3 0.18,-0.37 0.43,-0.66 0.75,-0.87 0.32,-0.21 0.7,-0.32 1.13,-0.32 0.44,0 0.81,0.1 1.12,0.3 0.31,0.2 0.55,0.48 0.72,0.84 0.17,0.36 0.25,0.77 0.25,1.25v0.3h-3.84v-0.62h3.44l-0.38,0.56v-0.31c0,-0.38 -0.06,-0.69 -0.17,-0.93 -0.11,-0.24 -0.27,-0.42 -0.47,-0.54 -0.2,-0.12 -0.43,-0.18 -0.68,-0.18 -0.26,0 -0.49,0.06 -0.69,0.19 -0.2,0.13 -0.36,0.31 -0.48,0.56 -0.12,0.25 -0.18,0.55 -0.18,0.91v0.31c0,0.34 0.06,0.63 0.17,0.88 0.12,0.24 0.28,0.42 0.49,0.55 0.21,0.13 0.46,0.19 0.75,0.19 0.22,0 0.4,-0.03 0.56,-0.09 0.16,-0.06 0.29,-0.13 0.4,-0.23 0.1,-0.09 0.18,-0.19 0.22,-0.28l0.02,-0.04h0.77l-0.01,0.04c-0.04,0.16 -0.12,0.32 -0.22,0.47 -0.1,0.15 -0.24,0.29 -0.4,0.41 -0.17,0.12 -0.36,0.22 -0.59,0.29 -0.22,0.07 -0.48,0.11 -0.76,0.11Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M48.31,111.52v-4.78h0.77v0.71h0.07c0.09,-0.25 0.25,-0.45 0.47,-0.59s0.49,-0.21 0.81,-0.21c0.07,0 0.15,0 0.22,0.01 0.07,0.01 0.13,0.01 0.17,0.02v0.75c-0.08,-0.01 -0.16,-0.03 -0.24,-0.03 -0.07,-0.01 -0.15,-0.01 -0.24,-0.01 -0.25,0 -0.46,0.05 -0.65,0.15 -0.19,0.1 -0.34,0.23 -0.45,0.41 -0.11,0.17 -0.16,0.38 -0.16,0.61v2.96h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M56.24,111.6c-0.46,0 -0.85,-0.1 -1.18,-0.3 -0.33,-0.2 -0.58,-0.48 -0.75,-0.85 -0.17,-0.37 -0.26,-0.81 -0.26,-1.3v-0c0,-0.49 0.09,-0.93 0.26,-1.3 0.18,-0.37 0.43,-0.66 0.75,-0.87 0.32,-0.21 0.7,-0.32 1.13,-0.32 0.44,0 0.81,0.1 1.12,0.3 0.31,0.2 0.55,0.48 0.72,0.84 0.17,0.36 0.25,0.77 0.25,1.25v0.3h-3.84v-0.62h3.44l-0.38,0.56v-0.31c0,-0.38 -0.06,-0.69 -0.17,-0.93 -0.11,-0.24 -0.27,-0.42 -0.47,-0.54 -0.2,-0.12 -0.43,-0.18 -0.68,-0.18s-0.49,0.06 -0.69,0.19c-0.2,0.13 -0.36,0.31 -0.48,0.56 -0.12,0.25 -0.18,0.55 -0.18,0.91v0.31c0,0.34 0.06,0.63 0.17,0.88 0.12,0.24 0.28,0.42 0.49,0.55 0.21,0.13 0.46,0.19 0.75,0.19 0.22,0 0.4,-0.03 0.56,-0.09 0.16,-0.06 0.29,-0.13 0.4,-0.23 0.1,-0.09 0.18,-0.19 0.22,-0.28l0.02,-0.04h0.77l-0.01,0.04c-0.04,0.16 -0.12,0.32 -0.22,0.47 -0.1,0.15 -0.24,0.29 -0.4,0.41 -0.17,0.12 -0.36,0.22 -0.59,0.29 -0.22,0.07 -0.48,0.11 -0.76,0.11Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M58.9,111.52l1.64,-2.39 -1.66,-2.39h0.91l1.14,1.78h0.07l1.12,-1.78h0.87l-1.62,2.36 1.65,2.42h-0.91l-1.13,-1.81h-0.07l-1.14,1.81h-0.87Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M65.73,111.55c-0.49,0 -0.85,-0.1 -1.07,-0.3 -0.22,-0.2 -0.33,-0.52 -0.33,-0.98v-2.9h-0.75v-0.64h0.75v-1.24h0.8v1.24h1.05v0.64h-1.05v2.71c0,0.28 0.05,0.48 0.16,0.61 0.11,0.12 0.28,0.18 0.53,0.18 0.07,0 0.13,-0 0.17,-0 0.05,-0 0.11,-0.01 0.18,-0.01v0.66c-0.07,0.01 -0.15,0.02 -0.22,0.03 -0.07,0.01 -0.15,0.01 -0.23,0.01Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M69.21,111.6c-0.46,0 -0.85,-0.1 -1.18,-0.3 -0.33,-0.2 -0.58,-0.48 -0.75,-0.85 -0.17,-0.37 -0.26,-0.81 -0.26,-1.3v-0c0,-0.49 0.09,-0.93 0.26,-1.3 0.18,-0.37 0.43,-0.66 0.75,-0.87 0.32,-0.21 0.7,-0.32 1.13,-0.32 0.44,0 0.81,0.1 1.12,0.3 0.31,0.2 0.55,0.48 0.72,0.84 0.17,0.36 0.25,0.77 0.25,1.25v0.3h-3.84v-0.62h3.44l-0.38,0.56v-0.31c0,-0.38 -0.06,-0.69 -0.17,-0.93 -0.11,-0.24 -0.27,-0.42 -0.47,-0.54 -0.2,-0.12 -0.43,-0.18 -0.68,-0.18 -0.26,0 -0.49,0.06 -0.69,0.19 -0.2,0.13 -0.36,0.31 -0.48,0.56 -0.12,0.25 -0.18,0.55 -0.18,0.91v0.31c0,0.34 0.06,0.63 0.17,0.88 0.12,0.24 0.28,0.42 0.49,0.55 0.21,0.13 0.46,0.19 0.75,0.19 0.22,0 0.4,-0.03 0.56,-0.09 0.16,-0.06 0.29,-0.13 0.4,-0.23s0.18,-0.19 0.22,-0.28l0.02,-0.04h0.77l-0.01,0.04c-0.04,0.16 -0.12,0.32 -0.22,0.47 -0.1,0.15 -0.24,0.29 -0.4,0.41 -0.17,0.12 -0.36,0.22 -0.59,0.29 -0.22,0.07 -0.48,0.11 -0.76,0.11Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M72.43,111.52v-4.78h0.77v0.72h0.07c0.12,-0.25 0.3,-0.45 0.52,-0.59 0.23,-0.14 0.52,-0.21 0.87,-0.21 0.54,0 0.95,0.15 1.24,0.46 0.29,0.31 0.44,0.74 0.44,1.31v3.1h-0.77v-2.91c0,-0.43 -0.09,-0.75 -0.28,-0.96 -0.18,-0.21 -0.46,-0.31 -0.84,-0.31 -0.25,0 -0.47,0.05 -0.66,0.16 -0.19,0.11 -0.33,0.26 -0.44,0.47 -0.1,0.2 -0.15,0.44 -0.15,0.72v2.83h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M79.36,111.6c-0.36,0 -0.67,-0.05 -0.94,-0.16 -0.27,-0.11 -0.49,-0.26 -0.66,-0.46 -0.16,-0.19 -0.26,-0.42 -0.29,-0.69h0.79c0.07,0.2 0.19,0.36 0.38,0.48 0.19,0.12 0.44,0.18 0.74,0.18 0.22,0 0.41,-0.03 0.57,-0.09 0.17,-0.06 0.3,-0.15 0.39,-0.26 0.09,-0.11 0.14,-0.24 0.14,-0.39v-0.01c0,-0.16 -0.07,-0.3 -0.2,-0.41 -0.13,-0.12 -0.34,-0.21 -0.64,-0.28l-0.74,-0.18c-0.3,-0.07 -0.54,-0.16 -0.74,-0.28 -0.19,-0.12 -0.33,-0.26 -0.43,-0.42 -0.09,-0.17 -0.14,-0.37 -0.14,-0.6v-0c0,-0.27 0.08,-0.5 0.23,-0.71 0.16,-0.21 0.37,-0.38 0.64,-0.5 0.27,-0.12 0.57,-0.18 0.91,-0.18 0.33,0 0.63,0.05 0.89,0.16 0.26,0.1 0.47,0.25 0.63,0.44 0.16,0.19 0.26,0.42 0.29,0.68h-0.76c-0.05,-0.19 -0.17,-0.34 -0.35,-0.46 -0.18,-0.12 -0.42,-0.18 -0.71,-0.18 -0.19,0 -0.36,0.03 -0.51,0.09 -0.15,0.06 -0.26,0.14 -0.35,0.25 -0.09,0.11 -0.13,0.23 -0.13,0.37v0.01c0,0.11 0.03,0.2 0.08,0.28 0.06,0.08 0.14,0.16 0.26,0.22 0.12,0.06 0.27,0.12 0.46,0.17l0.74,0.18c0.45,0.11 0.78,0.27 1,0.47 0.22,0.2 0.33,0.48 0.33,0.82v0.01c0,0.28 -0.08,0.54 -0.25,0.75 -0.17,0.22 -0.4,0.38 -0.69,0.51 -0.29,0.12 -0.61,0.18 -0.98,0.18Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M82.47,111.52v-4.78h0.77v4.78h-0.77ZM82.86,105.81c-0.14,0 -0.27,-0.05 -0.38,-0.16 -0.1,-0.11 -0.16,-0.23 -0.16,-0.38 0,-0.15 0.05,-0.27 0.16,-0.38 0.11,-0.1 0.23,-0.16 0.38,-0.16 0.15,0 0.27,0.05 0.38,0.16 0.1,0.1 0.16,0.23 0.16,0.38 0,0.14 -0.05,0.27 -0.16,0.38 -0.1,0.1 -0.23,0.16 -0.38,0.16Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M86.64,111.6c-0.45,0 -0.84,-0.1 -1.18,-0.3 -0.33,-0.2 -0.58,-0.49 -0.76,-0.86 -0.18,-0.37 -0.27,-0.81 -0.27,-1.32v-0.01c0,-0.51 0.09,-0.95 0.27,-1.32 0.18,-0.37 0.44,-0.65 0.76,-0.85 0.33,-0.2 0.72,-0.3 1.18,-0.3 0.46,0 0.85,0.1 1.18,0.3 0.33,0.2 0.58,0.48 0.76,0.85 0.18,0.37 0.27,0.81 0.27,1.32v0.01c0,0.51 -0.09,0.95 -0.27,1.32 -0.18,0.37 -0.43,0.66 -0.76,0.86 -0.33,0.2 -0.72,0.3 -1.18,0.3ZM86.64,110.92c0.3,0 0.56,-0.07 0.77,-0.21 0.21,-0.14 0.37,-0.35 0.48,-0.61 0.11,-0.27 0.17,-0.59 0.17,-0.96v-0.01c0,-0.38 -0.06,-0.7 -0.17,-0.97 -0.11,-0.27 -0.27,-0.47 -0.48,-0.61 -0.21,-0.14 -0.47,-0.21 -0.77,-0.21 -0.3,0 -0.56,0.07 -0.77,0.21 -0.21,0.14 -0.37,0.34 -0.48,0.61 -0.11,0.27 -0.16,0.59 -0.16,0.97v0.01c0,0.38 0.05,0.7 0.16,0.96 0.11,0.27 0.27,0.47 0.48,0.61 0.21,0.14 0.47,0.21 0.77,0.21Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M90.03,111.52v-4.78h0.77v0.72h0.07c0.12,-0.25 0.3,-0.45 0.52,-0.59 0.23,-0.14 0.52,-0.21 0.87,-0.21 0.54,0 0.95,0.15 1.24,0.46 0.29,0.31 0.44,0.74 0.44,1.31v3.1h-0.77v-2.91c0,-0.43 -0.09,-0.75 -0.27,-0.96 -0.18,-0.21 -0.46,-0.31 -0.84,-0.31 -0.25,0 -0.47,0.05 -0.66,0.16 -0.19,0.11 -0.33,0.26 -0.44,0.47 -0.1,0.2 -0.15,0.44 -0.15,0.72v2.83h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M96.96,111.6c-0.36,0 -0.67,-0.05 -0.94,-0.16 -0.27,-0.11 -0.49,-0.26 -0.66,-0.46 -0.16,-0.19 -0.26,-0.42 -0.29,-0.69h0.79c0.06,0.2 0.19,0.36 0.38,0.48 0.19,0.12 0.44,0.18 0.74,0.18 0.22,0 0.41,-0.03 0.57,-0.09 0.17,-0.06 0.3,-0.15 0.39,-0.26 0.09,-0.11 0.14,-0.24 0.14,-0.39v-0.01c0,-0.16 -0.06,-0.3 -0.19,-0.41 -0.13,-0.12 -0.34,-0.21 -0.64,-0.28l-0.74,-0.18c-0.3,-0.07 -0.54,-0.16 -0.74,-0.28 -0.19,-0.12 -0.33,-0.26 -0.43,-0.42 -0.09,-0.17 -0.14,-0.37 -0.14,-0.6v-0c0,-0.27 0.08,-0.5 0.23,-0.71 0.16,-0.21 0.37,-0.38 0.64,-0.5 0.27,-0.12 0.57,-0.18 0.91,-0.18 0.33,0 0.63,0.05 0.89,0.16 0.26,0.1 0.47,0.25 0.63,0.44 0.16,0.19 0.26,0.42 0.29,0.68h-0.76c-0.05,-0.19 -0.17,-0.34 -0.35,-0.46 -0.18,-0.12 -0.42,-0.18 -0.71,-0.18 -0.19,0 -0.36,0.03 -0.51,0.09 -0.15,0.06 -0.26,0.14 -0.35,0.25 -0.09,0.11 -0.13,0.23 -0.13,0.37v0.01c0,0.11 0.03,0.2 0.08,0.28s0.14,0.16 0.26,0.22c0.12,0.06 0.27,0.12 0.46,0.17l0.74,0.18c0.45,0.11 0.78,0.27 1,0.47 0.22,0.2 0.33,0.48 0.33,0.82v0.01c0,0.28 -0.08,0.54 -0.25,0.75 -0.17,0.22 -0.4,0.38 -0.69,0.51 -0.29,0.12 -0.61,0.18 -0.98,0.18Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M18.19,140.61v-0.71h1.98c0.48,0 0.85,-0.1 1.1,-0.29 0.25,-0.19 0.37,-0.47 0.37,-0.84v-0.01c0,-0.25 -0.06,-0.45 -0.17,-0.62 -0.12,-0.17 -0.29,-0.29 -0.52,-0.37 -0.23,-0.08 -0.51,-0.13 -0.85,-0.13h-1.9v-0.69h1.68c0.49,0 0.85,-0.08 1.09,-0.26 0.25,-0.17 0.37,-0.43 0.37,-0.76v-0.01c0,-0.33 -0.11,-0.58 -0.33,-0.75 -0.22,-0.18 -0.53,-0.27 -0.92,-0.27h-1.88v-0.71h2.05c0.39,0 0.73,0.07 1.01,0.2 0.28,0.13 0.5,0.31 0.65,0.56 0.15,0.24 0.23,0.52 0.23,0.84v0.01c0,0.22 -0.05,0.43 -0.15,0.63 -0.1,0.2 -0.23,0.36 -0.4,0.49 -0.17,0.13 -0.35,0.22 -0.56,0.26v0.07c0.29,0.04 0.55,0.12 0.76,0.26 0.21,0.14 0.38,0.32 0.49,0.54 0.12,0.22 0.18,0.47 0.18,0.75v0.01c0,0.37 -0.09,0.69 -0.26,0.96 -0.17,0.27 -0.42,0.47 -0.74,0.62 -0.32,0.14 -0.71,0.21 -1.17,0.21h-2.1ZM17.79,140.61v-6.41h0.8v6.41h-0.8Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M25.25,140.69c-0.36,0 -0.66,-0.07 -0.91,-0.2 -0.25,-0.14 -0.43,-0.34 -0.55,-0.6 -0.12,-0.27 -0.18,-0.59 -0.18,-0.96v-3.1h0.77v2.91c0,0.43 0.08,0.75 0.25,0.96 0.17,0.21 0.44,0.32 0.83,0.32 0.21,0 0.4,-0.03 0.55,-0.09 0.16,-0.06 0.3,-0.15 0.41,-0.27 0.11,-0.12 0.19,-0.26 0.24,-0.43 0.06,-0.17 0.08,-0.36 0.08,-0.57v-2.83h0.77v4.78h-0.77v-0.71h-0.07c-0.08,0.17 -0.18,0.31 -0.32,0.44 -0.13,0.12 -0.29,0.21 -0.48,0.27 -0.18,0.06 -0.39,0.09 -0.63,0.09Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M28.95,140.61v-4.78h0.77v4.78h-0.77ZM29.34,134.9c-0.15,0 -0.27,-0.05 -0.38,-0.16 -0.1,-0.11 -0.16,-0.23 -0.16,-0.38 0,-0.15 0.05,-0.27 0.16,-0.38 0.11,-0.1 0.23,-0.16 0.38,-0.16 0.15,0 0.27,0.05 0.38,0.16 0.1,0.1 0.16,0.23 0.16,0.38 0,0.14 -0.05,0.27 -0.16,0.38 -0.1,0.1 -0.23,0.16 -0.38,0.16Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M31.2,140.61v-6.68h0.77v6.68h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M35.14,140.64c-0.49,0 -0.85,-0.1 -1.07,-0.3 -0.22,-0.2 -0.33,-0.52 -0.33,-0.98v-2.9h-0.75v-0.64h0.75v-1.24h0.8v1.24h1.05v0.64h-1.05v2.71c0,0.28 0.05,0.48 0.16,0.61 0.11,0.12 0.28,0.18 0.53,0.18 0.07,0 0.13,-0 0.17,-0 0.05,-0 0.11,-0.01 0.18,-0.01v0.66c-0.07,0.01 -0.15,0.02 -0.22,0.03s-0.15,0.01 -0.23,0.01Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M36.47,138.39v-0.72h2.98v0.72h-2.98Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M40.82,140.61v-4.78h0.77v4.78h-0.77ZM41.21,134.9c-0.14,0 -0.27,-0.05 -0.38,-0.16 -0.1,-0.11 -0.16,-0.23 -0.16,-0.38 0,-0.15 0.05,-0.27 0.16,-0.38 0.11,-0.1 0.23,-0.16 0.38,-0.16 0.15,0 0.27,0.05 0.38,0.16 0.1,0.1 0.16,0.23 0.16,0.38 0,0.14 -0.05,0.27 -0.16,0.38 -0.1,0.1 -0.23,0.16 -0.38,0.16Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M43.03,140.61v-4.78h0.77v0.72h0.07c0.12,-0.25 0.3,-0.45 0.52,-0.59 0.23,-0.14 0.52,-0.21 0.87,-0.21 0.54,0 0.95,0.15 1.24,0.46 0.29,0.31 0.44,0.74 0.44,1.31v3.1h-0.77v-2.91c0,-0.43 -0.09,-0.75 -0.28,-0.96 -0.18,-0.21 -0.46,-0.31 -0.84,-0.31 -0.25,0 -0.47,0.06 -0.66,0.16 -0.19,0.11 -0.33,0.26 -0.44,0.47 -0.1,0.2 -0.15,0.44 -0.15,0.72v2.83h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M51.35,138.32v-0.71h1.81c0.46,0 0.81,-0.12 1.07,-0.36 0.25,-0.24 0.38,-0.57 0.38,-0.99v-0.01c0,-0.42 -0.13,-0.75 -0.38,-0.99 -0.25,-0.24 -0.61,-0.36 -1.07,-0.36h-1.81v-0.71h2.02c0.4,0 0.76,0.09 1.07,0.26 0.31,0.17 0.55,0.41 0.72,0.72 0.18,0.31 0.27,0.66 0.27,1.07v0.01c0,0.41 -0.09,0.76 -0.27,1.07 -0.17,0.31 -0.42,0.55 -0.72,0.73 -0.31,0.17 -0.66,0.26 -1.07,0.26h-2.02ZM50.95,140.61v-6.41h0.8v6.41h-0.8Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M56.71,140.61v-6.41h2.2c0.63,0 1.17,0.13 1.62,0.38 0.45,0.25 0.8,0.62 1.04,1.09 0.24,0.48 0.36,1.05 0.36,1.72v0.01c0,0.67 -0.12,1.25 -0.36,1.73 -0.24,0.48 -0.58,0.84 -1.03,1.1 -0.45,0.25 -0.99,0.38 -1.63,0.38h-2.2ZM57.51,139.89h1.35c0.48,0 0.88,-0.1 1.22,-0.29 0.34,-0.2 0.59,-0.48 0.77,-0.85 0.18,-0.37 0.27,-0.81 0.27,-1.33v-0.01c0,-0.52 -0.09,-0.97 -0.27,-1.34 -0.18,-0.37 -0.44,-0.66 -0.77,-0.85 -0.34,-0.2 -0.74,-0.3 -1.22,-0.3h-1.35v4.97Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M63.3,140.61v-6.41h3.89v0.72h-3.09v2.2h2.84v0.71h-2.84v2.78h-0.8Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M70.92,140.61v-4.78h0.77v0.71h0.07c0.09,-0.25 0.25,-0.45 0.47,-0.59 0.22,-0.14 0.49,-0.21 0.81,-0.21 0.07,0 0.15,0 0.22,0.01 0.07,0.01 0.13,0.01 0.17,0.02v0.75c-0.08,-0.01 -0.16,-0.03 -0.24,-0.03 -0.07,-0.01 -0.15,-0.01 -0.24,-0.01 -0.25,0 -0.46,0.05 -0.65,0.15 -0.19,0.1 -0.34,0.23 -0.45,0.41 -0.11,0.17 -0.16,0.38 -0.16,0.61v2.96h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M76.18,140.69c-0.46,0 -0.85,-0.1 -1.18,-0.3 -0.33,-0.2 -0.58,-0.49 -0.75,-0.85 -0.17,-0.37 -0.26,-0.8 -0.26,-1.3v-0c0,-0.5 0.09,-0.93 0.26,-1.3 0.18,-0.37 0.43,-0.66 0.75,-0.88 0.32,-0.21 0.7,-0.31 1.13,-0.31 0.44,0 0.81,0.1 1.12,0.3 0.31,0.2 0.55,0.48 0.72,0.84 0.17,0.36 0.25,0.77 0.25,1.25v0.3h-3.84v-0.62h3.44l-0.38,0.56v-0.31c0,-0.38 -0.06,-0.69 -0.17,-0.93 -0.11,-0.24 -0.27,-0.42 -0.47,-0.54 -0.2,-0.12 -0.43,-0.18 -0.68,-0.18 -0.26,0 -0.49,0.06 -0.69,0.19 -0.2,0.12 -0.36,0.31 -0.48,0.55 -0.12,0.25 -0.18,0.55 -0.18,0.91v0.31c0,0.34 0.06,0.63 0.17,0.87 0.12,0.24 0.28,0.43 0.49,0.56 0.21,0.13 0.46,0.19 0.75,0.19 0.22,0 0.4,-0.03 0.56,-0.09 0.16,-0.06 0.29,-0.13 0.4,-0.23 0.1,-0.09 0.18,-0.19 0.22,-0.28l0.02,-0.04h0.77l-0.01,0.04c-0.04,0.16 -0.12,0.32 -0.22,0.48 -0.1,0.15 -0.24,0.29 -0.4,0.41 -0.17,0.12 -0.36,0.22 -0.59,0.29 -0.22,0.07 -0.48,0.11 -0.76,0.11Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M80.71,140.69c-0.3,0 -0.57,-0.06 -0.82,-0.17 -0.24,-0.11 -0.43,-0.28 -0.57,-0.49 -0.14,-0.21 -0.21,-0.46 -0.21,-0.75v-0.01c0,-0.28 0.07,-0.53 0.2,-0.73 0.14,-0.2 0.33,-0.36 0.59,-0.48 0.26,-0.11 0.58,-0.18 0.95,-0.2l1.76,-0.11v0.62l-1.66,0.11c-0.36,0.02 -0.63,0.1 -0.8,0.23 -0.17,0.13 -0.25,0.31 -0.25,0.55v0.01c0,0.24 0.09,0.43 0.28,0.57 0.18,0.13 0.41,0.2 0.69,0.2 0.26,0 0.5,-0.05 0.7,-0.16 0.2,-0.11 0.36,-0.25 0.48,-0.43 0.12,-0.18 0.18,-0.39 0.18,-0.61v-1.49c0,-0.3 -0.09,-0.52 -0.27,-0.68 -0.18,-0.16 -0.45,-0.23 -0.8,-0.23 -0.29,0 -0.52,0.05 -0.71,0.16 -0.18,0.1 -0.31,0.24 -0.37,0.43l-0,0.01h-0.77l0,-0.03c0.04,-0.25 0.14,-0.47 0.31,-0.66 0.17,-0.19 0.39,-0.34 0.65,-0.44 0.27,-0.11 0.57,-0.16 0.91,-0.16 0.39,0 0.72,0.06 0.99,0.19 0.27,0.13 0.48,0.31 0.62,0.55 0.14,0.24 0.21,0.52 0.21,0.85v3.28h-0.77v-0.71h-0.07c-0.1,0.17 -0.22,0.31 -0.37,0.43 -0.14,0.12 -0.3,0.21 -0.48,0.27 -0.18,0.06 -0.38,0.09 -0.59,0.09Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M86.16,140.69c-0.4,0 -0.75,-0.1 -1.06,-0.31 -0.3,-0.2 -0.54,-0.49 -0.7,-0.86 -0.17,-0.37 -0.25,-0.81 -0.25,-1.3v-0.01c0,-0.5 0.08,-0.94 0.25,-1.3 0.17,-0.37 0.4,-0.66 0.7,-0.86 0.3,-0.2 0.66,-0.31 1.06,-0.31 0.22,0 0.42,0.04 0.62,0.11 0.2,0.07 0.37,0.16 0.52,0.29 0.15,0.13 0.27,0.27 0.36,0.44h0.07v-2.65h0.77v6.68h-0.77v-0.76h-0.07c-0.1,0.18 -0.22,0.33 -0.37,0.46 -0.15,0.13 -0.32,0.22 -0.51,0.29 -0.19,0.07 -0.4,0.1 -0.62,0.1ZM86.34,140.01c0.29,0 0.54,-0.07 0.75,-0.22s0.37,-0.35 0.48,-0.62c0.11,-0.27 0.17,-0.59 0.17,-0.95v-0.01c0,-0.37 -0.06,-0.69 -0.17,-0.95 -0.11,-0.27 -0.27,-0.47 -0.48,-0.62 -0.21,-0.14 -0.46,-0.22 -0.75,-0.22s-0.54,0.07 -0.75,0.22c-0.21,0.14 -0.37,0.35 -0.48,0.61 -0.11,0.27 -0.16,0.59 -0.16,0.96v0.01c0,0.37 0.05,0.69 0.16,0.96 0.11,0.27 0.27,0.47 0.48,0.62 0.21,0.14 0.46,0.21 0.75,0.21Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M91.91,140.69c-0.46,0 -0.85,-0.1 -1.18,-0.3 -0.33,-0.2 -0.58,-0.49 -0.75,-0.85 -0.17,-0.37 -0.26,-0.8 -0.26,-1.3v-0c0,-0.5 0.09,-0.93 0.26,-1.3 0.18,-0.37 0.43,-0.66 0.75,-0.88 0.32,-0.21 0.7,-0.31 1.13,-0.31 0.44,0 0.81,0.1 1.12,0.3 0.31,0.2 0.55,0.48 0.72,0.84 0.17,0.36 0.25,0.77 0.25,1.25v0.3h-3.84v-0.62h3.44l-0.38,0.56v-0.31c0,-0.38 -0.06,-0.69 -0.17,-0.93 -0.11,-0.24 -0.27,-0.42 -0.47,-0.54 -0.2,-0.12 -0.43,-0.18 -0.68,-0.18s-0.49,0.06 -0.69,0.19c-0.2,0.12 -0.36,0.31 -0.48,0.55s-0.18,0.55 -0.18,0.91v0.31c0,0.34 0.06,0.63 0.17,0.87 0.12,0.24 0.28,0.43 0.49,0.56 0.21,0.13 0.46,0.19 0.75,0.19 0.22,0 0.4,-0.03 0.56,-0.09 0.16,-0.06 0.29,-0.13 0.4,-0.23 0.1,-0.09 0.18,-0.19 0.22,-0.28l0.02,-0.04h0.77l-0.01,0.04c-0.04,0.16 -0.12,0.32 -0.22,0.48 -0.1,0.15 -0.24,0.29 -0.4,0.41 -0.17,0.12 -0.36,0.22 -0.59,0.29 -0.22,0.07 -0.48,0.11 -0.76,0.11Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#5b5b66" android:pathData="M95.13,140.61v-4.78h0.77v0.71h0.07c0.09,-0.25 0.25,-0.45 0.47,-0.59 0.22,-0.14 0.49,-0.21 0.81,-0.21 0.07,0 0.15,0 0.22,0.01 0.07,0.01 0.13,0.01 0.17,0.02v0.75c-0.08,-0.01 -0.16,-0.03 -0.23,-0.03 -0.07,-0.01 -0.15,-0.01 -0.24,-0.01 -0.25,0 -0.46,0.05 -0.65,0.15 -0.19,0.1 -0.34,0.23 -0.45,0.41 -0.11,0.17 -0.16,0.38 -0.16,0.61v2.96h-0.77Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#00000000" android:pathData="M126.97,30.91v124.85M159.09,30.91v124.85M192.73,60.91H7.27M192.73,94.14H7.27M192.73,121.96H7.27" android:strokeColor="#ededf0" android:strokeWidth="1"/>
+      
+    <path android:fillColor="#2ac3a2" android:fillType="evenOdd" android:pathData="M149.7,74.77l-7.04,7.04c-0.1,0.1 -0.23,0.16 -0.38,0.16 -0.14,0 -0.28,-0.06 -0.38,-0.16l-4.33,-4.33 0.75,-0.75 3.96,3.96 6.66,-6.67 0.75,0.75Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#2ac3a2" android:fillType="evenOdd" android:pathData="M149.7,104.87l-7.04,7.04c-0.1,0.1 -0.23,0.16 -0.38,0.16 -0.14,0 -0.28,-0.06 -0.38,-0.16l-4.33,-4.33 0.75,-0.75 3.96,3.96 6.66,-6.67 0.75,0.75Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#2ac3a2" android:fillType="evenOdd" android:pathData="M149.7,135.16l-7.04,7.04c-0.1,0.1 -0.23,0.16 -0.38,0.16 -0.14,0 -0.28,-0.06 -0.38,-0.16l-4.33,-4.33 0.75,-0.75 3.96,3.96 6.66,-6.67 0.75,0.75Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#000000" android:pathData="M176.53,76.97l3.59,-3.59 -0.77,-0.77 -3.59,3.59 -3.59,-3.59 -0.77,0.77 3.59,3.59 -3.59,3.59 0.77,0.77 3.59,-3.59 3.59,3.59 0.77,-0.77 -3.59,-3.59Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#000000" android:pathData="M176.53,108.24l3.59,-3.59 -0.77,-0.77 -3.59,3.59 -3.59,-3.59 -0.77,0.77 3.59,3.59 -3.59,3.59 0.77,0.77 3.59,-3.59 3.59,3.59 0.77,-0.77 -3.59,-3.59Z" android:strokeWidth="0"/>
+      
+    <path android:fillColor="#000000" android:pathData="M176.53,138.53l3.59,-3.59 -0.77,-0.77 -3.59,3.59 -3.59,-3.59 -0.77,0.77 3.59,3.59 -3.59,3.59 0.77,0.77 3.59,-3.59 3.59,3.59 0.77,-0.77 -3.59,-3.59Z" android:strokeWidth="0"/>
+      
+    <path android:pathData="M150.46,43.2c-0.33,-0.79 -0.99,-1.63 -1.51,-1.9 0.42,0.83 0.67,1.66 0.76,2.28 0,0 0,0 0,0.01 -0.85,-2.12 -2.29,-2.97 -3.46,-4.83 -0.06,-0.09 -0.12,-0.19 -0.18,-0.29 -0.03,-0.05 -0.06,-0.1 -0.08,-0.16 -0.05,-0.09 -0.09,-0.19 -0.11,-0.3 0,-0 -0,-0.01 -0,-0.01 -0,-0 -0.01,-0.01 -0.01,-0.01 -0,-0 -0.01,-0 -0.01,0 -0,0 -0,0 -0,0 -0,0 -0,0 -0,0 0,-0 0,-0 0,-0 -1.89,1.1 -2.53,3.15 -2.59,4.17 -0.75,0.05 -1.47,0.33 -2.07,0.8 -0.06,-0.05 -0.13,-0.1 -0.19,-0.15 -0.17,-0.6 -0.18,-1.23 -0.02,-1.84 -0.77,0.35 -1.37,0.91 -1.81,1.4h-0c-0.3,-0.38 -0.28,-1.62 -0.26,-1.88 -0,-0.02 -0.22,0.11 -0.25,0.13 -0.26,0.19 -0.51,0.4 -0.73,0.63 -0.26,0.26 -0.49,0.54 -0.7,0.84v0,-0c-0.48,0.68 -0.82,1.46 -1.01,2.28 -0,0.02 -0.01,0.03 -0.01,0.05 -0.01,0.07 -0.06,0.4 -0.07,0.47 0,0.01 -0,0.01 -0,0.02 -0.07,0.34 -0.11,0.69 -0.12,1.04 0,0.01 -0,0.03 -0,0.04 0,4.15 3.36,7.51 7.51,7.51 3.72,0 6.8,-2.7 7.4,-6.24 0.01,-0.1 0.02,-0.19 0.03,-0.29 0.15,-1.29 -0.02,-2.64 -0.49,-3.77ZM141.8,49.08c0.04,0.02 0.07,0.04 0.1,0.05 0,0 0,0 0,0 -0.04,-0.02 -0.07,-0.04 -0.11,-0.05ZM149.72,43.59l-0,-0.01c0,0 0,0.01 0,0.01v-0Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:endX="137.21" android:endY="52.22" android:startX="149.27" android:startY="40.59" android:type="linear">
+                        
+                <item android:color="#FFFFF44F" android:offset="0.05"/>
+                        
+                <item android:color="#FFFF980E" android:offset="0.37"/>
+                        
+                <item android:color="#FFFF3647" android:offset="0.53"/>
+                        
+                <item android:color="#FFE31587" android:offset="0.7"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:pathData="M150.46,43.2c-0.33,-0.79 -0.99,-1.63 -1.51,-1.9 0.42,0.83 0.67,1.66 0.76,2.28 0,-0 0,0 0,0.01 0,0 0,0.01 0,0.01 0.71,1.92 0.32,3.87 -0.23,5.07 -0.86,1.85 -2.94,3.74 -6.2,3.65 -3.52,-0.1 -6.63,-2.71 -7.21,-6.14 -0.11,-0.54 0,-0.81 0.05,-1.25 -0.06,0.34 -0.09,0.44 -0.12,1.04 0,0.01 -0,0.03 -0,0.04 0,4.15 3.36,7.51 7.51,7.51 3.72,0 6.8,-2.7 7.4,-6.24 0.01,-0.1 0.02,-0.19 0.03,-0.29 0.15,-1.29 -0.02,-2.64 -0.49,-3.77Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:centerX="146.39" android:centerY="39.73" android:gradientRadius="15.36" android:type="radial">
+                        
+                <item android:color="#FFFFBD4F" android:offset="0.13"/>
+                        
+                <item android:color="#FFFF980E" android:offset="0.28"/>
+                        
+                <item android:color="#FFFF3750" android:offset="0.47"/>
+                        
+                <item android:color="#FFEB0878" android:offset="0.78"/>
+                        
+                <item android:color="#FFE50080" android:offset="0.86"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:pathData="M150.46,43.2c-0.33,-0.79 -0.99,-1.63 -1.51,-1.9 0.42,0.83 0.67,1.66 0.76,2.28 0,-0 0,0 0,0.01 0,0 0,0.01 0,0.01 0.71,1.92 0.32,3.87 -0.23,5.07 -0.86,1.85 -2.94,3.74 -6.2,3.65 -3.52,-0.1 -6.63,-2.71 -7.21,-6.14 -0.11,-0.54 0,-0.81 0.05,-1.25 -0.06,0.34 -0.09,0.44 -0.12,1.04 0,0.01 -0,0.03 -0,0.04 0,4.15 3.36,7.51 7.51,7.51 3.72,0 6.8,-2.7 7.4,-6.24 0.01,-0.1 0.02,-0.19 0.03,-0.29 0.15,-1.29 -0.02,-2.64 -0.49,-3.77Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:centerX="141.94" android:centerY="46.18" android:gradientRadius="15.74" android:type="radial">
+                        
+                <item android:color="#FF960E18" android:offset="0.3"/>
+                        
+                <item android:color="#BCB11927" android:offset="0.35"/>
+                        
+                <item android:color="#56DB293D" android:offset="0.43"/>
+                        
+                <item android:color="#16F5334B" android:offset="0.5"/>
+                        
+                <item android:color="#00FF3750" android:offset="0.53"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:pathData="M146.81,44.08c0.02,0.01 0.03,0.02 0.05,0.03 -0.19,-0.33 -0.42,-0.64 -0.7,-0.91 -2.33,-2.33 -0.61,-5.06 -0.32,-5.2 0,-0 0,-0 0,-0 -1.89,1.1 -2.53,3.15 -2.58,4.17 0.09,-0.01 0.17,-0.01 0.26,-0.01 1.41,0 2.63,0.77 3.29,1.92Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:centerX="144.98" android:centerY="37.27" android:gradientRadius="5.04" android:type="radial">
+                        
+                <item android:color="#FFFFF44F" android:offset="0.13"/>
+                        
+                <item android:color="#FFFF980E" android:offset="0.53"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:pathData="M143.52,44.55c-0.01,0.19 -0.67,0.83 -0.9,0.83 -2.14,0 -2.48,1.29 -2.48,1.29 0.09,1.09 0.85,1.98 1.77,2.46 0.04,0.02 0.08,0.04 0.13,0.06 0.07,0.03 0.15,0.06 0.22,0.09 0.31,0.11 0.64,0.17 0.98,0.19 3.74,0.18 4.47,-4.47 1.77,-5.83 0.69,-0.12 1.41,0.16 1.81,0.44 -0.66,-1.15 -1.88,-1.92 -3.29,-1.92 -0.09,0 -0.18,0.01 -0.26,0.01 -0.75,0.05 -1.47,0.33 -2.07,0.8 0.11,0.1 0.24,0.23 0.52,0.49 0.51,0.5 1.82,1.02 1.82,1.08Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:centerX="141.66" android:centerY="50.21" android:gradientRadius="6.67" android:type="radial">
+                        
+                <item android:color="#FF3A8EE6" android:offset="0.35"/>
+                        
+                <item android:color="#FF9059FF" android:offset="0.67"/>
+                        
+                <item android:color="#FFC139E6" android:offset="1"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:pathData="M143.52,44.55c-0.01,0.19 -0.67,0.83 -0.9,0.83 -2.14,0 -2.48,1.29 -2.48,1.29 0.09,1.09 0.85,1.98 1.77,2.46 0.04,0.02 0.08,0.04 0.13,0.06 0.07,0.03 0.15,0.06 0.22,0.09 0.31,0.11 0.64,0.17 0.98,0.19 3.74,0.18 4.47,-4.47 1.77,-5.83 0.69,-0.12 1.41,0.16 1.81,0.44 -0.66,-1.15 -1.88,-1.92 -3.29,-1.92 -0.09,0 -0.18,0.01 -0.26,0.01 -0.75,0.05 -1.47,0.33 -2.07,0.8 0.11,0.1 0.24,0.23 0.52,0.49 0.51,0.5 1.82,1.02 1.82,1.08Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:centerX="142.8" android:centerY="44.57" android:gradientRadius="3.54" android:type="radial">
+                        
+                <item android:color="#009059FF" android:offset="0.21"/>
+                        
+                <item android:color="#996E008B" android:offset="0.97"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:pathData="M140.84,42.72c0.05,0.03 0.1,0.07 0.16,0.1 -0.17,-0.6 -0.18,-1.23 -0.02,-1.84 -0.77,0.35 -1.37,0.91 -1.81,1.4 0.04,-0 1.13,-0.02 1.67,0.34Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:centerX="143.01" android:centerY="39.15" android:gradientRadius="5.3" android:type="radial">
+                        
+                <item android:color="#FFFFE226" android:offset="0.1"/>
+                        
+                <item android:color="#FFFF7139" android:offset="0.79"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:pathData="M136.07,46.17c0.58,3.42 3.68,6.04 7.21,6.14 3.26,0.09 5.34,-1.8 6.2,-3.65 0.56,-1.19 0.94,-3.15 0.23,-5.07v-0l-0,-0.01c-0,-0.01 -0,-0.01 -0,-0.01 0,0 0,0 0,0.01 0.27,1.74 -0.62,3.42 -2,4.56l-0,0.01c-2.69,2.19 -5.27,1.32 -5.8,0.97 -0.04,-0.02 -0.07,-0.04 -0.11,-0.05 -1.57,-0.75 -2.22,-2.18 -2.08,-3.41 -1.33,0 -1.78,-1.12 -1.78,-1.12 0,0 1.19,-0.85 2.76,-0.11 1.45,0.68 2.82,0.11 2.82,0.11 -0,-0.06 -1.31,-0.58 -1.82,-1.08 -0.27,-0.27 -0.4,-0.4 -0.52,-0.49 -0.06,-0.05 -0.13,-0.1 -0.19,-0.15 -0.05,-0.04 -0.1,-0.07 -0.16,-0.1 -0.55,-0.36 -1.64,-0.34 -1.67,-0.34h-0c-0.3,-0.38 -0.28,-1.62 -0.26,-1.88 -0,-0.02 -0.22,0.11 -0.25,0.13 -0.26,0.19 -0.51,0.4 -0.73,0.63 -0.26,0.26 -0.49,0.54 -0.7,0.84v0,-0c-0.48,0.68 -0.82,1.46 -1.01,2.28 -0,0.02 -0.27,1.18 -0.14,1.79Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:centerX="147.85" android:centerY="35.66" android:gradientRadius="25.32" android:type="radial">
+                        
+                <item android:color="#FFFFF44F" android:offset="0.11"/>
+                        
+                <item android:color="#FFFF980E" android:offset="0.46"/>
+                        
+                <item android:color="#FFFF3647" android:offset="0.72"/>
+                        
+                <item android:color="#FFE31587" android:offset="0.9"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:pathData="M146.16,43.21c0.27,0.27 0.51,0.58 0.7,0.91 0.04,0.03 0.08,0.06 0.11,0.09 1.7,1.57 0.81,3.79 0.74,3.95 1.38,-1.14 2.27,-2.82 2,-4.56 -0.85,-2.12 -2.29,-2.97 -3.46,-4.83 -0.06,-0.09 -0.12,-0.19 -0.18,-0.29 -0.03,-0.05 -0.06,-0.1 -0.08,-0.16 -0.05,-0.09 -0.09,-0.19 -0.11,-0.3 0,-0 -0,-0.01 -0,-0.01 -0,-0 -0.01,-0.01 -0.01,-0.01 -0,-0 -0.01,-0 -0.01,0 -0,0 -0,0 -0,0 -0,0 -0,0 -0.01,0 -0.29,0.14 -2.01,2.87 0.32,5.2Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:centerX="138.45" android:centerY="42.68" android:gradientRadius="8.03" android:type="radial">
+                        
+                <item android:color="#FFFFF44F" android:offset="0"/>
+                        
+                <item android:color="#FFFF980E" android:offset="0.3"/>
+                        
+                <item android:color="#FFFF3647" android:offset="0.57"/>
+                        
+                <item android:color="#FFE31587" android:offset="0.74"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:pathData="M146.97,44.21c-0.03,-0.03 -0.07,-0.06 -0.11,-0.09 -0.01,-0.01 -0.03,-0.02 -0.05,-0.03 -0.4,-0.28 -1.12,-0.56 -1.81,-0.44 2.7,1.35 1.98,6 -1.77,5.83 -0.33,-0.01 -0.66,-0.08 -0.98,-0.19 -0.07,-0.03 -0.15,-0.06 -0.22,-0.09 -0.04,-0.02 -0.08,-0.04 -0.13,-0.06 0,0 0,0 0,0 0.52,0.36 3.1,1.23 5.8,-0.97l0,-0.01c0.07,-0.16 0.96,-2.38 -0.74,-3.95Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:centerX="143.06" android:centerY="41.07" android:gradientRadius="14.54" android:type="radial">
+                        
+                <item android:color="#FFFFF44F" android:offset="0.14"/>
+                        
+                <item android:color="#FFFF980E" android:offset="0.48"/>
+                        
+                <item android:color="#FFFF3647" android:offset="0.66"/>
+                        
+                <item android:color="#FFE31587" android:offset="0.9"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:pathData="M140.14,46.67s0.35,-1.29 2.48,-1.29c0.23,0 0.89,-0.64 0.9,-0.83 0.01,-0.19 -1.37,0.57 -2.82,-0.11 -1.57,-0.74 -2.76,0.11 -2.76,0.11 0,0 0.45,1.12 1.78,1.12 -0.14,1.23 0.51,2.66 2.08,3.41 0.04,0.02 0.07,0.04 0.1,0.05 -0.92,-0.47 -1.67,-1.37 -1.77,-2.46Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:centerX="146.83" android:centerY="41.9" android:gradientRadius="17.47" android:type="radial">
+                        
+                <item android:color="#FFFFF44F" android:offset="0.09"/>
+                        
+                <item android:color="#FFFF980E" android:offset="0.63"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:pathData="M150.46,43.2c-0.33,-0.79 -0.99,-1.63 -1.51,-1.9 0.42,0.83 0.67,1.66 0.76,2.28 0,0 0,0 0,0.01 -0.85,-2.12 -2.29,-2.97 -3.46,-4.83 -0.06,-0.09 -0.12,-0.19 -0.18,-0.29 -0.03,-0.05 -0.06,-0.1 -0.08,-0.16 -0.05,-0.09 -0.09,-0.19 -0.11,-0.3 0,-0 -0,-0.01 -0,-0.01 -0,-0 -0.01,-0.01 -0.01,-0.01 -0,-0 -0.01,-0 -0.01,0 -0,0 -0,0 -0,0 -0,0 -0,0 -0,0 0,-0 0,-0 0,-0 -1.89,1.1 -2.53,3.15 -2.59,4.17 0.09,-0.01 0.17,-0.01 0.26,-0.01 1.41,0 2.63,0.77 3.29,1.92 -0.4,-0.28 -1.12,-0.56 -1.81,-0.44 2.7,1.35 1.98,6 -1.77,5.83 -0.33,-0.01 -0.66,-0.08 -0.98,-0.19 -0.08,-0.03 -0.15,-0.06 -0.22,-0.09 -0.04,-0.02 -0.08,-0.04 -0.13,-0.06 0,0 0,0 0,0 -0.04,-0.02 -0.07,-0.04 -0.11,-0.05 0.04,0.02 0.07,0.04 0.11,0.05 -0.92,-0.47 -1.67,-1.37 -1.77,-2.46 0,0 0.35,-1.29 2.48,-1.29 0.23,0 0.89,-0.64 0.9,-0.83 -0,-0.06 -1.31,-0.58 -1.82,-1.08 -0.27,-0.27 -0.4,-0.4 -0.52,-0.49 -0.06,-0.05 -0.13,-0.1 -0.19,-0.15 -0.17,-0.6 -0.18,-1.23 -0.02,-1.84 -0.77,0.35 -1.37,0.91 -1.81,1.4h-0c-0.3,-0.38 -0.28,-1.62 -0.26,-1.88 -0,-0.02 -0.22,0.11 -0.25,0.13 -0.26,0.19 -0.51,0.4 -0.73,0.63 -0.26,0.26 -0.49,0.54 -0.7,0.84v0,-0c-0.48,0.68 -0.82,1.46 -1.01,2.28 -0,0.02 -0.01,0.03 -0.01,0.05 -0.01,0.07 -0.08,0.4 -0.09,0.47 -0,0.01 0,-0.01 0,0 -0.06,0.35 -0.09,0.7 -0.11,1.05 0,0.01 -0,0.03 -0,0.04 0,4.15 3.36,7.51 7.51,7.51 3.72,0 6.8,-2.7 7.4,-6.24 0.01,-0.1 0.02,-0.19 0.03,-0.29 0.15,-1.29 -0.02,-2.64 -0.49,-3.77ZM149.71,43.58c0,0 0,0.01 0,0.01v-0l-0,-0.01Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:endX="138.88" android:endY="51.19" android:startX="148.53" android:startY="40.65" android:type="linear">
+                        
+                <item android:color="#CCFFF44F" android:offset="0.17"/>
+                        
+                <item android:color="#00FFF44F" android:offset="0.6"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:fillColor="#fff" android:pathData="M174.88,49.5c1.93,0 3.5,-1.57 3.5,-3.5 0,-1.93 -1.57,-3.5 -3.5,-3.5 -1.93,0 -3.5,1.57 -3.5,3.5 0,1.93 1.57,3.5 3.5,3.5Z" android:strokeWidth="0"/>
+      
+    <path android:pathData="M174.88,42.5h6.06c-1.93,-3.35 -6.21,-4.49 -9.56,-2.56 -1.06,0.61 -1.95,1.5 -2.56,2.56l3.03,5.25 0,-0c-0.97,-1.67 -0.4,-3.81 1.27,-4.78 0.53,-0.31 1.14,-0.47 1.76,-0.47Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:endX="180.94" android:endY="43.37" android:startX="168.82" android:startY="43.37" android:type="linear">
+                        
+                <item android:color="#FFD93025" android:offset="0"/>
+                        
+                <item android:color="#FFEA4335" android:offset="1"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:fillColor="#1a73e8" android:pathData="M174.88,48.77c1.53,0 2.77,-1.24 2.77,-2.77 0,-1.53 -1.24,-2.77 -2.77,-2.77s-2.77,1.24 -2.77,2.77c0,1.53 1.24,2.77 2.77,2.77Z" android:strokeWidth="0"/>
+      
+    <path android:pathData="M177.91,47.75l-3.03,5.25c3.87,0 7,-3.13 7,-7 0,-1.23 -0.32,-2.44 -0.94,-3.5h-6.06l-0,0c1.93,-0 3.5,1.56 3.5,3.49 0,0.62 -0.16,1.22 -0.47,1.76Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:endX="179.98" android:endY="42.41" android:startX="173.92" android:startY="52.91" android:type="linear">
+                        
+                <item android:color="#FFFCC934" android:offset="0"/>
+                        
+                <item android:color="#FFFBBC04" android:offset="1"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+      
+    <path android:pathData="M171.85,47.75l-3.03,-5.25c-1.93,3.35 -0.79,7.63 2.56,9.56 1.06,0.61 2.27,0.94 3.5,0.94l3.03,-5.25 -0,-0c-0.96,1.67 -3.1,2.25 -4.77,1.29 -0.53,-0.31 -0.98,-0.75 -1.29,-1.29Z" android:strokeWidth="0">
+            
+        <aapt:attr name="android:fillColor">
+                  
+            <gradient android:endX="169.57" android:endY="42.07" android:startX="175.64" android:startY="52.56" android:type="linear">
+                        
+                <item android:color="#FF1E8E3E" android:offset="0"/>
+                        
+                <item android:color="#FF34A853" android:offset="1"/>
+                      
+            </gradient>
+                
+        </aapt:attr>
+          
+    </path>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_onboarding_key_features_icons_only.xml b/app/src/main/res/drawable/ic_onboarding_key_features_icons_only.xml
new file mode 100644
index 000000000..820fd340e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_onboarding_key_features_icons_only.xml
@@ -0,0 +1,307 @@
+<vector xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android" android:height="320dp" android:viewportHeight="193.94" android:viewportWidth="200" android:width="329.99896dp">
+      
+    <group>
+            
+        <clip-path android:pathData="M0,0h200v193.94h-200z"/>
+            
+        <path android:fillColor="#ab71ff" android:pathData="M179.44,129.92c-17.11,7.31 -23.09,39.17 -26.65,46.24 -7.44,15.67 -41.53,6.53 -54.54,6.53s-26.96,10.45 -47.73,11.23c-20.76,0.78 -33.16,-20.38 -33.16,-46.76S0,106.93 0,88.9s20.14,-16.72 33.16,-23.77c13.02,-7.05 23.55,-56.43 60.74,-63.48 37.19,-7.05 59.5,9.93 81.51,23.25 22,13.32 26.65,40.49 23.86,55.64 -2.79,15.15 1.55,40.23 -19.83,49.37Z" android:strokeWidth="0"/>
+            
+        <path android:fillColor="#f9f9fb" android:pathData="M150.3,21.21H51.51c-3.35,0 -6.06,2.71 -6.06,6.06v138.79c0,3.35 2.71,6.06 6.06,6.06h98.79c3.35,0 6.06,-2.71 6.06,-6.06V27.27c0,-3.35 -2.71,-6.06 -6.06,-6.06Z" android:strokeColor="#ededf0" android:strokeWidth="1"/>
+            
+        <path android:fillColor="#00000000" android:pathData="M90.61,21.21v150.91M122.12,21.21v150.91M156.36,63.33H45.45M156.36,99.7H46.67M156.36,136.06H45.45" android:strokeColor="#ededf0" android:strokeWidth="1"/>
+            
+        <path android:pathData="M112.73,39.96c-0.33,-0.8 -1.01,-1.67 -1.54,-1.94 0.43,0.85 0.68,1.69 0.78,2.33 0,0 0,0 0,0.01 -0.87,-2.16 -2.34,-3.03 -3.54,-4.93 -0.06,-0.1 -0.12,-0.19 -0.18,-0.29 -0.03,-0.05 -0.06,-0.1 -0.09,-0.16 -0.05,-0.1 -0.09,-0.2 -0.12,-0.3 0,-0 -0,-0.01 -0,-0.01 -0,-0 -0.01,-0.01 -0.01,-0.01 -0,-0 -0.01,-0 -0.01,0 -0,0 -0,0 -0,0 -0,0 -0,0 -0.01,0 0,-0 0,-0 0,-0 -1.93,1.13 -2.58,3.22 -2.64,4.26 -0.77,0.05 -1.5,0.34 -2.11,0.81 -0.06,-0.05 -0.13,-0.1 -0.2,-0.15 -0.17,-0.61 -0.18,-1.26 -0.02,-1.87 -0.79,0.36 -1.4,0.93 -1.85,1.43h-0c-0.3,-0.39 -0.28,-1.66 -0.27,-1.92 -0,-0.02 -0.23,0.12 -0.26,0.14 -0.27,0.19 -0.52,0.41 -0.75,0.64 -0.26,0.27 -0.5,0.55 -0.72,0.86 0,0 0,0 -0,0 0,-0 0,-0 0,-0 -0.49,0.7 -0.84,1.49 -1.03,2.32 -0,0.02 -0.01,0.03 -0.01,0.05 -0.01,0.07 -0.07,0.41 -0.08,0.48 -0,0.01 -0,0.01 -0,0.02 -0.07,0.35 -0.11,0.7 -0.12,1.06 0,0.01 -0,0.03 -0,0.04 0,4.24 3.43,7.67 7.67,7.67 3.79,0 6.95,-2.75 7.56,-6.37 0.01,-0.1 0.02,-0.2 0.04,-0.3 0.15,-1.32 -0.02,-2.7 -0.5,-3.85ZM103.88,45.97c0.04,0.02 0.07,0.04 0.11,0.05 0,0 0,0 0,0 -0.04,-0.02 -0.08,-0.04 -0.11,-0.06ZM111.97,40.36v-0.01c0,0 0,0.01 0,0.01l-0,-0Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:endX="99.19" android:endY="49.18" android:startX="111.51" android:startY="37.3" android:type="linear">
+                              
+                    <item android:color="#FFFFF44F" android:offset="0.05"/>
+                              
+                    <item android:color="#FFFF980E" android:offset="0.37"/>
+                              
+                    <item android:color="#FFFF3647" android:offset="0.53"/>
+                              
+                    <item android:color="#FFE31587" android:offset="0.7"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:pathData="M112.73,39.96c-0.33,-0.8 -1.01,-1.67 -1.54,-1.94 0.43,0.85 0.68,1.69 0.78,2.33 0,-0 0,0 0,0.01 0,0 0,0.01 0,0.01 0.72,1.96 0.33,3.96 -0.24,5.18 -0.88,1.89 -3.01,3.82 -6.34,3.73 -3.6,-0.1 -6.77,-2.77 -7.36,-6.27 -0.11,-0.55 0,-0.83 0.05,-1.28 -0.07,0.35 -0.09,0.44 -0.12,1.06 0,0.01 -0,0.03 -0,0.04 0,4.24 3.43,7.67 7.67,7.67 3.79,0 6.95,-2.75 7.56,-6.37 0.01,-0.1 0.02,-0.2 0.04,-0.3 0.15,-1.32 -0.02,-2.7 -0.5,-3.85Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:centerX="108.57" android:centerY="36.42" android:gradientRadius="15.69" android:type="radial">
+                              
+                    <item android:color="#FFFFBD4F" android:offset="0.13"/>
+                              
+                    <item android:color="#FFFF980E" android:offset="0.28"/>
+                              
+                    <item android:color="#FFFF3750" android:offset="0.47"/>
+                              
+                    <item android:color="#FFEB0878" android:offset="0.78"/>
+                              
+                    <item android:color="#FFE50080" android:offset="0.86"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:pathData="M112.73,39.96c-0.33,-0.8 -1.01,-1.67 -1.54,-1.94 0.43,0.85 0.68,1.69 0.78,2.33 0,-0 0,0 0,0.01 0,0 0,0.01 0,0.01 0.72,1.96 0.33,3.96 -0.24,5.18 -0.88,1.89 -3.01,3.82 -6.34,3.73 -3.6,-0.1 -6.77,-2.77 -7.36,-6.27 -0.11,-0.55 0,-0.83 0.05,-1.28 -0.07,0.35 -0.09,0.44 -0.12,1.06 0,0.01 -0,0.03 -0,0.04 0,4.24 3.43,7.67 7.67,7.67 3.79,0 6.95,-2.75 7.56,-6.37 0.01,-0.1 0.02,-0.2 0.04,-0.3 0.15,-1.32 -0.02,-2.7 -0.5,-3.85Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:centerX="104.02" android:centerY="43.01" android:gradientRadius="16.08" android:type="radial">
+                              
+                    <item android:color="#FF960E18" android:offset="0.3"/>
+                              
+                    <item android:color="#BCB11927" android:offset="0.35"/>
+                              
+                    <item android:color="#56DB293D" android:offset="0.43"/>
+                              
+                    <item android:color="#16F5334B" android:offset="0.5"/>
+                              
+                    <item android:color="#00FF3750" android:offset="0.53"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:pathData="M109,40.86c0.02,0.01 0.03,0.02 0.05,0.04 -0.19,-0.34 -0.43,-0.65 -0.71,-0.93 -2.38,-2.38 -0.63,-5.17 -0.33,-5.31 0,-0 0,-0 0,-0 -1.93,1.13 -2.58,3.22 -2.64,4.26 0.09,-0.01 0.18,-0.01 0.27,-0.01 1.44,0 2.69,0.79 3.36,1.96Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:centerX="107.13" android:centerY="33.9" android:gradientRadius="5.15" android:type="radial">
+                              
+                    <item android:color="#FFFFF44F" android:offset="0.13"/>
+                              
+                    <item android:color="#FFFF980E" android:offset="0.53"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:pathData="M105.64,41.34c-0.01,0.19 -0.69,0.85 -0.92,0.85 -2.18,0 -2.54,1.32 -2.54,1.32 0.1,1.11 0.87,2.03 1.81,2.51 0.04,0.02 0.09,0.04 0.13,0.06 0.07,0.03 0.15,0.06 0.22,0.09 0.32,0.11 0.66,0.18 1,0.19 3.82,0.18 4.56,-4.57 1.8,-5.95 0.71,-0.12 1.44,0.16 1.85,0.45 -0.67,-1.17 -1.92,-1.96 -3.36,-1.96 -0.09,0 -0.18,0.01 -0.27,0.01 -0.77,0.05 -1.5,0.34 -2.11,0.81 0.12,0.1 0.25,0.23 0.53,0.51 0.52,0.51 1.86,1.04 1.86,1.11Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:centerX="103.73" android:centerY="47.13" android:gradientRadius="6.81" android:type="radial">
+                              
+                    <item android:color="#FF3A8EE6" android:offset="0.35"/>
+                              
+                    <item android:color="#FF9059FF" android:offset="0.67"/>
+                              
+                    <item android:color="#FFC139E6" android:offset="1"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:pathData="M105.64,41.34c-0.01,0.19 -0.69,0.85 -0.92,0.85 -2.18,0 -2.54,1.32 -2.54,1.32 0.1,1.11 0.87,2.03 1.81,2.51 0.04,0.02 0.09,0.04 0.13,0.06 0.07,0.03 0.15,0.06 0.22,0.09 0.32,0.11 0.66,0.18 1,0.19 3.82,0.18 4.56,-4.57 1.8,-5.95 0.71,-0.12 1.44,0.16 1.85,0.45 -0.67,-1.17 -1.92,-1.96 -3.36,-1.96 -0.09,0 -0.18,0.01 -0.27,0.01 -0.77,0.05 -1.5,0.34 -2.11,0.81 0.12,0.1 0.25,0.23 0.53,0.51 0.52,0.51 1.86,1.04 1.86,1.11Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:centerX="104.9" android:centerY="41.37" android:gradientRadius="3.62" android:type="radial">
+                              
+                    <item android:color="#009059FF" android:offset="0.21"/>
+                              
+                    <item android:color="#996E008B" android:offset="0.97"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:pathData="M102.9,39.47c0.05,0.03 0.11,0.07 0.16,0.11 -0.17,-0.61 -0.18,-1.26 -0.02,-1.87 -0.79,0.36 -1.4,0.93 -1.85,1.43 0.04,-0 1.15,-0.02 1.71,0.34Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:centerX="105.11" android:centerY="35.83" android:gradientRadius="5.42" android:type="radial">
+                              
+                    <item android:color="#FFFFE226" android:offset="0.1"/>
+                              
+                    <item android:color="#FFFF7139" android:offset="0.79"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:pathData="M98.03,43c0.59,3.5 3.76,6.17 7.36,6.27 3.33,0.09 5.46,-1.84 6.34,-3.73 0.57,-1.22 0.96,-3.21 0.24,-5.18v-0l-0,-0.01c-0,-0.01 -0,-0.01 -0,-0.01 0,0 0,0 0,0.01 0.27,1.78 -0.63,3.5 -2.05,4.66l-0,0.01c-2.75,2.24 -5.39,1.35 -5.92,0.99 -0.04,-0.02 -0.08,-0.04 -0.11,-0.06 -1.61,-0.77 -2.27,-2.23 -2.13,-3.48 -1.36,0 -1.82,-1.14 -1.82,-1.14 0,0 1.22,-0.87 2.82,-0.11 1.49,0.7 2.88,0.11 2.88,0.11 -0,-0.06 -1.34,-0.59 -1.86,-1.11 -0.28,-0.27 -0.41,-0.41 -0.53,-0.51 -0.06,-0.05 -0.13,-0.1 -0.2,-0.15 -0.05,-0.04 -0.11,-0.07 -0.16,-0.11 -0.56,-0.36 -1.67,-0.34 -1.71,-0.34h-0c-0.3,-0.39 -0.28,-1.66 -0.26,-1.92 -0,-0.02 -0.23,0.12 -0.26,0.14 -0.27,0.19 -0.52,0.41 -0.75,0.64 -0.26,0.27 -0.5,0.55 -0.72,0.86 -0.49,0.7 -0.84,1.49 -1.03,2.32 -0,0.02 -0.28,1.21 -0.14,1.83Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:centerX="110.06" android:centerY="32.26" android:gradientRadius="25.87" android:type="radial">
+                              
+                    <item android:color="#FFFFF44F" android:offset="0.11"/>
+                              
+                    <item android:color="#FFFF980E" android:offset="0.46"/>
+                              
+                    <item android:color="#FFFF3647" android:offset="0.72"/>
+                              
+                    <item android:color="#FFE31587" android:offset="0.9"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:pathData="M108.33,39.97c0.28,0.27 0.52,0.59 0.71,0.93 0.04,0.03 0.08,0.06 0.12,0.09 1.74,1.6 0.83,3.87 0.76,4.03 1.41,-1.16 2.32,-2.89 2.05,-4.66 -0.87,-2.16 -2.34,-3.03 -3.54,-4.93 -0.06,-0.1 -0.12,-0.19 -0.18,-0.29 -0.03,-0.05 -0.06,-0.1 -0.08,-0.16 -0.05,-0.1 -0.09,-0.2 -0.12,-0.3 0,-0 -0,-0.01 -0,-0.01 -0,-0 -0.01,-0.01 -0.01,-0.01 -0,-0 -0.01,-0 -0.01,0 -0,0 -0,0 -0,0 -0,0 -0,0 -0.01,0 -0.3,0.14 -2.06,2.93 0.33,5.31Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:centerX="100.45" android:centerY="39.43" android:gradientRadius="8.21" android:type="radial">
+                              
+                    <item android:color="#FFFFF44F" android:offset="0"/>
+                              
+                    <item android:color="#FFFF980E" android:offset="0.3"/>
+                              
+                    <item android:color="#FFFF3647" android:offset="0.57"/>
+                              
+                    <item android:color="#FFE31587" android:offset="0.74"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:pathData="M109.16,40.99c-0.03,-0.03 -0.07,-0.06 -0.12,-0.09 -0.02,-0.01 -0.03,-0.02 -0.05,-0.04 -0.41,-0.29 -1.14,-0.57 -1.85,-0.45 2.76,1.38 2.02,6.13 -1.8,5.95 -0.34,-0.01 -0.68,-0.08 -1,-0.19 -0.08,-0.03 -0.15,-0.06 -0.22,-0.09 -0.04,-0.02 -0.09,-0.04 -0.13,-0.06 0,0 0,0 0.01,0 0.53,0.36 3.17,1.25 5.92,-0.99l0,-0.01c0.07,-0.16 0.98,-2.43 -0.76,-4.03Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:centerX="105.17" android:centerY="37.79" android:gradientRadius="14.85" android:type="radial">
+                              
+                    <item android:color="#FFFFF44F" android:offset="0.14"/>
+                              
+                    <item android:color="#FFFF980E" android:offset="0.48"/>
+                              
+                    <item android:color="#FFFF3647" android:offset="0.66"/>
+                              
+                    <item android:color="#FFE31587" android:offset="0.9"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:pathData="M102.18,43.51s0.35,-1.32 2.54,-1.32c0.23,0 0.91,-0.66 0.92,-0.85s-1.39,0.59 -2.88,-0.11c-1.6,-0.75 -2.82,0.11 -2.82,0.11 0,0 0.46,1.14 1.82,1.14 -0.14,1.25 0.52,2.72 2.13,3.48 0.04,0.02 0.07,0.04 0.11,0.05 -0.94,-0.48 -1.71,-1.4 -1.81,-2.51Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:centerX="109.02" android:centerY="38.64" android:gradientRadius="17.85" android:type="radial">
+                              
+                    <item android:color="#FFFFF44F" android:offset="0.09"/>
+                              
+                    <item android:color="#FFFF980E" android:offset="0.63"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:pathData="M112.73,39.96c-0.33,-0.8 -1.01,-1.67 -1.54,-1.94 0.43,0.85 0.68,1.69 0.78,2.33 0,0 0,0 0,0.01 -0.87,-2.16 -2.34,-3.03 -3.54,-4.93 -0.06,-0.1 -0.12,-0.19 -0.18,-0.29 -0.03,-0.05 -0.06,-0.1 -0.09,-0.16 -0.05,-0.1 -0.09,-0.2 -0.12,-0.3 0,-0 -0,-0.01 -0,-0.01 -0,-0 -0.01,-0.01 -0.01,-0.01 -0,-0 -0.01,-0 -0.01,0 -0,0 -0,0 -0,0 -0,0 -0,0 -0.01,0 0,-0 0,-0 0,-0 -1.93,1.13 -2.58,3.22 -2.64,4.26 0.09,-0.01 0.18,-0.01 0.27,-0.01 1.44,0 2.69,0.79 3.36,1.96 -0.41,-0.29 -1.14,-0.57 -1.85,-0.45 2.76,1.38 2.02,6.13 -1.8,5.95 -0.34,-0.01 -0.68,-0.08 -1,-0.19 -0.08,-0.03 -0.15,-0.06 -0.22,-0.09 -0.04,-0.02 -0.09,-0.04 -0.13,-0.06 0,0 0,0 0.01,0 -0.04,-0.02 -0.08,-0.04 -0.11,-0.06 0.04,0.02 0.07,0.04 0.11,0.05 -0.94,-0.48 -1.71,-1.4 -1.81,-2.51 0,0 0.35,-1.32 2.54,-1.32 0.24,0 0.91,-0.66 0.92,-0.85 -0,-0.06 -1.34,-0.59 -1.86,-1.11 -0.28,-0.27 -0.41,-0.41 -0.53,-0.51 -0.06,-0.05 -0.13,-0.1 -0.2,-0.15 -0.17,-0.61 -0.18,-1.26 -0.02,-1.87 -0.79,0.36 -1.4,0.93 -1.85,1.43h-0c-0.3,-0.39 -0.28,-1.66 -0.26,-1.92 -0,-0.02 -0.23,0.12 -0.26,0.14 -0.27,0.19 -0.52,0.41 -0.75,0.64 -0.26,0.27 -0.5,0.55 -0.72,0.86 -0.49,0.7 -0.84,1.49 -1.03,2.32 -0,0.02 -0.01,0.03 -0.01,0.05 -0.01,0.07 -0.08,0.41 -0.09,0.48 0,-0.01 -0,0.01 0,0 -0.06,0.35 -0.1,0.71 -0.11,1.07 0,0.01 -0,0.03 -0,0.04 0,4.24 3.43,7.67 7.67,7.67 3.79,0 6.95,-2.75 7.56,-6.37 0.01,-0.1 0.02,-0.2 0.04,-0.3 0.15,-1.32 -0.02,-2.7 -0.5,-3.85ZM111.97,40.36c0,0 0,0.01 0,0.01l-0,-0v-0.01Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:endX="100.9" android:endY="48.12" android:startX="110.75" android:startY="37.36" android:type="linear">
+                              
+                    <item android:color="#CCFFF44F" android:offset="0.17"/>
+                              
+                    <item android:color="#00FFF44F" android:offset="0.6"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:fillColor="#2ac3a2" android:fillType="evenOdd" android:pathData="M113.03,113.31l-8.8,8.8c-0.12,0.12 -0.29,0.19 -0.47,0.19s-0.34,-0.07 -0.47,-0.19l-5.41,-5.41 0.94,-0.94 4.94,4.95 8.33,-8.33 0.94,0.94Z" android:strokeWidth="0"/>
+            
+        <path android:fillColor="#9591af" android:pathData="M139.75,117.58l4.49,-4.49 -0.97,-0.96 -4.49,4.49 -4.49,-4.49 -0.96,0.96 4.49,4.49 -4.49,4.49 0.96,0.96 4.49,-4.49 4.49,4.49 0.96,-0.96 -4.49,-4.49Z" android:strokeWidth="0"/>
+            
+        <path android:fillColor="#FF000000" android:fillType="evenOdd" android:pathData="M69.47,111.33c-0.73,0 -1.33,0.59 -1.33,1.33v1.8c0,0.37 -0.3,0.66 -0.66,0.66h-2.56c-0.31,0 -0.57,0.25 -0.57,0.57v1.14h1.14c1.46,0 2.65,1.19 2.65,2.65s-1.19,2.65 -2.65,2.65h-1.14v1.14c0,0.31 0.25,0.57 0.57,0.57h9.09c0.31,0 0.57,-0.25 0.57,-0.57v-7.58c0,-0.31 -0.25,-0.57 -0.57,-0.57h-2.56c-0.37,0 -0.66,-0.3 -0.66,-0.66v-1.8c0,-0.73 -0.59,-1.33 -1.33,-1.33ZM66.82,112.65c0,-1.47 1.19,-2.65 2.65,-2.65 1.46,0 2.65,1.19 2.65,2.65v1.14h1.89c1.05,0 1.89,0.85 1.89,1.89v7.58c0,1.04 -0.85,1.89 -1.89,1.89h-9.09c-1.05,0 -1.89,-0.85 -1.89,-1.89v-1.8c0,-0.37 0.3,-0.66 0.66,-0.66h1.8c0.73,0 1.33,-0.59 1.33,-1.33s-0.59,-1.33 -1.33,-1.33h-1.8c-0.37,0 -0.66,-0.3 -0.66,-0.66v-1.8c0,-1.05 0.85,-1.89 1.89,-1.89h1.89v-1.14Z" android:strokeWidth="0"/>
+            
+        <path android:fillColor="#2ac3a2" android:fillType="evenOdd" android:pathData="M113.03,78.77l-8.8,8.8c-0.12,0.12 -0.29,0.19 -0.47,0.19s-0.34,-0.07 -0.47,-0.19l-5.41,-5.41 0.94,-0.94 4.94,4.94 8.33,-8.33 0.94,0.94Z" android:strokeWidth="0"/>
+            
+        <path android:fillColor="#9591af" android:pathData="M139.75,83.03l4.49,-4.49 -0.97,-0.96 -4.49,4.49 -4.49,-4.49 -0.96,0.96 4.49,4.49 -4.49,4.49 0.96,0.96 4.49,-4.49 4.49,4.49 0.96,-0.96 -4.49,-4.49Z" android:strokeWidth="0"/>
+            
+        <path android:fillColor="#FF000000" android:pathData="M69.09,90.61c-0.39,0 -0.77,-0.1 -1.11,-0.29 -1.58,-0.88 -3.02,-2.24 -4.08,-3.85 -0.54,-0.82 -0.92,-1.8 -1.13,-2.95l-0.54,-2.92c-0.18,-0.97 0.29,-1.94 1.15,-2.41l4.56,-2.47c0.67,-0.36 1.48,-0.36 2.16,0l4.67,2.52c0.87,0.47 1.34,1.44 1.16,2.42l-0.54,2.87c-0.21,1.14 -0.59,2.12 -1.12,2.93 -1.06,1.61 -2.51,2.97 -4.08,3.86 -0.34,0.19 -0.73,0.29 -1.11,0.29ZM69.03,76.78c-0.15,0 -0.31,0.04 -0.45,0.11l-4.56,2.47c-0.36,0.2 -0.55,0.6 -0.48,1.01l0.54,2.92c0.17,0.96 0.49,1.79 0.93,2.45 0.94,1.42 2.23,2.64 3.62,3.42 0.29,0.16 0.64,0.16 0.92,0 1.39,-0.78 2.68,-1.99 3.62,-3.42 0.44,-0.67 0.75,-1.48 0.92,-2.45l0.54,-2.87c0.08,-0.41 -0.12,-0.81 -0.48,-1.01l-4.67,-2.52c-0.14,-0.08 -0.3,-0.11 -0.45,-0.11l-0.01,-0.01Z" android:strokeWidth="0"/>
+            
+        <path android:fillColor="#2ac3a2" android:fillType="evenOdd" android:pathData="M113.03,149.07l-8.8,8.8c-0.12,0.12 -0.29,0.19 -0.47,0.19s-0.34,-0.07 -0.47,-0.19l-5.41,-5.41 0.94,-0.94 4.94,4.94 8.33,-8.33 0.94,0.94Z" android:strokeWidth="0"/>
+            
+        <path android:fillColor="#9591af" android:pathData="M139.75,153.33l4.49,-4.49 -0.97,-0.96 -4.49,4.49 -4.49,-4.49 -0.96,0.96 4.49,4.49 -4.49,4.49 0.96,0.96 4.49,-4.49 4.49,4.49 0.96,-0.96 -4.49,-4.49Z" android:strokeWidth="0"/>
+            
+        <path android:fillColor="#FF000000" android:pathData="M75.91,150.79l-4.09,-4.09c-0.14,-0.14 -0.34,-0.22 -0.54,-0.22h-5.37c-1.13,0 -2.05,0.91 -2.05,2.04v11.25c0,1.13 0.92,2.05 2.05,2.05h8.18c1.13,0 2.05,-0.91 2.05,-2.05v-8.44c0,-0.2 -0.08,-0.4 -0.22,-0.54ZM74.6,151.65v8.12c0,0.28 -0.23,0.51 -0.51,0.51h-8.18c-0.28,0 -0.51,-0.23 -0.51,-0.51v-11.25c0,-0.28 0.23,-0.51 0.51,-0.51h5.05l0.06,0.06v3.01c0,0.28 0.23,0.51 0.51,0.51h3.01l0.06,0.06Z" android:strokeWidth="0"/>
+            
+        <path android:fillColor="#fff" android:pathData="M138.3,46.4c2.01,0 3.63,-1.63 3.63,-3.64s-1.63,-3.64 -3.63,-3.64 -3.64,1.63 -3.64,3.64 1.63,3.64 3.64,3.64Z" android:strokeWidth="0"/>
+            
+        <path android:pathData="M138.3,39.13h6.3c-2.01,-3.48 -6.45,-4.67 -9.93,-2.66 -1.11,0.64 -2.02,1.56 -2.66,2.66l3.15,5.45 0,-0c-1.01,-1.73 -0.42,-3.96 1.32,-4.96 0.55,-0.32 1.18,-0.49 1.83,-0.49Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:endX="144.6" android:endY="40.04" android:startX="132.01" android:startY="40.04" android:type="linear">
+                              
+                    <item android:color="#FFD93025" android:offset="0"/>
+                              
+                    <item android:color="#FFEA4335" android:offset="1"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:fillColor="#1a73e8" android:pathData="M138.3,45.65c1.59,0 2.88,-1.29 2.88,-2.88 0,-1.59 -1.29,-2.88 -2.88,-2.88s-2.88,1.29 -2.88,2.88c0,1.59 1.29,2.88 2.88,2.88Z" android:strokeWidth="0"/>
+            
+        <path android:pathData="M141.45,44.59l-3.15,5.45c4.01,0 7.27,-3.25 7.27,-7.27 0,-1.28 -0.34,-2.53 -0.97,-3.64h-6.3v0c2.01,-0 3.63,1.62 3.64,3.62 0,0.64 -0.17,1.27 -0.49,1.83Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:endX="143.61" android:endY="39.04" android:startX="137.31" android:startY="49.94" android:type="linear">
+                              
+                    <item android:color="#FFFCC934" android:offset="0"/>
+                              
+                    <item android:color="#FFFBBC04" android:offset="1"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+            
+        <path android:pathData="M135.16,44.59l-3.15,-5.45c-2.01,3.48 -0.82,7.92 2.66,9.93 1.11,0.64 2.36,0.97 3.64,0.97l3.15,-5.45 -0,-0c-1,1.74 -3.22,2.34 -4.96,1.34 -0.56,-0.32 -1.02,-0.78 -1.34,-1.34Z" android:strokeWidth="0">
+                  
+            <aapt:attr name="android:fillColor">
+                        
+                <gradient android:endX="132.79" android:endY="38.68" android:startX="139.09" android:startY="49.59" android:type="linear">
+                              
+                    <item android:color="#FF1E8E3E" android:offset="0"/>
+                              
+                    <item android:color="#FF34A853" android:offset="1"/>
+                            
+                </gradient>
+                      
+            </aapt:attr>
+                
+        </path>
+          
+    </group>
+    
+</vector>
diff --git a/app/src/main/res/raw/keep.xml b/app/src/main/res/raw/keep.xml
index c19db331d..9a17666f9 100644
--- a/app/src/main/res/raw/keep.xml
+++ b/app/src/main/res/raw/keep.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools"
-    tools:keep="@drawable/onboarding_ctd_default_browser,@drawable-night/onboarding_ctd_default_browser,@drawable/onboarding_ctd_sync,@drawable/onboarding_ctd_notification" />
+    tools:keep="@drawable/onboarding_ctd_default_browser,@drawable-night/onboarding_ctd_default_browser,@drawable/onboarding_ctd_sync,@drawable/onboarding_ctd_notification,@drawable/ic_onboarding_key_features.xml,@drawable/ic_onboarding_key_features_icons_only.xml" />

From 8eeeadc48fd7adfbc757f1063398acee547d46ff Mon Sep 17 00:00:00 2001
From: DreVla <vlad.dreghici@gmail.com>
Date: Thu, 15 Feb 2024 15:43:29 +0200
Subject: [PATCH 209/222] Bug 1879507 - Show Default prompt when
 default-browser card disabled

As part of the Set as default optimization experiment, treatment
branch A will show the "Set as Default" System prompt when the
onboarding started, without showing the default-browser card.
This will be controlled from the experimenter and will require
disabling the default-browser card.
If the user already set Firefox as default browser, this prompt
will not be shown.

(cherry picked from commit f98e606dca8d4d27f174a237fb329dead7d70959)
---
 .../fenix/onboarding/OnboardingFragment.kt    | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt b/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt
index d46adfac3..e91ed3842 100644
--- a/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt
@@ -51,7 +51,7 @@ class OnboardingFragment : Fragment() {
 
     private val pagesToDisplay by lazy {
         pagesToDisplay(
-            shouldShowDefaultBrowserCard(requireContext()),
+            isNotDefaultBrowser(requireContext()),
             canShowNotificationPage(requireContext()),
             canShowAddWidgetCard(),
         )
@@ -62,6 +62,7 @@ class OnboardingFragment : Fragment() {
     @SuppressLint("SourceLockedOrientationActivity")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        val context = requireContext()
         if (pagesToDisplay.isEmpty()) {
             /* do not continue if there's no onboarding pages to display */
             onFinish(null)
@@ -71,8 +72,14 @@ class OnboardingFragment : Fragment() {
             activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         }
         val filter = IntentFilter(WidgetPinnedReceiver.ACTION)
-        LocalBroadcastManager.getInstance(requireContext())
+        LocalBroadcastManager.getInstance(context)
             .registerReceiver(pinAppWidgetReceiver, filter)
+
+        if (isNotDefaultBrowser(context) &&
+            pagesToDisplay.none { it.type == OnboardingPageUiData.Type.DEFAULT_BROWSER }
+        ) {
+            promptToSetAsDefaultBrowser()
+        }
     }
 
     @RequiresApi(Build.VERSION_CODES.TIRAMISU)
@@ -108,11 +115,7 @@ class OnboardingFragment : Fragment() {
         OnboardingScreen(
             pagesToDisplay = pagesToDisplay,
             onMakeFirefoxDefaultClick = {
-                activity?.openSetDefaultBrowserOption(useCustomTab = true)
-                telemetryRecorder.onSetToDefaultClick(
-                    sequenceId = pagesToDisplay.telemetrySequenceId(),
-                    sequencePosition = pagesToDisplay.sequencePosition(OnboardingPageUiData.Type.DEFAULT_BROWSER),
-                )
+                promptToSetAsDefaultBrowser()
             },
             onSkipDefaultClick = {
                 telemetryRecorder.onSkipSetToDefaultClick(
@@ -211,7 +214,7 @@ class OnboardingFragment : Fragment() {
         )
     }
 
-    private fun shouldShowDefaultBrowserCard(context: Context) =
+    private fun isNotDefaultBrowser(context: Context) =
         !BrowsersCache.all(context.applicationContext).isDefaultBrowser
 
     private fun canShowNotificationPage(context: Context) =
@@ -257,4 +260,12 @@ class OnboardingFragment : Fragment() {
             jexlConditions,
         ) { condition -> jexlHelper.evalJexlSafe(condition) }
     }
+
+    private fun promptToSetAsDefaultBrowser() {
+        activity?.openSetDefaultBrowserOption(useCustomTab = true)
+        telemetryRecorder.onSetToDefaultClick(
+            sequenceId = pagesToDisplay.telemetrySequenceId(),
+            sequencePosition = pagesToDisplay.sequencePosition(OnboardingPageUiData.Type.DEFAULT_BROWSER),
+        )
+    }
 }

From 2c8126b234103630913c9f42bd24c22912cf35a7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:10:01 +0000
Subject: [PATCH 210/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-da/strings.xml     |   4 +
 app/src/main/res/values-es-rCL/strings.xml |   9 +-
 app/src/main/res/values-gn/strings.xml     | 226 ++++++++++-----------
 app/src/main/res/values-hy-rAM/strings.xml | 224 +++++++++++---------
 app/src/main/res/values-pt-rPT/strings.xml |   4 +-
 app/src/main/res/values-tr/strings.xml     |   7 +
 app/src/main/res/values-uk/strings.xml     |   7 +
 7 files changed, 263 insertions(+), 218 deletions(-)

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 848d9413d..b3a0868a9 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -2337,6 +2337,10 @@
     <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Ved at vælge “Ja, prøv det” accepterer du %1$s fra Mozillas %2$s og %3$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Ved at vælge “Ja, prøv det” accepterer du følgende fra %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Ved at vælge “Ja, prøv det” accepterer du %1$s\' %2$s og %3$ss %4$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Ved at vælge “Ja, prøv det” accepterer du %1$s\' %2$s og %3$ss %4$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">privatlivspolitik</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index 0b24998b0..9f1149d43 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -336,7 +336,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Aviso de privacidad de Firefox</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Aprende más en nuestra política de privacidad</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Aprende más en nuestra política de privacidad</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Nos encanta mantenerte a salvo</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2464,6 +2464,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Traduciendo…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">¿Descargar idioma en modo de ahorro de datos (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opciones de traducción</string>
diff --git a/app/src/main/res/values-gn/strings.xml b/app/src/main/res/values-gn/strings.xml
index 5d0da0318..b86b9643e 100644
--- a/app/src/main/res/values-gn/strings.xml
+++ b/app/src/main/res/values-gn/strings.xml
@@ -246,6 +246,7 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Emboava kuatiarogue ñepyrũgua</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Mba’erechaha ñepyrũgua</string>
@@ -253,6 +254,14 @@
     <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
          history and go back to the home screen. -->
     <string name="browser_toolbar_erase">Embogue kundahára rembiasakue</string>
+    <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
+    <string name="browser_toolbar_translate">Emoñe’ẽasa kuatiarogue</string>
+
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Kuatiarogue moñe’ẽasapyre %1$s-gui %2$s-pe.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Ñe’ẽ poravopyre</string>
@@ -264,8 +273,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Moha’ãnga</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Hekaha mongu’eha</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Hekaha ñemboheko</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
@@ -320,21 +327,27 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Marandu’i ne pytyvõta ejapovéta %s ndive</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Marandu’i ne pytyvõta ejapovéta %s ndive</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Embojuehe tendayke mba’e’oka pa’ũme, eñangareko ñemboguejýre, ehendu ñemoñe’ẽ mba’éichapa eiporuporãta %s rekorosã ñemigua ha ambue.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Embojuehe tendayke mba’e’oka pa’ũme, eñangareko ñemboguejýre, ehendu ñemoñe’ẽ mba’éichapa eiporuporãta %s rekorosã ñemigua ha ambue.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Ku’ejey</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Ku’ejey</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Ani ko’ág̃a</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Ani ko’ág̃a</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox marandu’i ñemigua</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Eikuaave ore marandu’i ñemigua rupive</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Rovy’ã eimére tekorosãme</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Ehecha mba’érepa hetaiterei ohayhúva Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Ñeikundaha tekorosãme hetaháicha</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Ore kundahára oykeko atyguasu viru’ỹgua oipytyvõ omboykévo umi mba’apohaguasu ani nde rapykueho ñanduti rupive.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
@@ -446,22 +459,11 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">HTTPS ayvúpe añoite</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Kookie Banner Ñemomichĩ</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Ejoko Banner kookie rehegua</string>
     <!-- Preference for removing cookie/consent banners from sites automatically in private mode. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction_private_mode">Kookie ñe’ẽmondo jokoha ñeikundaha ñemíme</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Emomichĩ kookie banner</string>
-
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Mboguepyre</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Hendypyre</string>
 
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s omboykese ijehegui kookie mba’ejerure kookie marandu ñemurãme.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Ogue ko tendápe</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -479,36 +481,17 @@
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Tenda ko’ág̃a ojokupyty’ỹva</string>
     <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Emyandy kookie ñemurã momichĩ %1$s peg̃uarã?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_on_for_site_1">¿Emyandy Kookie Banner jokoha %1$s peg̃uarã?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Embogue kookie ñemurã momichĩ %1$s peg̃uarã?</string>
 
     <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
     <string name="reduce_cookie_banner_details_panel_title_off_for_site_1">¿Embogue Kookie Banner jokoha %1$s peg̃uarã?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s nomboykekuaái ijehegui kookie marandu ñemurã ko tendápe. Emba’ejerurekuaa omoneĩ hag̃ua ko tenda tenonderãve.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s omboguéta kookie ko tendagua ha omyanyhẽjeýta kuatiarogue. Emboguepaitérõ kookie ombotykuaa ne rembiapo térã omonandi ne mba’ejoguakue.</string>
 
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Eipe’ãvo, %1$s omboguéta kookie ha omyanyhẽta tenda. Kóva ombotykuaa emba’apoha térã omonandi ejoguáva.</string>
     <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s omboykese ijehegui umi kookie mba’ejerure tenda ojokupytývape.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
     <string name="reduce_cookie_banner_details_panel_description_on_for_site_3">Emyandývo, %1$s oñeha’ãta omboyke ijeheguiete umi kookie ñe’ẽmondo ko tendápe.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">¿Emoneĩ %1$s tomboyke kookie ñe’ẽmondo?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s omboykekuaa ijehegui umi kookie mba’ejerure.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Ani ko’ág̃a</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Ehecha’ivéta kookie mba’ejerure</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Moneĩ</string>
 
     <!--Title for the cookie banner re-engagement CFR, the placeholder is replaced with app name -->
     <string name="cookie_banner_cfr_title">%1$s omboyke kookie nde rehehápe</string>
@@ -730,9 +713,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Techaukaha</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Tembiapo ñepyrũ</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Tembiapo ñepyrũ</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Ñe’ẽñemi</string>
+    <string name="preferences_sync_logins_2">Ñe’ẽñemi</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Tendayke ijurujáva</string>
     <!-- Preference for signing out -->
@@ -758,9 +741,9 @@
     <string name="default_device_name_2">%1$s %2$s %3$s-pe</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Kuatia’atã ñemurã</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kuatia’atã ñemurã</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Mba’éicha ehepyme’ẽta</string>
+    <string name="preferences_sync_credit_cards_2">Mba’éicha ehepyme’ẽta</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Kundaharape</string>
 
@@ -1310,8 +1293,6 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Mboyke</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Ndaikatúi embokuatia</string>
-    <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_page_error">Ndaikatúi emonguatia ko kuatiarogue</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Mbokuatia</string>
@@ -1728,13 +1709,13 @@
     <string name="add_to_homescreen_description_2">Ikatu embojuaju ko ñanduti renda ne mba’e’oka mba’erechaha ñepyrũgua rehe eike hag̃ua ha eikundaha pya’eve, peteĩ tembiporu’ícharamo.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Tembiapo ñepyrũ ha ñe’ẽñemi</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Tembiapo ñepyrũ ha ñe’ẽñemi</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Ñe’ẽñemi</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Ñe’ẽñemi</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Eñongatu tembiapo ñepyrũ ha ñe’ẽñemi</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Eñongatu tembiapo ñepyrũ ha ñe’ẽñemi</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Eñongatu ñe’ẽñemi</string>
+    <string name="preferences_passwords_save_logins_2">Eñongatu ñe’ẽñemi</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Ejerure ñemoneĩ eñongatu hag̃ua</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1751,39 +1732,41 @@
     <string name="preferences_android_autofill_description">Emoĩmba ha eñongatu poruhára réra ha ñe’ẽñemi ambue tembiporu’ípe ne mba’e’oka pegua.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Embojuaju jeike</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Embojuaju jeike</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Embojuaju ñe’ẽñemi</string>
+    <string name="preferences_logins_add_login_2">Embojuaju ñe’ẽñemi</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Embojuehe tembiapo ñepyrũ</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Embojuehe ñe’ẽñemi</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Embojuehe tembiapo ñepyrũ</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Embojuehe ñe’ẽñemi</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Embojuehe tembiapo ñepyrũ mba’e’oka pa’ũme</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Embojuehe tembiapo ñepyrũ mba’e’oka pa’ũme</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2">Embojuehe ñe’ẽñemi mba’e’oka pa’ũme</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Tembiapo ñepyrũ ñongatupyre</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Tembiapo ñepyrũ ñongatupyre</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Ñe’ẽñemi ñongatupyre</string>
+    <string name="preferences_passwords_saved_logins_2">Ñe’ẽñemi ñongatupyre</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Ko’ápe ojehecháta tembiapo ñepyrũ eñongatu térã embojuehéva %s ndive.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Ko’ápe ojehecháta tembiapo ñepyrũ eñongatu térã embojuehéva %s ndive.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Eikuaave Sync rehegua</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Eikuaave Sync rehegua</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Eikuaave ñembojuehe rehegua</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Eikuaave ñembojuehe rehegua</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Oĩ’ỹva</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Ápe ojehecháta tembiapo ñepyrũ ha ñe’ẽñemi oñeñongatu’ỹva.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Ápe ojehecháta tembiapo ñepyrũ ha ñe’ẽñemi oñeñongatu’ỹva.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Noñeñongatumo’ãi tembiapo ñepyrũ ha ñe’ẽñemi ko’ã tendápe g̃uarã.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Noñeñongatumo’ãi tembiapo ñepyrũ ha ñe’ẽñemi ko’ã tendápe g̃uarã.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Emboguete opaite oĩ’ỹva</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Eheka tembiapo ñepyrũ</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Eheka tembiapo ñepyrũ</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Eheka ñe’ẽñemi</string>
+    <string name="preferences_passwords_saved_logins_search_2">Eheka ñe’ẽñemi</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Tenda</string>
     <!-- The header for the username for a login -->
@@ -1811,11 +1794,11 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Emokañy ñe’ẽñemi</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Emyandyjey ehecha hag̃ua ne rembiapo ñepyrũ ñongatupyre</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Emyandyjey ehecha hag̃ua ne rembiapo ñepyrũ ñongatupyre</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Erekokuaa nde poruhára ha ñe’ẽñemi</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Erekokuaa nde poruhára ha ñe’ẽñemi</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Emboheko pe patrõ jokoháva mba’e’oka pegua, PIN térã ñe’ẽñemi emo’ã hag̃ua nde poruhára ha ñe’ẽñemi ñongatupyrépe jeike ambue orekórõ ne mba’e’oka.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Emboheko pe patrõ jokoháva mba’e’oka pegua, PIN térã ñe’ẽñemi emo’ã hag̃ua nde poruhára ha ñe’ẽñemi ñongatupyrépe jeike ambue orekórõ ne mba’e’oka.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Upéi</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1834,10 +1817,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Jejuru paha</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Emoĩporã poravorã tembiapo ñepyrũgua</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Emoĩporã poravorã tembiapo ñepyrũgua</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Emoĩporã ñe’ẽñemi poravorã</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Emoĩporã ñe’ẽñemi poravorã</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1845,40 +1828,40 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Kundaharape</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Kuatia’atã ñemurã</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kuatia’atã ñemurã</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Mba’éicha ehepyme’ẽta</string>
+    <string name="preferences_credit_cards_2">Mba’éicha ehepyme’ẽta</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Eñongatu ha emyanyhẽ kuatia’atã</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Eñongatu ha emyanyhẽ kuatia’atã</string>
 
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Eñongatu ha emyanyhẽ mba’éicha ehepyme’ẽta</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Eñongatu ha emyanyhẽ mba’éicha ehepyme’ẽta</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Mba’ekuaarã ipapapypa</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Mba’ekuaarã ipapapypa</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Embojuehe kuatia’atã mba’e’oka pa’ũme</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Embojuehe kuatia’atã</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Embojuaju kuatia’atã ñemurã</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Embojuaju kuatia’atã ñemurã</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Embojuaju kuatia’atã</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Embojuaju kuatia’atã</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Eñangareko kuatia’atã ñongatupyrére</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Eñangareko kuatia’atã ñongatupyrére</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Eñangareko kuatia’atã</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Eñangareko kuatia’atã</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Embojuaju kundaharape</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Kundaharape ñangareko</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Eñongatu ha emyanyhẽ kundaharape</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Eñongatu ha emyanyhẽ kundaharape</string>
 
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Eñongatu ha emyanyhẽ kundaharape</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Eñongatu ha emyanyhẽ kundaharape</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Emoĩ marandu ipapapy, ñanduti veve ha kundaharape ñemondorãva</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Emoĩ marandu ipapapy, ñanduti veve ha kundaharape ñemondorãva</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Embojuaju kuatia’atã</string>
@@ -1899,9 +1882,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Emboguete kuatia’atã</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">¿Emboguesépa añetehápe ko kuatia’atã ñemurã?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">¿Emboguesépa añetehápe ko kuatia’atã ñemurã?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">¿Emboguete kuatia’atã?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">¿Emboguete kuatia’atã?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Mboguete</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1915,18 +1898,18 @@
     <string name="credit_cards_saved_cards">Kuatia’atã ñongatupyre</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Ikatúpiko ehai kuatia’atã ñemurã papapy oikóva</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ikatúpiko ehai kuatia’atã ñemurã papapy oikóva</string>
 
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Ikatúpiko emyanyhẽ ko kora</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ikatúpiko emyanyhẽ ko kora</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Embojuaju téra</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Embojuaju téra</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Embojuruja ehecha hag̃ua kuatia’atã ñongatupyre</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Emohekorosã nde kuatia’atã ñemurã</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Emohekorosã nde kuatia’atã ñemurã</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Emboheko peteĩ jekokoha rape, PIN térã ñe’ẽñemi emo’ã hag̃ua nde kuatia’atã ñongatupyre ambue oikeséramo ne mba’e’okápe.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Emboheko peteĩ jekokoha rape, PIN térã ñe’ẽñemi emo’ã hag̃ua nde kuatia’atã ñongatupyre ambue oikeséramo ne mba’e’okápe.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Emboheko ko’ág̃a</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1935,7 +1918,7 @@
     <string name="credit_cards_biometric_prompt_message_pin">Embojuruja ne mba’e’oka</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Embojuruja eiporu hag̃ua kuatia’atã ñemurã marandu mbyatypyre</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Embojuruja eiporu hag̃ua kuatia’atã ñemurã marandu mbyatypyre</string>
 
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Embojuaju kundaharape</string>
@@ -1944,11 +1927,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Kundaharape ñangareko</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Téra Peteĩha</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Téra Peteĩha</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Téra Mokõiha</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Téra Mokõiha</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Terajoapy</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Terajoapy</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Téra</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Kundaharape</string>
     <!-- The header for the city of an address -->
@@ -1973,7 +1958,9 @@
     <string name="addressess_delete_address_button">Embogue kundaharape</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">¿Añetehápepa remboguese ko kundaharape?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">¿Añetehápepa remboguese ko kundaharape?</string>
+    <!-- The title for the "Delete address" confirmation dialog -->
+    <string name="addressess_confirm_dialog_message_2">¿Embogue kundaharape?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Mboguete</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2073,41 +2060,41 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Mbosako’i</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">¿Emboguese añetehápe ko tembiapo ñepyrũ?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">¿Emboguese añetehápe ko tembiapo ñepyrũ?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Mboguete</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Heja</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Jeporavorã tembiapo ñepyrũgua</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Jeporavorã tembiapo ñepyrũgua</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Ñe’ẽñemi jeporavorã</string>
+    <string name="login_options_menu_2">Ñe’ẽñemi jeporavorã</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Moñe’ẽha kora isako’ikuaáava ñanduti kundaharape rembiapo ñepyrũme.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Moñe’ẽha kora isako’ikuaáava ñanduti kundaharape rembiapo ñepyrũme.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Moñe’ẽha kora isako’ikuaáava poruhára réra rembiapo ñepyrũme.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Moñe’ẽha kora isako’ikuaáava poruhára réra rembiapo ñepyrũme.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Moñe’ẽha kora isako’ikuaáava ñe’ẽñemi rembiapo ñepyrũme.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Moñe’ẽha kora isako’ikuaáava ñe’ẽñemi rembiapo ñepyrũme.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Eñongatu moambue tembiapo ñepyrũme.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Eñongatu moambue tembiapo ñepyrũme.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Moambue ñongatu.</string>
+    <string name="save_changes_to_login_2">Moambue ñongatu.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Mbosako’i</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Mbosako’i</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Embosako’i ñe’ẽñemi</string>
+    <string name="edit_2">Embosako’i ñe’ẽñemi</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Embojuaju terarenda pyahu</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Embojuaju terarenda pyahu</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Embojuaju ñe’ẽñemi</string>
+    <string name="add_login_2">Embojuaju ñe’ẽñemi</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Tekotevẽ ñe’ẽñemi</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Tekotevẽ ñe’ẽñemi</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Emoinge ñe’ẽñemi</string>
+    <string name="saved_login_password_required_2">Emoinge ñe’ẽñemi</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Poruhára réra jerurepyre</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Poruhára réra jerurepyre</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Ehai poruhára réra</string>
+    <string name="saved_login_username_required_2">Ehai poruhára réra</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Mohendahavusu réra jerurepyre</string>
     <!-- Voice search button content description  -->
@@ -2207,7 +2194,7 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Eheka %s ndive</string>
 
-    <!-- Default browser experiment -->
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Emboheko ñanduti renda juajuha, ñanduti veve ha ñe’ẽmondo ijuruja hag̃ua ijehegui Firefox-pe.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2217,7 +2204,7 @@
     <string name="radio_preference_info_content_description">Eikutu ápe eikuaave hag̃ua</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Eikundaha yvate gotyo</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Eikundaha yvate gotyo</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Mboty</string>
@@ -2258,8 +2245,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Ñeha’ãmby ha’etéva</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Oñemboguéta marandu’i jerovia’ỹha</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Oiko hechajey jeroviahápe</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Mba’e iporãva marandu’i osẽramóvare</string>
@@ -2281,8 +2266,6 @@
     <string name="review_quality_check_explanation_body_highlights"><![CDATA[Umi <b>kyta mba’eguasúva</b> ou marandu’i %s 80 ára ohasaramóvagui ikatuha ejerovia.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Eikuaave ko’ãvare %s.</string>
-    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_info_learn_more_link" moz:RemovedIn="121" tools:ignore="UnusedResources">mba’éichapa %s Mozilla mba’e ohechaukáta marandu’i iporãha</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_info_learn_more_link_2">mba’éicha %s oikuaa marandu’i iporãha</string>
     <!-- Text for title of settings section. -->
@@ -2318,10 +2301,6 @@
     <string name="review_quality_check_product_availability_warning_body">Ehechárõ ko apopyre ojejoguakuaajeýma, oremomarandu ha romba’apóta hekopyahu hag̃ua ñehesa’ijo.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Emomarandu apopyre ojeporukuaaha</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Ehechajey marandu’i porãngue</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Ehechajey marandu’i porãngue</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Ehechajey marandu’i porãngue (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2367,11 +2346,11 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Eikuaave</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Eiporavóvo “Héẽ, eiporu”, emoneĩ %1$s %2$s-gua ha %3$s Mozilla mba’e.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Eiporavóvo “Héẽ, eiporu”, emoneĩ %1$s %2$s-gua ha %3$s Mozilla mba’e.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Eiporavóvo “H’éẽ, eiporu”, emoneĩ upeigua %1$s mba’áva:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">temiñemi porureko</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">temiñemi porureko</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Temiñemi porureko</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2457,6 +2436,8 @@
     <string name="translations_bottom_sheet_translate_to">Emoñe’ẽasa pe</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Ani ko’ág̃a</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Ehechauka ypykuéva</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Oĩma</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2468,6 +2449,8 @@
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Ñe’ẽasa oñemboguatáva</string>
 
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Eiporavo peteĩ ñe’ẽ</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Iñapañuãi emoñe’ẽasakuévo. Eha’ãjey ag̃amieve.</string>
     <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
@@ -2477,6 +2460,11 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Kuaave</string>
 
+
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Ñemoñe’ẽasa…</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Ñe’ẽasa poravopyrã</string>
diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml
index 2e0696586..439cf60e6 100644
--- a/app/src/main/res/values-hy-rAM/strings.xml
+++ b/app/src/main/res/values-hy-rAM/strings.xml
@@ -253,6 +253,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Թարգմանել էջը</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Էջը թարգմանվել է %1$s-ից %2$s:</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Ընտրված լեզուն</string>
@@ -329,12 +334,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox֊ի գաղտնիության ծանուցում</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Իմացեք ավելին մեր գաղտնիության ծանուցման մեջ</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Մենք սիրում ենք ձեզ ապահով պահել</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Պարզեք, թե ինչու են միլիոնավոր մարդիկ սիրում Firefox-ը</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Անվտանգ զննարկում ավելի շատ ընտրանքներով</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Մեր շահույթ չհետապնդող զննարկիչն օգնում է դադարեցնել ընկերությունների կողմից համացանցում ձեզ գաղտնի հետևելը:</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Ավելի քան 100 միլիոն մարդ պաշտպանում է իր գաղտնիությունը՝ ընտրելով ոչ առևտրային կազմակերպության կողմից աջակցվող զննիչ:</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Հայտնի հետագծիչնե՞ր: Ինքնաշխատ  արգելափակվում են: Ընդլայնումնե՞ր; Փորձե՞ք բոլոր 700-ը։ PDF ֆայլե՞ր: Մեր ներկառուցված ընթերցողը հեշտացնում է դրանց կառավարումը:</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Մեր շահույթ չհետապնդող զննարկիչը օգնում է դադարեցնել ընկերություններին գաղտնի հետևել ձեզ համացանցում:\n\nԻմացեք ավելին մեր գաղտնիության ծանուցման մեջ:</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -688,9 +703,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Էջանիշեր</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Մուտքանուններ</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Մուտքանուններ</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Գաղտնաբառեր</string>
+    <string name="preferences_sync_logins_2">Գաղտնաբառեր</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Բացել ներդիրներ</string>
     <!-- Preference for signing out -->
@@ -716,9 +731,9 @@
     <string name="default_device_name_2">%1$s-ը %2$s %3$s-ում</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Բանկային քարտեր</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Բանկային քարտեր</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Վճարամիջոցներ</string>
+    <string name="preferences_sync_credit_cards_2">Վճարամիջոցներ</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Հասցեներ</string>
 
@@ -1658,13 +1673,13 @@
     <string name="add_to_homescreen_description_2">Հեշտությամբ կարող եք ավելացնել այս կայքը ձեր հեռախոսի Տնային էկրանին՝ ակնթարթորեն մատչելու և արագ դիտարկելու համար:</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Մուտքանուններ և գաղտնաբառեր</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Մուտքանուններ և գաղտնաբառեր</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Գաղտնաբառեր</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Գաղտնաբառեր</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Պահպանել մուտքանունները և գաղտնաբառերը</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Պահպանել մուտքանունները և գաղտնաբառերը</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Պահել գաղտնաբառերը</string>
+    <string name="preferences_passwords_save_logins_2">Պահել գաղտնաբառերը</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Հարցնել պահպանելիս</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1679,47 +1694,47 @@
     <string name="preferences_android_autofill_description">Լցրեք օգտվողի անուններն ու գաղտնաբառերը ձեր սարքի այլ հավելվածներում:</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Ավելացնել մուտքագրում</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Ավելացնել մուտքագրում</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Հավելել գաղտնաբառ</string>
+    <string name="preferences_logins_add_login_2">Հավելել գաղտնաբառ</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Համաժամեցնել մուտքանունները</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Համաժամեցնել գաղտնաբառերը</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Համաժամեցնել մուտքանունները</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Համաժամեցնել գաղտնաբառերը</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Համաժամեցնել մուտքագրումները սարքերի միջև</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Համաժամեցնել մուտքագրումները սարքերի միջև</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Համաժամեցնել գաղտնաբառերը սարքերի միջև</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Համաժամեցնել գաղտնաբառերը սարքերի միջև</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Պահպանված մուտքանուններ</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Պահպանված մուտքանուններ</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Պահված գաղտնաբառեր</string>
+    <string name="preferences_passwords_saved_logins_2">Պահված գաղտնաբառեր</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">%s-ի հետ ձեր պահպանած կամ համաժամեցրած մուտքագրումները կցուցադրվեն այստեղ:</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">%s-ի հետ ձեր պահպանած կամ համաժամեցրած մուտքագրումները կցուցադրվեն այստեղ:</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Այն գաղտնաբառերը, որոնք դուք պահում կամ համաժամացնում եք %s-ի հետ, կցուցադրվեն այստեղ: Ձեր պահած բոլոր գաղտնաբառերը գաղտնագրված են:</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Այն գաղտնաբառերը, որոնք դուք պահում կամ համաժամացնում եք %s-ի հետ, կցուցադրվեն այստեղ: Ձեր պահած բոլոր գաղտնաբառերը գաղտնագրված են:</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Իմանալ ավելին համաժամեցման մասին:</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Իմանալ ավելին համաժամեցման մասին:</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Իմանալ ավելին Սինքի մասին</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Իմանալ ավելին Սինքի մասին</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Բացառություններ</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Մուտքանունները և գաղտնաբառերը, որոնք չեն պահպանվել, կցուցադրվեն այստեղ:</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Մուտքանունները և գաղտնաբառերը, որոնք չեն պահպանվել, կցուցադրվեն այստեղ:</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s-ը չի պահի այստեղ թվարկված կայքերի գաղտնաբառերը:</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s-ը չի պահի այստեղ թվարկված կայքերի գաղտնաբառերը:</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Մուտքանունները և գաղտնաբառերը չեն պահպանվի այս կայքերի համար:</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Մուտքանունները և գաղտնաբառերը չեն պահպանվի այս կայքերի համար:</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s-ը չի պահի այս կայքերի գաղտնաբառերը:</string>
+    <string name="preferences_passwords_exceptions_description_2">%s-ը չի պահի այս կայքերի գաղտնաբառերը:</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Ջնջել բոլոր բացառությունները</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Որոնել մուտքանուններ</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Որոնել մուտքանուններ</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Որոնել գաղտնաբառեր</string>
+    <string name="preferences_passwords_saved_logins_search_2">Որոնել գաղտնաբառեր</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Կայք</string>
 
@@ -1748,17 +1763,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Թաքցնել գաղտնաբառը</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Ապակողպեք՝ դիտելու համար պահպանված մուտքանունները</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ապակողպեք՝ դիտելու համար պահպանված մուտքանունները</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Ապակողպեք՝ դիտելու համար պահված գաղտնաբառերը</string>
+    <string name="logins_biometric_prompt_message_2">Ապակողպեք՝ դիտելու համար պահված գաղտնաբառերը</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Անվտանգ դարձրեք ձեր մուտքանունները և գաղտնաբառերը</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Անվտանգ դարձրեք ձեր մուտքանունները և գաղտնաբառերը</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Անվտանգ դարձրեք ձեր պահված գաղտնաբառերը</string>
+    <string name="logins_warning_dialog_title_2">Անվտանգ դարձրեք ձեր պահված գաղտնաբառերը</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Ստեղծեք սարքի կողպեքի նմուշ, PIN կամ գաղտնաբառ՝ ձեր պահպանված մուտքանունները և գաղտնաբառերը մուտք գործելուց պաշտպանելու համար, եթե ձեր սարքը ուրիշի ձեռքն ընկնի:</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ստեղծեք սարքի կողպեքի նմուշ, PIN կամ գաղտնաբառ՝ ձեր պահպանված մուտքանունները և գաղտնաբառերը մուտք գործելուց պաշտպանելու համար, եթե ձեր սարքը ուրիշի ձեռքն ընկնի:</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Տեղակայեք սարքի կողպման նախշ, PIN կամ գաղտնաբառ՝ պաշտպանելու պահված գաղտնաբառերն այն դեպքում, եթե որևէ մեկը ևս մուտք ունենա Ձեր սարքին:</string>
+    <string name="logins_warning_dialog_message_2">Տեղակայեք սարքի կողպման նախշ, PIN կամ գաղտնաբառ՝ պաշտպանելու պահված գաղտնաբառերն այն դեպքում, եթե որևէ մեկը ևս մուտք ունենա Ձեր սարքին:</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Հետո</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1776,10 +1791,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Վերջին օգտագործվածը</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Տեսակավորել մուտագրումների ցանկը</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Տեսակավորել մուտագրումների ցանկը</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Տեսակավորել գաղտնաբառերի ցանկը</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Տեսակավորել գաղտնաբառերի ցանկը</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1787,42 +1802,42 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Հասցեներ</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Բանկային քարտեր</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Բանկային քարտեր</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Վճարամիջոցներ</string>
+    <string name="preferences_credit_cards_2">Վճարամիջոցներ</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Պահել և ինքնալրացնել քարտերը</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Պահել և ինքնալրացնել քարտերը</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Պահել և լրացնել վճարամիջոցները</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Պահել և լրացնել վճարամիջոցները</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Տվյալները գաղտնագրված են</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Տվյալները գաղտնագրված են</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s-ը գաղտնագրում է ձեր պահած  բոլոր վճարամիջոցները</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s-ը գաղտնագրում է ձեր պահած  բոլոր վճարամիջոցները</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Համաժամեցնել քարտերը սարքերի միջև</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Համաժամեցնել քարտերը</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Ավելացնել բանկային քարտ</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Ավելացնել բանկային քարտ</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Հավելել քարտ</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Հավելել քարտ</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Կառավարել պահված քարտերը</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Կառավարել պահված քարտերը</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Կառավարել քարտերը</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Կառավարել քարտերը</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Ավելացնել հասցե</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Կառավարեք հասցեները</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Պահել և ինքնալրացնել քարտերը</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Պահել և ինքնալրացնել քարտերը</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Պահել և լրացնել հասցեները</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Պահել և լրացնել հասցեները</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Ներառել տեղեկություններ, ինչպիսիք են համարները, էլ.փոստը և առաքման հասցեները</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Ներառել տեղեկություններ, ինչպիսիք են համարները, էլ.փոստը և առաքման հասցեները</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Ներառում է հեռախոսահամարներ և էլ. փոստի հասցեներ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Ներառում է հեռախոսահամարներ և էլ. փոստի հասցեներ</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Ավելացնել քարտ</string>
@@ -1843,9 +1858,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Ջնջել քարտը</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս բանկային քարտը:</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս բանկային քարտը:</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Ջնջե՞լ քարտը</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Ջնջե՞լ քարտը</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Ջնջել</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1859,24 +1874,24 @@
     <string name="credit_cards_saved_cards">Պահպանված քարտեր</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Մուտքագրեք բանկային վավեր քարտի համար</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Մուտքագրեք բանկային վավեր քարտի համար</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Մուտքագրեք ճիշտ քարտի համար</string>
+    <string name="credit_cards_number_validation_error_message_2">Մուտքագրեք ճիշտ քարտի համար</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Լրացրեք այս դաշտը</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Լրացրեք այս դաշտը</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Հավելել անուն</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Հավելել անուն</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Ապակողպեք՝ դիտելու համար պահպանված քարտերը</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Անվտանգ դարձրեք ձեր բանկային քարտերը</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Անվտանգ դարձրեք ձեր բանկային քարտերը</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Անվտանգ դարձրեք ձեր պահած վճարամիջոցները</string>
+    <string name="credit_cards_warning_dialog_title_2">Անվտանգ դարձրեք ձեր պահած վճարամիջոցները</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Տեղակայեք սարքի կողպման նախշ, PIN կամ գաղտնաբառ՝ պաշտպանելու պահված բանկային քարտերը այն դեպքում, եթե որևէ մեկը ևս մուտք ունի Ձեր սարքին:</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Տեղակայեք սարքի կողպման նախշ, PIN կամ գաղտնաբառ՝ պաշտպանելու պահված բանկային քարտերը այն դեպքում, եթե որևէ մեկը ևս մուտք ունի Ձեր սարքին:</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Տեղակայեք սարքի կողպման նախշ, PIN կամ գաղտնաբառ՝ պաշտպանելու ձեր քարտերն այն դեպքում, եթե որևէ մեկը ևս մուտք ունենա Ձեր սարքին:</string>
+    <string name="credit_cards_warning_dialog_message_3">Տեղակայեք սարքի կողպման նախշ, PIN կամ գաղտնաբառ՝ պաշտպանելու ձեր քարտերն այն դեպքում, եթե որևէ մեկը ևս մուտք ունենա Ձեր սարքին:</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Տեղակայել հիմա</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1884,10 +1899,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Ապակողպեք ձեր սարքը</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Ապակողպեք՝ օգտագործելու համար բանկային քարտերի պահված տեղեկությունները</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ապակողպեք՝ օգտագործելու համար բանկային քարտերի պահված տեղեկությունները</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Ապակողպեք՝ պահված վճարամիջոցն օգտագործելու համար</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Ապակողպեք՝ պահված վճարամիջոցն օգտագործելու համար</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Ավելացնել հասցե</string>
     <!-- Title of the "Edit address" screen -->
@@ -1895,11 +1910,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Կառավարեք հասցեները</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Անուն</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Անուն</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Հայրանուն</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Հայրանուն</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Ազգանուն</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Ազգանուն</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Անուն</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Փողոցի հասցե</string>
     <!-- The header for the city of an address -->
@@ -1923,9 +1940,9 @@
     <!-- The text for the "Delete address" button for deleting an address -->
     <string name="addressess_delete_address_button">Ջնջել հասցեն</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Ջնջե՞լ այս հասցեն:</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ջնջե՞լ այս հասցեն:</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Ջնջե՞լ այս հասցեն:</string>
+    <string name="addressess_confirm_dialog_message_2">Ջնջե՞լ այս հասցեն:</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Ջնջել</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2022,49 +2039,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Խմբագրել</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս մուտքանունը:</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս մուտքանունը:</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս գաղտնաբառը:</string>
+    <string name="login_deletion_confirmation_2">Համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս գաղտնաբառը:</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Ջնջել</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Չեղարկել</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Մուտքի ընտրանքներ</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Մուտքի ընտրանքներ</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Գաղտնաբառի ընտրանքներ</string>
+    <string name="login_options_menu_2">Գաղտնաբառի ընտրանքներ</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Խմբագրելի տեքստի դաշտը մուտքի վեբ հասցեի համար:</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Խմբագրելի տեքստի դաշտը մուտքի վեբ հասցեի համար:</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Խմբագրելի տեքստի դաշտ կայքի հասցեի համար:</string>
+    <string name="saved_login_hostname_description_3">Խմբագրելի տեքստի դաշտ կայքի հասցեի համար:</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Խմբագրելի տեքստի դաշտը մուտք գործողի համար:</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Խմբագրելի տեքստի դաշտը մուտք գործողի համար:</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Խմբագրելի տեքստի դաշտ օգտվողի անվան համար:</string>
+    <string name="saved_login_username_description_3">Խմբագրելի տեքստի դաշտ օգտվողի անվան համար:</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Խմբագրելի տեքստի դաշտը մուտքի գաղտնաբառի համար:</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Խմբագրելի տեքստի դաշտը մուտքի գաղտնաբառի համար:</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Խմբագրելի տեքստի դաշտ գաղտնաբառի համար:</string>
+    <string name="saved_login_password_description_2">Խմբագրելի տեքստի դաշտ գաղտնաբառի համար:</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Պահպանել փոփոխությունները մուտքագրման համար:</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Պահպանել փոփոխությունները մուտքագրման համար:</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Պահել փոփոխությունները:</string>
+    <string name="save_changes_to_login_2">Պահել փոփոխությունները:</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Խմբագրել</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Խմբագրել</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Խմբագրել գաղտնաբառը</string>
+    <string name="edit_2">Խմբագրել գաղտնաբառը</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Հավելել նոր մուտքագրում</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Հավելել նոր մուտքագրում</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Հավելել գաղտնաբառ</string>
+    <string name="add_login_2">Հավելել գաղտնաբառ</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Գաղտնաբառ է պահանջվում</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Գաղտնաբառ է պահանջվում</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Մուտքագրեք գաղտնաբառ</string>
+    <string name="saved_login_password_required_2">Մուտքագրեք գաղտնաբառ</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Օգտվողի անունը պարտադիր է</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Օգտվողի անունը պարտադիր է</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Մուտքագրեք օգտվողի անունը</string>
+    <string name="saved_login_username_required_2">Մուտքագրեք օգտվողի անունը</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Հոսթի անունը պարտադիր է</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2177,7 +2194,7 @@
     <string name="radio_preference_info_content_description">Սեղմեք` մանրամասների համար</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Նավարկել վերև</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Նավարկել վերև</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Փակել</string>
@@ -2218,8 +2235,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Ճշգրտված վարկանիշ</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Անվստահելի կարծիքները հեռացվեցին</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Հուսալի կարծիքների հիման վրա</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Գունանշումներ վերջին կարծիքներից</string>
@@ -2276,10 +2291,6 @@
     <string name="review_quality_check_product_availability_warning_body">Եթե տեսնեք, որ այս ապրանքը կրկին պահեստում է, հաղորդեք դրա մասին, և մենք կաշխատենք ստուգել ակնարկները:</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Զեկուցված ապրանքը պահեստում է</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Կարծիքի որակի ստուգում</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Կարծիքի որակի ստուգում</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Կարծիքի որակի ստուգում (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2326,13 +2337,19 @@
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Իմանալ ավելին</string>
 
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Ընտրելով «Այո, փորձիր»՝ դուք համաձայնում եք %1$s-ը Mozilla-ի կողմիցի %2$s-ին և %3$s-ին:</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Ընտրելով «Այո, փորձիր»՝ դուք համաձայնում եք %1$s-ը Mozilla-ի կողմիցի %2$s-ին և %3$s-ին:</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Ընտրելով «Այո, փորձիր»՝ դուք ընդունում եք %1$s-ը.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Ընտրելով «Այո, փորձիր»՝ դուք համաձայնվում եք %1$s-ի %2$s-ին և %3$s-ի %4$s-ին:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Ընտրելով «Այո, փորձիր»՝ դուք համաձայնվում եք %1$s-ի %2$s-ին և %3$s-ի %4$s-ին:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">գաղտնիության դրույթներ</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">գաղտնիության դրույթներ</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Գաղտնիության դրույթներ</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">գաղտնիության ծանուցում</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">օգտվելու կանոններ</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2403,6 +2420,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Թարգմանե՞լ այս էջը։</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Էջը թարգմանվել է %1$s-ից %2$s:</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Փորձեք անձնական թարգմանությունները %1$s-ով</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2415,6 +2436,8 @@
     <string name="translations_bottom_sheet_translate_to">Թարգմանել հետևյալով՝</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Ոչ հիմա</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Ցուցադրել բնօրինակը</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Պատրաստ է</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2437,6 +2460,15 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Իմանալ ավելին</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Թարգմանում է…</string>
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Ներբեռնե՞լ լեզուն տվյալների պահման կերպում (%1$s):</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Թարգմանության ընտրանքներ</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index a97fa318d..ea5e7c031 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -346,13 +346,13 @@
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Descubra porque milhões adoram o Firefox</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Navegação segura com mais opções</string>
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Navegação segura, com mais opções</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">O nosso navegador, apoiado por uma organização sem fins lucrativos, ajuda a impedir que as empresas o sigam secretamente pela Internet.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Mais de 100 milhões de pessoas protegem a sua privacidade ao escolher um navegador apoiado por uma organização sem fins lucrativos.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
-    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Rastreadores conhecidos? Bloqueado automaticamente. Extensões? Experimente todos os 700. PDFs? O nosso leitor integrado facilita a gestão.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Rastreadores conhecidos? Bloqueados automaticamente. Extensões? Experimente todas as 700. PDF? O nosso leitor integrado facilita a sua gestão.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">O nosso navegador, apoiado por uma organização sem fins lucrativos, ajuda a impedir que as empresas o sigam secretamente pela web.\n\n Saiba mais nas nossas informações de privacidade.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 94f173d37..4b1d84127 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -2467,6 +2467,13 @@
     <string name="translation_in_progress_snackbar">Çevriliyor…</string>
 
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Dil, veri tasarrufu modunda indirilsin mi? (%1$s)</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Çeviri Seçenekleri</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index c926d4641..aa505e098 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2480,6 +2480,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Переклад…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Завантажити мову в режимі заощадження даних (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Параметри перекладу</string>

From d12ddf3f4a50c44ed05074f787a659434d0a0d0a Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Tue, 20 Feb 2024 11:06:51 +0000
Subject: [PATCH 211/222] Bug 1881009 - Added experimental onboarding strings
 for Nimbus

(cherry picked from commit d24034b03db1f535d7a65873b0945838014029fa)
---
 app/src/main/res/values/strings.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 486a5a0ca..5bde85a9c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -314,12 +314,18 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox privacy notice</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Learn more in our privacy notice</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">We love keeping you safe</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Find out why millions love Firefox</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Our non-profit backed browser helps stop companies from secretly following you around the web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">More than 100 million people protect their privacy by choosing a browser that’s backed by a nonprofit.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Our non-profit backed browser helps stop companies from secretly following you around the web.\n\nLearn more in our privacy notice.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->

From cac6d6f8d5bf8a0f781af3f7b817d5c2fb72cee2 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 8 Mar 2024 07:56:39 -0500
Subject: [PATCH 212/222] Bug 1881016 - Added experimental onboarding strings
 for Nimbus (#5936)

Co-authored-by: t-p-white <towhite@mozilla.com>
Co-authored-by: t-p-white <1833156+t-p-white@users.noreply.github.com>
---
 app/src/main/res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5bde85a9c..83c1ffeb6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -321,11 +321,15 @@
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Find out why millions love Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Safe browsing with more choices</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Our non-profit backed browser helps stop companies from secretly following you around the web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">More than 100 million people protect their privacy by choosing a browser that’s backed by a nonprofit.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Known trackers? Blocked automatically. Extensions? Try all 700. PDFs? Our built-in reader makes them easy to manage.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Our non-profit backed browser helps stop companies from secretly following you around the web.\n\nLearn more in our privacy notice.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->

From a14b79bdeb99cb9839a2c14fecdf7ae059d4d72f Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 8 Mar 2024 08:19:58 -0500
Subject: [PATCH 213/222] Bug 1882778 - Remove redundant experiment string
 juno_onboarding_privacy_notice_text_2 (#5935)

Co-authored-by: t-p-white <towhite@mozilla.com>
Co-authored-by: t-p-white <1833156+t-p-white@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 83c1ffeb6..67a1b20a4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -315,7 +315,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox privacy notice</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Learn more in our privacy notice</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Learn more in our privacy notice</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">We love keeping you safe</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.

From 5b0eabe859349e134ebb8d1ecbe7bb1bb3ad9351 Mon Sep 17 00:00:00 2001
From: JohanLorenzo <JohanLorenzo@users.noreply.github.com>
Date: Fri, 8 Mar 2024 17:02:26 +0000
Subject: [PATCH 214/222] Update Fenix initial_experiments.json based on the
 current first-run experiments in experimenter

(cherry picked from commit 59760407f4d5abd68846f05c7c212a5a2d374782)
---
 app/src/main/res/raw/initial_experiments.json | 157 ++++++++++++++++++
 1 file changed, 157 insertions(+)

diff --git a/app/src/main/res/raw/initial_experiments.json b/app/src/main/res/raw/initial_experiments.json
index 29a20bc5f..5dc81c4d6 100644
--- a/app/src/main/res/raw/initial_experiments.json
+++ b/app/src/main/res/raw/initial_experiments.json
@@ -220,6 +220,163 @@
       "localizations": null,
       "locales": null,
       "publishedDate": "2024-02-01T19:06:38.368231Z"
+    },
+    {
+      "schemaVersion": "1.12.0",
+      "slug": "android-optimize-set-as-default-browser-screen",
+      "id": "android-optimize-set-as-default-browser-screen",
+      "arguments": {},
+      "application": "org.mozilla.fenix",
+      "appName": "fenix",
+      "appId": "org.mozilla.fenix",
+      "channel": "nightly",
+      "userFacingName": "Android - Optimize “Set as Default Browser” Screen",
+      "userFacingDescription": "This experiment is designed to optimize the set-to-default browser experience on Android.",
+      "isEnrollmentPaused": false,
+      "isRollout": false,
+      "bucketConfig": {
+        "randomizationUnit": "nimbus_id",
+        "namespace": "fenix-juno-onboarding-nightly-2",
+        "start": 0,
+        "count": 10000,
+        "total": 10000
+      },
+      "featureIds": [
+        "juno-onboarding"
+      ],
+      "probeSets": [],
+      "outcomes": [
+        {
+          "slug": "onboarding",
+          "priority": "primary"
+        },
+        {
+          "slug": "default-browser",
+          "priority": "secondary"
+        }
+      ],
+      "branches": [
+        {
+          "slug": "control",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "juno-onboarding",
+              "enabled": true,
+              "value": {}
+            }
+          ]
+        },
+        {
+          "slug": "treatment-a",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "juno-onboarding",
+              "enabled": true,
+              "value": {
+                "cards": {
+                  "default-browser": {
+                    "enabled": false
+                  }
+                }
+              }
+            }
+          ]
+        },
+        {
+          "slug": "treatment-b",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "juno-onboarding",
+              "enabled": true,
+              "value": {
+                "cards": {
+                  "default-browser": {
+                    "title": "juno_onboarding_default_browser_title_nimbus_3",
+                    "body": "juno_onboarding_default_browser_description_nimbus_4"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        {
+          "slug": "treatment-c",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "juno-onboarding",
+              "enabled": true,
+              "value": {
+                "cards": {
+                  "default-browser": {
+                    "title": "juno_onboarding_default_browser_title_nimbus_4",
+                    "body": "",
+                    "image-res": "ic_onboarding_key_features"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        {
+          "slug": "treatment-d",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "juno-onboarding",
+              "enabled": true,
+              "value": {
+                "cards": {
+                  "default-browser": {
+                    "title": "juno_onboarding_default_browser_title_nimbus_4",
+                    "body": "juno_onboarding_default_browser_description_nimbus_5",
+                    "image-res": "ic_onboarding_key_features_icons_only"
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ],
+      "targeting": "((is_already_enrolled) || ((isFirstRun == 'true') && (app_version|versionCompare('124.!') >= 0) && (language in ['en'])))",
+      "startDate": "2024-03-08",
+      "enrollmentEndDate": null,
+      "endDate": null,
+      "proposedDuration": 35,
+      "proposedEnrollment": 21,
+      "referenceBranch": "control",
+      "featureValidationOptOut": false,
+      "localizations": null,
+      "locales": null,
+      "publishedDate": "2024-03-08T16:48:36.645956Z"
     }
   ]
 }

From e9b920b1fd0d6083402531d3b43144fc04597ac7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 9 Mar 2024 02:07:04 +0000
Subject: [PATCH 215/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-co/strings.xml     | 225 +++++++++++---------
 app/src/main/res/values-fur/strings.xml    | 229 ++++++++++++---------
 app/src/main/res/values-fy-rNL/strings.xml | 224 +++++++++++---------
 app/src/main/res/values-iw/strings.xml     |   3 +
 app/src/main/res/values-pa-rIN/strings.xml |   9 +
 app/src/main/res/values-th/strings.xml     |   7 +
 app/src/main/res/values-tr/strings.xml     |  10 +
 7 files changed, 417 insertions(+), 290 deletions(-)

diff --git a/app/src/main/res/values-co/strings.xml b/app/src/main/res/values-co/strings.xml
index e41a5e4c1..f5af690c9 100644
--- a/app/src/main/res/values-co/strings.xml
+++ b/app/src/main/res/values-co/strings.xml
@@ -258,6 +258,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Traduce a pagina</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Pagina tradutta in %2$s, l’origine hè in %1$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Lingua selezziunata</string>
@@ -335,12 +340,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Dichjarazione di cunfidenzialità di Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Sapene di più in a nostra dichjarazione di cunfidenzialità</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">A vostra prutezzione cunta per noi</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Scuprite perchè Firefox piace à milioni di persone</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">A navigazione assicurizata cù più di scelta</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">U nostru navigatore sustinutu da un urganismu senza scopu lucrativu impedisce l’imprese di seguitavvi da manera sicreta nant’à u Web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Più di 10 milioni di persone prutegenu a so vita privata scigliendu un navigatore sustinutu da un’organizazione senza scopu lucrativu.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Perseguitatori cunnisciuti ? Bluccati autumaticamente. Estensioni ? Ci n’hè più di 700 ; pruvatele. Schedarii PDF ? U nostru lettore integratu ne faciliteghja a ghjestione.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">U nostru navigatore sustinutu da un urganismu senza scopu lucrativu impedisce l’imprese di seguitavvi da manera sicreta nant’à u Web.\n\nSapene di più in a nostra dichjarazione di cunfidenzialità.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -701,9 +716,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Indette</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Identificazioni di cunnessione</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Identificazioni di cunnessione</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Parolle d’intesa</string>
+    <string name="preferences_sync_logins_2">Parolle d’intesa</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Apre l’unghjette</string>
     <!-- Preference for signing out -->
@@ -729,10 +744,10 @@
     <string name="default_device_name_2">%1$s nant’à %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Carte bancarie</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Carte bancarie</string>
 
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Metode di pagamentu</string>
+    <string name="preferences_sync_credit_cards_2">Metode di pagamentu</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Indirizzi</string>
 
@@ -1675,13 +1690,13 @@
     <string name="add_to_homescreen_description_2">Hè faciule d’aghjunghje stu situ nant’à u screnu d’accolta di u vostru apparechju per accedeci direttamente è navigà più prestu cum’è s’ella fussi un’appiecazione.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Identificazioni è parolle d’intesa</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Identificazioni è parolle d’intesa</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Parolle d’intesa</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Parolle d’intesa</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Arregistrà l’identificazioni è e parolle d’intesa</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Arregistrà l’identificazioni è e parolle d’intesa</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Arregistrà e parolle d’intesa</string>
+    <string name="preferences_passwords_save_logins_2">Arregistrà e parolle d’intesa</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Dumandà per arregistrà</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1697,48 +1712,48 @@
     <string name="preferences_android_autofill_description">Riimpiete nomi d’utilizatore è parolle d’intesa in l’altre appiecazioni nant’à u vostru apparechju.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Aghjunghje un’identificazione di cunnessione</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Aghjunghje un’identificazione di cunnessione</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Aghjunghje una parolla d’intesa</string>
+    <string name="preferences_logins_add_login_2">Aghjunghje una parolla d’intesa</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sincrunizà l’identificazioni</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincrunizà e parolle d’intesa</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincrunizà l’identificazioni</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Sincrunizà e parolle d’intesa</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sincrunizà l’identificazioni di cunnessione trà l’apparechji</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincrunizà l’identificazioni di cunnessione trà l’apparechji</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincrunizà e parolle d’intesa trà l’apparechji</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Sincrunizà e parolle d’intesa trà l’apparechji</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Identificazioni di cunnessione arregistrate</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Identificazioni di cunnessione arregistrate</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Parolle d’intesa arregistrate</string>
+    <string name="preferences_passwords_saved_logins_2">Parolle d’intesa arregistrate</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">L’identificazioni di cunnessione chì voi arregistrate o sincrunizate cù %s seranu affissate quì.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">L’identificazioni di cunnessione chì voi arregistrate o sincrunizate cù %s seranu affissate quì.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">E parolle d’intesa chì vo arregistrate o sincrunizate cù %s seranu affissate quì. Tutte e parolle d’intesa chì vo arregistrate sò cifrate.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">E parolle d’intesa chì vo arregistrate o sincrunizate cù %s seranu affissate quì. Tutte e parolle d’intesa chì vo arregistrate sò cifrate.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Sapene di più nant’à Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Sapene di più nant’à Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Sapene di più nant’à a sincrunizazione</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Sapene di più nant’à a sincrunizazione</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Eccezzioni</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">L’identificazioni è parolle d’intesa chì ùn sò micca arregistrate seranu affissate quì.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">L’identificazioni è parolle d’intesa chì ùn sò micca arregistrate seranu affissate quì.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s ùn arregistrerà micca e parolle d’intesa per i siti allistinati quì.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s ùn arregistrerà micca e parolle d’intesa per i siti allistinati quì.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">L’identificazioni è parolle d’intesa ùn seranu micca arregistrate per sti siti.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">L’identificazioni è parolle d’intesa ùn seranu micca arregistrate per sti siti.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s ùn arregistrerà micca e parolle d’intesa per sti siti.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s ùn arregistrerà micca e parolle d’intesa per sti siti.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Squassà tutte l’eccezzioni</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Ricercà identificazioni di cunnessione</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Ricercà identificazioni di cunnessione</string>
 
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Ricercà parolle d’intesa</string>
+    <string name="preferences_passwords_saved_logins_search_2">Ricercà parolle d’intesa</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Situ</string>
     <!-- The header for the username for a login -->
@@ -1767,17 +1782,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Piattà a parolla d’intesa</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Spalancate per affissà l’identificazioni di cunnessione arregistrate</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Spalancate per affissà l’identificazioni di cunnessione arregistrate</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Spalancate per affissà e vostre parolle d’intesa arregistrate</string>
+    <string name="logins_biometric_prompt_message_2">Spalancate per affissà e vostre parolle d’intesa arregistrate</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Prutigite e vostre identificazioni di cunnessione è parolle d’intesa</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Prutigite e vostre identificazioni di cunnessione è parolle d’intesa</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Prutigite e vostre parolle d’intesa arregistrate</string>
+    <string name="logins_warning_dialog_title_2">Prutigite e vostre parolle d’intesa arregistrate</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Definite un dissegnu di chjusura, un codice PIN o una parolla d’intesa per prutege e vostre identificazioni di cunnessione è parolle d’intesa arregistrate s’ellu ci era qualchissia chì accidissi à u vostru apparechju.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Definite un dissegnu di chjusura, un codice PIN o una parolla d’intesa per prutege e vostre identificazioni di cunnessione è parolle d’intesa arregistrate s’ellu ci era qualchissia chì accidissi à u vostru apparechju.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Definite un dissegnu di chjuditura, un codice PIN o una parolla d’intesa per prutege e vostre parolle d’intesa arregistrate s’ellu ci era qualchissia chì accidissi à u vostru apparechju.</string>
+    <string name="logins_warning_dialog_message_2">Definite un dissegnu di chjuditura, un codice PIN o una parolla d’intesa per prutege e vostre parolle d’intesa arregistrate s’ellu ci era qualchissia chì accidissi à u vostru apparechju.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Dopu</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1795,10 +1810,10 @@
     <string name="saved_logins_sort_strategy_last_used">Ultimu impiegu</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Listinu di classificazione di l’identificazioni</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Listinu di classificazione di l’identificazioni</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Listinu di classificazione di e parolle d’intesa</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Listinu di classificazione di e parolle d’intesa</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1806,43 +1821,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Indirizzi</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Carte bancarie</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Carte bancarie</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Metode di pagamentu</string>
+    <string name="preferences_credit_cards_2">Metode di pagamentu</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Arregistrà è riempie autumaticamente e carte</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Arregistrà è riempie autumaticamente e carte</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Arregistrà è rinsignà e metode di pagamentu</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Arregistrà è rinsignà e metode di pagamentu</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">I dati sò cifrati</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">I dati sò cifrati</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s cifra tutte e metode di pagamentu chì vo arregistrate</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s cifra tutte e metode di pagamentu chì vo arregistrate</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincrunizate e carte trà i vostri apparechji</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sincrunizà e carte</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Aghjunghje una carta bancaria</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Aghjunghje una carta bancaria</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Aghjunghje una carta</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Aghjunghje una carta</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Amministrà e carte arregistrate</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Amministrà e carte arregistrate</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Amministrà e carte</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Amministrà e carte</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Aghjunghje un indirizzu</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Urganizà l’indirizzi</string>
 
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Arregistrà è riempie autumaticamente l’indirizzi</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Arregistrà è riempie autumaticamente l’indirizzi</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Arregistrà è rinsignà autumaticamente l’indirizzi</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Arregistrà è rinsignà autumaticamente l’indirizzi</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Include l’infurmazioni cum’è i numeri, i messaghji elettronichi è l’indirizzi di spedizione</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Include l’infurmazioni cum’è i numeri, i messaghji elettronichi è l’indirizzi di spedizione</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Include i numeri di telefonu è l’indirizzi elettronichi</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Include i numeri di telefonu è l’indirizzi elettronichi</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Aghjunghje una carta</string>
@@ -1864,9 +1879,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Squassà a carta</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Vulete veramente squassà sta carta bancaria ?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Vulete veramente squassà sta carta bancaria ?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Squassà a carta ?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Squassà a carta ?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Squassà</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1879,25 +1894,25 @@
     <string name="credit_cards_saved_cards">Carte arregistrate</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Ci vole à stampittà un numeru accettevule di carta bancaria</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ci vole à stampittà un numeru accettevule di carta bancaria</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Stampittate un numeru di carta bancaria accettevule</string>
+    <string name="credit_cards_number_validation_error_message_2">Stampittate un numeru di carta bancaria accettevule</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Ci vole à riempie stu campu</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ci vole à riempie stu campu</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Aghjunghje un nome</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Aghjunghje un nome</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Spalancate per affissà e vostre carte arregistrate</string>
 
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Prutege e vostre carte bancarie</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Prutege e vostre carte bancarie</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Prutigite e vostre metode di pagamentu arregistrate</string>
+    <string name="credit_cards_warning_dialog_title_2">Prutigite e vostre metode di pagamentu arregistrate</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Definite un dissegnu di chjusura, un codice PIN o una parolla d’intesa per prutege e vostre carte arregistrate s’ellu ci era qualchissia chì accidissi à u vostru apparechju.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Definite un dissegnu di chjusura, un codice PIN o una parolla d’intesa per prutege e vostre carte arregistrate s’ellu ci era qualchissia chì accidissi à u vostru apparechju.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Definite un dissegnu di chjusura, un codice PIN o una parolla d’intesa per prutege e vostre metode di pagamentu arregistrate s’ellu ci era qualchissia chì accidissi à u vostru apparechju.</string>
+    <string name="credit_cards_warning_dialog_message_3">Definite un dissegnu di chjusura, un codice PIN o una parolla d’intesa per prutege e vostre metode di pagamentu arregistrate s’ellu ci era qualchissia chì accidissi à u vostru apparechju.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Cunfigurà subitu</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1905,10 +1920,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Spalancate u vostru apparechju</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Spalancate per impiegà l’infurmazione di e carte bancarie arregistrate</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Spalancate per impiegà l’infurmazione di e carte bancarie arregistrate</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Spalancate per impiegà e metode di pagamentu arregistrate</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Spalancate per impiegà e metode di pagamentu arregistrate</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Aghjunghje un indirizzu</string>
     <!-- Title of the "Edit address" screen -->
@@ -1916,11 +1931,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Urganizà l’indirizzi</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Nome</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Nome</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Secondu nome</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Secondu nome</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Casata</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Casata</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nome cumpletu</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Indirizzu pustale</string>
     <!-- The header for the city of an address -->
@@ -1945,9 +1962,9 @@
     <!-- The text for the "Delete address" button for deleting an address -->
     <string name="addressess_delete_address_button">Squassà l’indirizzu</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Vulete veramente squassà st’indirizzu ?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Vulete veramente squassà st’indirizzu ?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Squassà st’indirizzu ?</string>
+    <string name="addressess_confirm_dialog_message_2">Squassà st’indirizzu ?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Squassà</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2046,49 +2063,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Mudificà</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Vulete veramente squassà st’identificazione di cunnessione ?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Vulete veramente squassà st’identificazione di cunnessione ?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Vulete veramente squassà sta parolla d’intesa ?</string>
+    <string name="login_deletion_confirmation_2">Vulete veramente squassà sta parolla d’intesa ?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Squassà</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Abbandunà</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Ozzioni di l’identificazione</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Ozzioni di l’identificazione</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Ozzioni di parolla d’intesa</string>
+    <string name="login_options_menu_2">Ozzioni di parolla d’intesa</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">U campu di testu mudifichevule per l’indirizzu web di l’identificazione.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">U campu di testu mudifichevule per l’indirizzu web di l’identificazione.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">U campu di testu mudifichevule per l’indirizzu di u situ web.</string>
+    <string name="saved_login_hostname_description_3">U campu di testu mudifichevule per l’indirizzu di u situ web.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">U campu di testu mudifichevule per u nome d’utilizatore di l’identificazione.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">U campu di testu mudifichevule per u nome d’utilizatore di l’identificazione.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">U campu di testu mudifichevule per u nome d’utilizatore.</string>
+    <string name="saved_login_username_description_3">U campu di testu mudifichevule per u nome d’utilizatore.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">U campu di testu mudifichevule per a parolla d’intesa di l’identificazione.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">U campu di testu mudifichevule per a parolla d’intesa di l’identificazione.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">U campu di testu mudifichevule per a parolla d’intesa.</string>
+    <string name="saved_login_password_description_2">U campu di testu mudifichevule per a parolla d’intesa.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Arregistrà i cambiamenti di l’identificazione.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Arregistrà i cambiamenti di l’identificazione.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Arregistrà i cambiamenti.</string>
+    <string name="save_changes_to_login_2">Arregistrà i cambiamenti.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Mudificà</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Mudificà</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Mudificà a parolla d’intesa</string>
+    <string name="edit_2">Mudificà a parolla d’intesa</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Aghjunghje una nova identificazione di cunnessione</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Aghjunghje una nova identificazione di cunnessione</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Aghjunghje una parolla d’intesa</string>
+    <string name="add_login_2">Aghjunghje una parolla d’intesa</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Parolla d’intesa richiesta</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Parolla d’intesa richiesta</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Stampittate una parolla d’intesa</string>
+    <string name="saved_login_password_required_2">Stampittate una parolla d’intesa</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">U nome d’utilizatore hè richiestu</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">U nome d’utilizatore hè richiestu</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Stampittate un nome d’utilizatore</string>
+    <string name="saved_login_username_required_2">Stampittate un nome d’utilizatore</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">U nome d’ospite hè richiestu</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2203,7 +2220,7 @@
     <string name="radio_preference_info_content_description">Cliccu per sapene di più</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Navigà insù</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Navigà insù</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Chjode</string>
@@ -2245,8 +2262,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Valutazione rettificata</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Avisi micca degni di cunfidenza cacciati</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Nant’à a basa d’avisi degni di cunfidenza</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Messe in lume da l’avisi recente</string>
@@ -2308,10 +2323,6 @@
     <string name="review_quality_check_product_availability_warning_body">S’è vo fighjate chì stu pruduttu hè torna dispunibule, fatecilu sapè è cuntinueremu à cuntrollà l’avisi.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Signalà chì u pruduttu hè dispunibule</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Cuntrollà a qualità di l’avisi</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Cuntrollà a qualità di l’avisi</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Cuntrollu di a qualità di l’avisi (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2357,13 +2368,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Sapene di più</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">A selezzione di « Sì, pruvallu » vole dì chì vo site d.accunsenti cù %2$s è %3$s di %1$s da Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">A selezzione di « Sì, pruvallu » vole dì chì vo site d.accunsenti cù %2$s è %3$s di %1$s da Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">A selezzione di « Sì, pruvallu » vole dì chì vo accettate quell’elementi di %1$s :</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">A selezzione di « Sì, pruvallu » vole dì chì vo site d’accunsenti cù a %2$s di %1$s è a %4$s di %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">A selezzione di « Sì, pruvallu » vole dì chì vo site d’accunsenti cù a %2$s di %1$s è a %4$s di %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">pulitica di cunfidenzialità</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">pulitica di cunfidenzialità</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Pulitica di cunfidenzialità</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">dichjarazione di cunfidenzialità</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">cundizioni d’utilizazione</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2436,6 +2453,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Traduce sta pagina ?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Pagina tradutta in %2$s, l’origine hè in %1$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Pruvà e traduzzioni private di %1$s</string>
 
@@ -2449,6 +2470,8 @@
     <string name="translations_bottom_sheet_translate_to">Traduce versu</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Micca subitu</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Affissà a pagina d’origine</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Compiu</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2471,6 +2494,16 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Sapene di più</string>
 
+
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Traduzzione…</string>
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Scaricà a lingua in modu di risparmiu di dati (%1$s) ?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Ozzioni di traduzzione</string>
diff --git a/app/src/main/res/values-fur/strings.xml b/app/src/main/res/values-fur/strings.xml
index 1360e9100..8abb79ef4 100644
--- a/app/src/main/res/values-fur/strings.xml
+++ b/app/src/main/res/values-fur/strings.xml
@@ -97,7 +97,7 @@
 
     <!-- Total cookie protection "contextual feature recommendation" (CFR) -->
     <!-- Text for the message displayed in the contextual feature recommendation popup promoting the total cookie protection feature. -->
-    <string name="tcp_cfr_message">La nestre plui fuarte funzion di protezion de riservatece mai realizade e isole lis spiis inter-sît.</string>
+    <string name="tcp_cfr_message">La nestre plui potente funzion di simpri pe protezion de riservatece e isole lis spiis inter-sît.</string>
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">Plui informazions su la Protezion Totâl dai Cookies</string>
 
@@ -253,6 +253,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Tradûs pagjine</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Pagjine voltade dal %1$s al %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Lenghe selezionade</string>
@@ -328,12 +333,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Informative su la riservatece di Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Plui informazions te nestre informative su la riservatece</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Nus plâs tignîti di cont</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Scuvierç parcè che milions di personis a adorin Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Navigazion sigure cun plui sielte</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Il nestri navigadôr, supuartât di une organizazion cence fins di vuadagn, al bloche in automatic lis societâts che, di scuindon, a cirin di stâti daûr tes tôs ativitâts ator pal web.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Plui di 100 milions di personis a protezin la lôr riservatece sielzint un navigadôr che al è supuartât di une organizazion cence fins di vuadagn.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Spiis cognossudis? Blocadis in automatic. Estensions? Provilis dutis, a \'nd è plui di 700. PDFs? Il nestri letôr integrât al rint plui facile la lôr gjestion.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Il nestri navigadôr, supuartât di une organizazion cence fins di vuadagn, ti jude a blocâ in automatic lis societâts che, di scuindon, a cirin di stâti daûr a ce che tu fasis in rêt.\n\nScuvierç di plui te nestre informative su la riservatece.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -696,9 +711,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Segnelibris</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Credenziâls</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Credenziâls</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Passwords</string>
+    <string name="preferences_sync_logins_2">Passwords</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Schedis viertis</string>
     <!-- Preference for signing out -->
@@ -722,9 +737,9 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s su %2$s %3$s</string>
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Cjartis di credit</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Cjartis di credit</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Metodis di paiament</string>
+    <string name="preferences_sync_credit_cards_2">Metodis di paiament</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Recapits</string>
 
@@ -1532,7 +1547,7 @@
     <!-- Preference for enhanced tracking protection for the strict protection settings -->
     <string name="preference_enhanced_tracking_protection_strict">Restritive</string>
     <!-- Preference description for enhanced tracking protection for the strict protection settings -->
-    <string name="preference_enhanced_tracking_protection_strict_description_4">Protezion da lis spiis plui fuarte e prestazions plui sveltis, ma al è pussibil che cualchi sît nol funzioni ben.</string>
+    <string name="preference_enhanced_tracking_protection_strict_description_4">Protezion da lis spiis plui potente e prestazions plui sveltis, ma al è pussibil che cualchi sît nol funzioni ben.</string>
     <!--  Accessibility text for the Strict protection information icon  -->
     <string name="preference_enhanced_tracking_protection_strict_info_button">Elements blocâts de protezion restritive da lis spiis</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
@@ -1668,13 +1683,13 @@
     <string name="add_to_homescreen_description_2">Al è pussibil zontâ chest sît web ae schermade principâl dal dispositîf par doprâle cun plui sveltece, tant che e fos une aplicazion.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Credenziâls e passwords</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Credenziâls e passwords</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Passwords</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Passwords</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Salve credenziâls e passwords</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Salve credenziâls e passwords</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Salve passwords</string>
+    <string name="preferences_passwords_save_logins_2">Salve passwords</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Domande prime di salvâ</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1688,49 +1703,49 @@
     <!-- Description for the preference for autofilling logins from Fenix in other apps (e.g. autofilling the Twitter app) -->
     <string name="preferences_android_autofill_description">Compile i nons utent e lis passwords in altris aplicazions dal to dispositîf.</string>
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Zonte credenziâl</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Zonte credenziâl</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Zonte password</string>
+    <string name="preferences_logins_add_login_2">Zonte password</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sincronize lis credenziâls</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Sincronize passwords</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronize lis credenziâls</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Sincronize passwords</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sincronize lis credenziâls tra dispositîfs</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronize lis credenziâls tra dispositîfs</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Sincronize passwords tra i tiei dispositîfs</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Sincronize passwords tra i tiei dispositîfs</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Credenziâls salvadis</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Credenziâls salvadis</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Passwords salvadis</string>
+    <string name="preferences_passwords_saved_logins_2">Passwords salvadis</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Lis credenziâls che tu salvis o sincronizis su %s a vignaran fûr achì.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Lis credenziâls che tu salvis o sincronizis su %s a vignaran fûr achì.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Lis passwords salvadis o sincronizadis su %s a vignaran listadis achì. Dutis lis passwords che tu salvis a vegnin cifradis.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Lis passwords salvadis o sincronizadis su %s a vignaran listadis achì. Dutis lis passwords che tu salvis a vegnin cifradis.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Plui informazions su Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Plui informazions su Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Plui informazions su la sincronizazion</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Plui informazions su la sincronizazion</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Ecezions</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Lis credenziâls e lis passwords che no tu âs salvât a vignaran fûr achì.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Lis credenziâls e lis passwords che no tu âs salvât a vignaran fûr achì.</string>
 
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s nol salvarà lis passwords pai sîts listâts achì.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s nol salvarà lis passwords pai sîts listâts achì.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Lis credenziâls e lis passwords no vignaran salvadis par chescj sîts.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Lis credenziâls e lis passwords no vignaran salvadis par chescj sîts.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s nol salvarà lis passwords par chescj sîts.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s nol salvarà lis passwords par chescj sîts.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Elimine dutis lis ecezions</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Cîr credenziâls</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Cîr credenziâls</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Cîr tes passwords</string>
+    <string name="preferences_passwords_saved_logins_search_2">Cîr tes passwords</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Sît</string>
     <!-- The header for the username for a login -->
@@ -1758,17 +1773,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Plate password</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Sbloche par visualizâ lis credenziâls salvadis</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Sbloche par visualizâ lis credenziâls salvadis</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Sbloche par viodi lis passwords salvadis</string>
+    <string name="logins_biometric_prompt_message_2">Sbloche par viodi lis passwords salvadis</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Protêç lis tôs credenziâls di acès</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Protêç lis tôs credenziâls di acès</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Protêç lis passwords salvadis</string>
+    <string name="logins_warning_dialog_title_2">Protêç lis passwords salvadis</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Configure une secuence di bloc, PIN o password par protezi lis tôs credenziâls e lis passwords salvadis, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâlis.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configure une secuence di bloc, PIN o password par protezi lis tôs credenziâls e lis passwords salvadis, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâlis.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Configure une secuence di bloc, PIN o password par protezi lis passwords salvadis, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâlis.</string>
+    <string name="logins_warning_dialog_message_2">Configure une secuence di bloc, PIN o password par protezi lis passwords salvadis, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâlis.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Plui indenant</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1784,10 +1799,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Ultime doprade</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordene il menù des credenziâls</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ordene il menù des credenziâls</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menù par ordenâ lis passwords</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menù par ordenâ lis passwords</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1795,43 +1810,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Recapits</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Cjartis di credit</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Cjartis di credit</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Metodis di paiament</string>
+    <string name="preferences_credit_cards_2">Metodis di paiament</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Salve e compile in automatic lis cjartis</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Salve e compile in automatic lis cjartis</string>
 
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Salve e compile i metodis di paiament</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Salve e compile i metodis di paiament</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">I dâts a son cifrâts</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">I dâts a son cifrâts</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s al cifre ducj i metodis di paiaments salvâts</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s al cifre ducj i metodis di paiaments salvâts</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronize lis cjartis tra plui dispositîfs</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sincronize cjartis di credit</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Zonte cjarte di credit</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Zonte cjarte di credit</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Zonte cjarte</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Zonte cjarte</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Gjestìs cjartis salvadis</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Gjestìs cjartis salvadis</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Gjestìs cjartis</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Gjestìs cjartis</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Zonte recapit</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Gjestìs recapits</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Salve e compile in automatic i recapits</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Salve e compile in automatic i recapits</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Salve e compile direzions</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Salve e compile direzions</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Includi informazions come numars, e-mail e recapits di spedizion</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Includi informazions come numars, e-mail e recapits di spedizion</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Inclût numars di telefon e direzions e-mail</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Inclût numars di telefon e direzions e-mail</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Zonte cjarte</string>
@@ -1852,9 +1867,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Elimine cjarte</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Eliminâ pardabon cheste cjarte di credit?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Eliminâ pardabon cheste cjarte di credit?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Eliminâ la cjarte?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Eliminâ la cjarte?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Elimine</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1866,24 +1881,24 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Cjartis salvadis</string>
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Inserìs un numar di cjarte di credit valit</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Inserìs un numar di cjarte di credit valit</string>
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Inserìs un numar di cjarte valit</string>
+    <string name="credit_cards_number_validation_error_message_2">Inserìs un numar di cjarte valit</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Compile chest cjamp</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Compile chest cjamp</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Zonte un non</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Zonte un non</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Sbloche par visualizâ lis cjartis di credit salvadis</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Protêç lis tôs cjartis di credit</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Protêç lis tôs cjartis di credit</string>
 
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Protêç i metodis di paiament salvâts</string>
+    <string name="credit_cards_warning_dialog_title_2">Protêç i metodis di paiament salvâts</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Configure une secuence di bloc, PIN o password par protezi lis tôs cjartis di credit salvadis, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâlis.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configure une secuence di bloc, PIN o password par protezi lis tôs cjartis di credit salvadis, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâlis.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Configure une secuence di bloc, PIN o password par protezi i tiei metodis di paiament salvâts, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâju.</string>
+    <string name="credit_cards_warning_dialog_message_3">Configure une secuence di bloc, PIN o password par protezi i tiei metodis di paiament salvâts, cussì che se cualchidun altri al varà il to dispositîf nol rivarà a doprâju.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configure cumò</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1891,9 +1906,9 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Sbloche il dispositîf</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Sbloche par doprâ lis informazions des cjartis di credit memorizadis</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Sbloche par doprâ lis informazions des cjartis di credit memorizadis</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Sbloche par doprâ i metodis di paiament</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Sbloche par doprâ i metodis di paiament</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Zonte recapit</string>
     <!-- Title of the "Edit address" screen -->
@@ -1901,11 +1916,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Gjestìs recapits</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Non</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Non</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Secont non</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Secont non</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Cognon</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Cognon</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Non</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Recapit</string>
     <!-- The header for the city of an address -->
@@ -1929,9 +1946,9 @@
     <!-- The text for the "Delete address" button for deleting an address -->
     <string name="addressess_delete_address_button">Elimine recapit</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Eliminâ pardabon chest recapit?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Eliminâ pardabon chest recapit?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Eliminâ cheste direzion?</string>
+    <string name="addressess_confirm_dialog_message_2">Eliminâ cheste direzion?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Elimine</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2029,49 +2046,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Modifiche</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Eliminâ pardabon cheste credenziâl?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Eliminâ pardabon cheste credenziâl?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Eliminâ pardabon cheste password?</string>
+    <string name="login_deletion_confirmation_2">Eliminâ pardabon cheste password?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Elimine</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Anule</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Opzions credenziâls</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Opzions credenziâls</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opzions password</string>
+    <string name="login_options_menu_2">Opzions password</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Il cjamp di test modificabil pe direzion web de credenziâl.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Il cjamp di test modificabil pe direzion web de credenziâl.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Il cjamp di test che si pues modificâ pe direzion dal sît web.</string>
+    <string name="saved_login_hostname_description_3">Il cjamp di test che si pues modificâ pe direzion dal sît web.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Il cjamp di test modificabil pal non utent de credenziâl.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Il cjamp di test modificabil pal non utent de credenziâl.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Il cjamp di test che si pues modificâ pal non utent.</string>
+    <string name="saved_login_username_description_3">Il cjamp di test che si pues modificâ pal non utent.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Il cjamp di test modificabil pe password de credenziâl.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Il cjamp di test modificabil pe password de credenziâl.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Il cjamp di test che si pues modificâ pe password.</string>
+    <string name="saved_login_password_description_2">Il cjamp di test che si pues modificâ pe password.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Salve lis modifichis ae credenziâl.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Salve lis modifichis ae credenziâl.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Salve modifichis.</string>
+    <string name="save_changes_to_login_2">Salve modifichis.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Modifiche</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Modifiche</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Modifiche password</string>
+    <string name="edit_2">Modifiche password</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Zonte gnove credenziâl</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Zonte gnove credenziâl</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Zonte password</string>
+    <string name="add_login_2">Zonte password</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Password necessarie</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Password necessarie</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Inserìs une password</string>
+    <string name="saved_login_password_required_2">Inserìs une password</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Non utent necessari</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Non utent necessari</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Inserìs un non utent</string>
+    <string name="saved_login_username_required_2">Inserìs un non utent</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Non servidôr necessari</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2175,7 +2192,7 @@
     <string name="radio_preference_info_content_description">Fâs clic par vê plui detais</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Va sù</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Va sù</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Siere</string>
@@ -2215,8 +2232,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Valutazion retificade</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Recensions inafidabilis gjavadis</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Basât su recensions afidabilis</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">In evidence da lis recensions resintis</string>
@@ -2279,10 +2294,6 @@
 
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Segnale che il prodot al è disponibil</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Daûr a verificâ la cualitât recensions</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Daûr a verificâ la cualitât recensions</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Verifiche cualitât recensions (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2332,13 +2343,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Plui informazions</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Selezionant “Sì, provilu” tu acetis la %2$s e i %3$s di %1$s di Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Selezionant “Sì, provilu” tu acetis la %2$s e i %3$s di %1$s di Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Selezionant “Sì, provilu” tu acetis lis cundizions di %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Selezionant “Sì, provile” tu acetis la %2$s di %1$s e lis %4$s di %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Selezionant “Sì, provile” tu acetis la %2$s di %1$s e lis %4$s di %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">informative su la riservatece</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">informative su la riservatece</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Informative su la riservatece</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">informative su la riservatece</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">tiermins di utilizazion</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2410,6 +2427,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Voltâ cheste pagjine?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Pagjine voltade dal %1$s al %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Prove lis traduzions privadis in %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2422,6 +2443,8 @@
     <string name="translations_bottom_sheet_translate_to">Tradûs par</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">No cumò</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Mostre origjinâl</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Fat</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2445,6 +2468,16 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Plui informazions</string>
 
+
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Daûr a tradusi…</string>
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Discjariâ la lenghe in modalitât Sparagn dâts (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opzions di traduzion</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 3a89ca170..cf6d01d83 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -255,6 +255,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Side oersette</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Side oerset fan it %1$s nei it %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Selektearre taal</string>
@@ -333,12 +338,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox-privacyferklearring</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Lês mear yn ús privacyferklearring</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Wy hâlde jo graach feilich</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Untdek wêrom miljoenen sa gek binne op Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Feilich sneupe mei mear kar</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Us troch in non-profitorganisaasje browser helpt bedriuwen foar te kommen dat bedriuwen jo stikem folgje op ynternet.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Mear as 100 miljoen minsken beskermje harren privacy troch in browser te kiezen dy’t stipe wurdt troch in non-profitorganisaasje.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Bekende trackers? Automatysk blokkearre. Utwreidingen? Probearje se alle 700. PDF’s? Troch ús ynboude lêzer binne se ienfâldich te behearen.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Us troch in non-profitorganisaasje stipe browser helpt foar te kommen dat bedriuwen jo stikem folgje op ynternet.\n\nMear ynfo yn ús privacyferklearring.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -692,9 +707,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Blêdwizers</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Oanmeldingen</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Oanmeldingen</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Wachtwurden</string>
+    <string name="preferences_sync_logins_2">Wachtwurden</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Iepen ljeplêden</string>
     <!-- Preference for signing out -->
@@ -720,9 +735,9 @@
     <string name="default_device_name_2">%1$s op %2$s  %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Creditcards</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Creditcards</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Betellingsmetoaden</string>
+    <string name="preferences_sync_credit_cards_2">Betellingsmetoaden</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adressen</string>
 
@@ -1658,13 +1673,13 @@
     <string name="add_to_homescreen_description_2">Jo kinne dizze website ienfâldich oan it startskerm fan jo apparaat tafoegje, om sa daliks tagong te hawwen en flugger te navigearjen mei in app-eftige ûnderfining.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Oanmeldingen en wachtwurden</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Oanmeldingen en wachtwurden</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Wachtwurden</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Wachtwurden</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Oanmeldingen en wachtwurden bewarje</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Oanmeldingen en wachtwurden bewarje</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Wachtwurden bewarje</string>
+    <string name="preferences_passwords_save_logins_2">Wachtwurden bewarje</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Freegje om te bewarjen</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1679,48 +1694,48 @@
     <string name="preferences_android_autofill_description">Brûkersnammen en wachtwurden yn oare apps op jo apparaat ynfolje.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Oanmelding tafoegje</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Oanmelding tafoegje</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Wachtwurd tafoegje</string>
+    <string name="preferences_logins_add_login_2">Wachtwurd tafoegje</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Oanmeldingen syngronisearje</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Wachtwurden syngronisearje</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Oanmeldingen syngronisearje</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Wachtwurden syngronisearje</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Oanmeldingen op apparaten syngronisearje</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Oanmeldingen op apparaten syngronisearje</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Wachtwurden syngronisearje tusken apparaten</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Wachtwurden syngronisearje tusken apparaten</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Bewarre oanmeldingen</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Bewarre oanmeldingen</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Bewarre wachtwurden</string>
+    <string name="preferences_passwords_saved_logins_2">Bewarre wachtwurden</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">De oanmeldingen dy’t jo bewarje of syngronisearje mei %s wurde hjir toand.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">De oanmeldingen dy’t jo bewarje of syngronisearje mei %s wurde hjir toand.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">De wachtwurden dy’t jo bewarje of syngronisearje mei %s sille hjir fermeld wurde. Alle wachtwurden dy’t jo bewarje binne fersifere.
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">De wachtwurden dy’t jo bewarje of syngronisearje mei %s sille hjir fermeld wurde. Alle wachtwurden dy’t jo bewarje binne fersifere.
 </string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Mear ynfo oer Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Mear ynfo oer Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Mear ynfo oer syngronisaasje</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Mear ynfo oer syngronisaasje</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Utsûnderingen</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Net-bewarre oanmeldingen en wachtwurden wurde hjir werjûn.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Net-bewarre oanmeldingen en wachtwurden wurde hjir werjûn.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s sil gjin wachtwurden foar de hjir fermelde websites bewarje.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s sil gjin wachtwurden foar de hjir fermelde websites bewarje.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Oanmeldingen en wachtwurden wurde foar dizze websites net bewarre. </string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Oanmeldingen en wachtwurden wurde foar dizze websites net bewarre. </string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s sil gjin wachtwurden foar dizze websites bewarje.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s sil gjin wachtwurden foar dizze websites bewarje.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Alle útsûnderingen fuortsmite</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Oanmeldingen sykje</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Oanmeldingen sykje</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Wachtwurden sykje</string>
+    <string name="preferences_passwords_saved_logins_search_2">Wachtwurden sykje</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Website</string>
     <!-- The header for the username for a login -->
@@ -1748,17 +1763,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Wachtwurd ferstopje</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Untskoattelje om jo bewarre oanmeldingen te besjen</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Untskoattelje om jo bewarre oanmeldingen te besjen</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Untskoattelje om jo bewarre wachtwurden te besjen</string>
+    <string name="logins_biometric_prompt_message_2">Untskoattelje om jo bewarre wachtwurden te besjen</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Befeiligje jo oanmeldingen en wachtwurden</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Befeiligje jo oanmeldingen en wachtwurden</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Befeiligje jo bewarre wachtwurden</string>
+    <string name="logins_warning_dialog_title_2">Befeiligje jo bewarre wachtwurden</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre oanmeldingen en wachtwurden te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre oanmeldingen en wachtwurden te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre wachtwurden te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
+    <string name="logins_warning_dialog_message_2">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre wachtwurden te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Letter</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1775,10 +1790,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Lêst brûkt</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menu Oanmeldingen sortearje</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Menu Oanmeldingen sortearje</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Wachtwurdmenu sortearje</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Wachtwurdmenu sortearje</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1786,43 +1801,43 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adressen</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Creditcards</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Creditcards</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Betellingsmetoaden</string>
+    <string name="preferences_credit_cards_2">Betellingsmetoaden</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Kaarten bewarje en automatysk ynfolje</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kaarten bewarje en automatysk ynfolje</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Betellingsmetoaden bewarje en ynfolje</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Betellingsmetoaden bewarje en ynfolje</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Gegevens binne fersifere</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Gegevens binne fersifere</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s fersiferet alle betellingsmetoaden dy’t jo bewarje</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s fersiferet alle betellingsmetoaden dy’t jo bewarje</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Kaarten syngronisearje tusken apparaten</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Kaarten syngronisearje</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Creditcard tafoegje</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Creditcard tafoegje</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Kaart tafoegje</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Kaart tafoegje</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Bewarre kaarten beheare</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Bewarre kaarten beheare</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Kaarten beheare</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Kaarten beheare</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Adres tafoegje</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Adressen beheare</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Adressen bewarje en automatysk ynfolje</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Adressen bewarje en automatysk ynfolje</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Adressen bewarje en ynfolje</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Adressen bewarje en ynfolje</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Ynformaasje lykas nûmers, e-mail- en ferstjoeradressen tafoegje</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Ynformaasje lykas nûmers, e-mail- en ferstjoeradressen tafoegje</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Ynklusyf telefoannûmers en e-mailadressen</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Ynklusyf telefoannûmers en e-mailadressen</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Kaart tafoegje</string>
@@ -1844,9 +1859,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Kaart fuortsmite</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Binne jo wis dat jo dizze creditcard fuortsmite wolle?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Binne jo wis dat jo dizze creditcard fuortsmite wolle?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Kaart fuortsmite?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Kaart fuortsmite?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Fuortsmite</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1860,25 +1875,25 @@
     <string name="credit_cards_saved_cards">Bewarre kaarten</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Fier in jildich creditkaartnûmer yn</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Fier in jildich creditkaartnûmer yn</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Fier in jildich kaartnûmer yn</string>
+    <string name="credit_cards_number_validation_error_message_2">Fier in jildich kaartnûmer yn</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Folje dit fjild yn</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Folje dit fjild yn</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Foegje in namme ta</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Foegje in namme ta</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Untskoattelje om jo bewarre kaarten te besjen</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Befeiligje jo creditcards</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Befeiligje jo creditcards</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Befeiligje jo bewarre betelmetoaden</string>
+    <string name="credit_cards_warning_dialog_title_2">Befeiligje jo bewarre betelmetoaden</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre creditcards te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre creditcards te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
 
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre betellingsmetoaden te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
+    <string name="credit_cards_warning_dialog_message_3">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre betellingsmetoaden te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">No ynstelle</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1887,10 +1902,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Untskoattelje jo apparaat</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Untskoattelje om bewarre creditkaartynformaasje te brûken</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Untskoattelje om bewarre creditkaartynformaasje te brûken</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Untskoattelje om bewarre betellingsmetoaden te brûken</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Untskoattelje om bewarre betellingsmetoaden te brûken</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Adres tafoegje</string>
     <!-- Title of the "Edit address" screen -->
@@ -1898,11 +1913,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Adressen beheare</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Foarnamme</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Foarnamme</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Twadde namme</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Twadde namme</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Efternamme</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Efternamme</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Namme</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Adres</string>
     <!-- The header for the city of an address -->
@@ -1927,9 +1944,9 @@
     <string name="addressess_delete_address_button">Adres fuortsmite</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Binne jo wis dat jo dit adres fuortsmite wolle?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Binne jo wis dat jo dit adres fuortsmite wolle?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Dit adres fuortsmite?</string>
+    <string name="addressess_confirm_dialog_message_2">Dit adres fuortsmite?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Fuortsmite</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2027,49 +2044,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Bewurkje</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Binne jo wis dat jo dizze oanmelding fuortsmite wolle?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Binne jo wis dat jo dizze oanmelding fuortsmite wolle?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Binne jo wis dat jo dit wachtwurd fuortsmite wolle?</string>
+    <string name="login_deletion_confirmation_2">Binne jo wis dat jo dit wachtwurd fuortsmite wolle?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Fuortsmite</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Annulearje</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Oanmeldopsjes</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Oanmeldopsjes</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Wachtwurdopsjes</string>
+    <string name="login_options_menu_2">Wachtwurdopsjes</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">It bewurkbere tekstfjild foar it webadres fan de oanmelding.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">It bewurkbere tekstfjild foar it webadres fan de oanmelding.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">It bewurkbere tekstfjild foar it websiteadres.</string>
+    <string name="saved_login_hostname_description_3">It bewurkbere tekstfjild foar it websiteadres.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">It bewurkbere tekstfjild foar de brûkersnamme fan de oanmelding.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">It bewurkbere tekstfjild foar de brûkersnamme fan de oanmelding.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">It bewurkbere tekstfjild foar de brûkersnamme.</string>
+    <string name="saved_login_username_description_3">It bewurkbere tekstfjild foar de brûkersnamme.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">It bewurkbere tekstfjild foar it wachtwurd fan de oanmelding.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">It bewurkbere tekstfjild foar it wachtwurd fan de oanmelding.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">It bewurkbere tekstfjild foar it wachtwurd.</string>
+    <string name="saved_login_password_description_2">It bewurkbere tekstfjild foar it wachtwurd.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Wizigingen oan oanmelding bewarje.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Wizigingen oan oanmelding bewarje.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Wizigingen bewarje.</string>
+    <string name="save_changes_to_login_2">Wizigingen bewarje.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Bewurkje</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Bewurkje</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Wachtwurd bewurkje</string>
+    <string name="edit_2">Wachtwurd bewurkje</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Nije oanmelding tafoegje</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Nije oanmelding tafoegje</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Wachtwurd tafoegje</string>
+    <string name="add_login_2">Wachtwurd tafoegje</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Wachtwurd fereaske</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Wachtwurd fereaske</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Folje in wachtwurd yn</string>
+    <string name="saved_login_password_required_2">Folje in wachtwurd yn</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Brûkersnamme fereaske</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Brûkersnamme fereaske</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Folje in brûkersnamme yn</string>
+    <string name="saved_login_username_required_2">Folje in brûkersnamme yn</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Hostnamme fereaske</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2183,7 +2200,7 @@
     <string name="radio_preference_info_content_description">Klik foar mear details</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Omheech</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Omheech</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Slute</string>
@@ -2224,8 +2241,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Oanpaste wurdearring</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Unbetroubere beoardielingen fuortsmiten</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Basearre op betroubere beoardielingen</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Hichtepunten út resinte beoardielingen</string>
@@ -2283,10 +2298,6 @@ Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen
     <string name="review_quality_check_product_availability_warning_body">As jo sjogge dat dit produkt wer op foarried is, meld it dan oan ús en wy sille wurkje om de beoardielingen te kontrolearjen.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Rapportearje dat produkt op foarried is</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Beoardielingskwaliteit kontrolearje</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Beoardielingskwaliteit kontrolearje</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Beoardielingskwaliteit kontrolearje (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2333,13 +2344,19 @@ Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Mear ynfo</string>
 
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Troch ‘Ja, probearje’ te selektearjen, geane jo akkoard mei it %2$s en de %3$s fan %1$s troch Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Troch ‘Ja, probearje’ te selektearjen, geane jo akkoard mei it %2$s en de %3$s fan %1$s troch Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Troch ‘Ja, probearje’ te selektearjen, geane jo akkoard mei it folgjende fan %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Troch ‘Ja, probearje’ te selektearjen, geane jo akkoard mei de %2$s fan %1$s en de %4$s fan %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Troch ‘Ja, probearje’ te selektearjen, geane jo akkoard mei de %2$s fan %1$s en de %4$s fan %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">privacybelied</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">privacybelied</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Privacybelied</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">privacyferklearring</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">brûksbetingsten</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2410,6 +2427,10 @@ Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Dizze side oersette?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Side oerset fan it %1$s nei it %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Probearje priveeoersettingen yn %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2422,6 +2443,8 @@ Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen
     <string name="translations_bottom_sheet_translate_to">Oersette nei it</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">No net</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Orizjineel toane</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Dien</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2444,6 +2467,15 @@ Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Mear ynfo</string>
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Oersette…</string>
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Taal downloade yn gegevensbesparringsmodus (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Oersetopsjes</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 891dd3b9f..9aff5c178 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -1628,6 +1628,9 @@
     <!-- Description of redirect tracker cookies that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_redirect_trackers_description">מנקה עוגיות המוגדרות על־ידי הפניות לאתרי מעקב ידועים.</string>
 
+    <!-- Description of the SmartBlock Enhanced Tracking Protection feature. The * symbol is intentionally hardcoded here,
+         as we use it on the UI to indicate which trackers have been partially unblocked.  -->
+    <string name="preference_etp_smartblock_description">החסימה של חלק מרכיבי המעקב המסומנים למטה בוטלה באופן חלקי בדף זה מכיוון שתיקשרת איתם *.</string>
     <!-- Text displayed that links to website about enhanced tracking protection SmartBlock -->
     <string name="preference_etp_smartblock_learn_more">מידע נוסף</string>
 
diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml
index 2a3c445ad..25706bad1 100644
--- a/app/src/main/res/values-pa-rIN/strings.xml
+++ b/app/src/main/res/values-pa-rIN/strings.xml
@@ -355,6 +355,8 @@
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">ਕੰਪਨੀਆਂ ਨੂੰ ਚੋਰੀ ਚੋਰੀ ਵੈੱਬ ਉੱਤੇ ਤੁਹਾਡਾ ਪਿੱਛਾ ਕਰਨ ਤੋਂ ਸਾਡਾ ਗ਼ੈਰ-ਫਾਇਦਾ ਸਮਰੱਥ ਬਰਾਊਜ਼ਰ ਆਪਣੇ-ਆਪ ਹੀ ਰੋਕਦਾ ਹੈ।</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">10 ਕਰੋੜ ਤੋਂ ਵੱਧ ਲੋਕ ਨੇ ਆਪਣੀ ਪਰਦੇਦਾਰੀ ਦੀ ਸੁਰੱਖਿਆ ਲਈ ਉਸ ਬਰਾਊਜ਼ਰ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ, ਜਿਸ ਦਾ ਮਕਸਦ ਕੋਈ ਫਾਇਦਾ ਨਹੀਂ ਹੈ।</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">ਜਾਣੇ-ਪਛਾਣੇ ਟਰੈਕਰ? ਆਪਣੇ ਆਪ ਪਾਬੰਦੀ ਲਾਈ। ਇਕਸਟੈਨਸ਼ਨ? 700 ਤੋਂ ਵੱਧ ਅਜ਼ਮਾਉਣ ਲਈ। PDF? ਸਾਡੇ ਬਿਲਟ-ਇਨ ਰੀਡਰ ਨਾਲ ਉਹਨਾਂ ਨੂੰ ਵਰਤਣਾ ਸੌਖਾ।</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">ਸਾਡਾ ਗ਼ੈਰ-ਮੁਨਾਫ਼ਾ ਸਮਰੱਥ ਬਰਾਊਜ਼ਰ ਕੰਪਨੀਆਂ ਨੂੰ ਵੈੱਬ ਉੱਤੇ ਚੋਰੀ ਛਿਪੇ ਪਿੱਛਾ ਕਰਨ ਤੋਂ ਰੋਕਣ ਲਈ ਮਦਦ ਕਰਦਾ ਹੈ।\n\nਸਾਡੇ ਪਰਦੇਦਾਰੀ ਨੋਟਿਸ ਬਾਰੇ ਹੋਰ ਸਿੱਖੋ।</string>
@@ -2488,6 +2490,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">…ਉਲੱਥਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">ਡਾਟਾ ਬੱਚਤ ਮੋਡ ਵਿੱਚ ਭਾਸ਼ਾ ਨੂੰ ਡਾਊਨਲੋਡ ਕਰਨਾ ਹੈ (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">ਉਲੱਥੇ ਲਈ ਚੋਣਾਂ</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 7761ed5cd..295acd21d 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -2472,6 +2472,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">กำลังแปล…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">ดาวน์โหลดภาษาในโหมดประหยัดข้อมูล (%1$s) หรือไม่?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">ตัวเลือกการแปล</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 4b1d84127..dbd652bb7 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -338,16 +338,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Firefox gizlilik bildirimi</string>
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Ayrıntıları gizlilik bildirimimizde bulabilirsiniz</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Sizi güvende tutmayı seviyoruz</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Milyonların Firefox’u neden sevdiğini öğrenin</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Daha fazla seçenekle güvenli gezinti</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Kâr amacı gütmeyen tarayıcımız, şirketlerin sizi web’de gizlice takip etmesini engelliyor.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">100 milyondan fazla insan, kâr amacı gütmeyen bir kuruluş tarafından desteklenen bu tarayıcıyla gizliliğini koruyor.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Takip kodları mı dediniz? Otomatik olarak engelliyoruz. Uzantı desteği mi? 700 uzantıyı deneyebilirsiniz. Ya PDF desteği? Yerleşik okuyucumuzla PDF’leri yönetmek çok daha kolay.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Kâr amacı gütmeyen tarayıcımız, şirketlerin sizi web’de gizlice takip etmesini engelliyor.\n\nAyrıntıları gizlilik bildirimimizde bulabilirsiniz.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -2344,6 +2350,10 @@
     <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">“Evet, deneyeceğim”i seçtiğinizde Mozilla %1$s %2$s ve %3$snı kabul etmiş olursunuz.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">“Evet, deneyeceğim”i seçtiğinizde %1$s için şunları kabul etmiş olursunuz:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">“Evet, deneyeceğim”i seçtiğinizde %1$s %2$s ve %3$s %4$snı kabul etmiş olursunuz.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">“Evet, deneyeceğim”i seçtiğinizde %1$s %2$s ve %3$s %4$snı kabul etmiş olursunuz.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">gizlilik politikası</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->

From 98bb61b29dfdb3bf4141401f8da130d5362efc2f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 10 Mar 2024 00:49:12 +0000
Subject: [PATCH 216/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-tg/strings.xml | 178 +++++++++++++------------
 1 file changed, 91 insertions(+), 87 deletions(-)

diff --git a/app/src/main/res/values-tg/strings.xml b/app/src/main/res/values-tg/strings.xml
index 72a7668f9..87d7fd4ae 100644
--- a/app/src/main/res/values-tg/strings.xml
+++ b/app/src/main/res/values-tg/strings.xml
@@ -257,6 +257,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Тарҷума кардани саҳифа</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Саҳифа аз забони %1$s ба забони %2$s тарҷума шуд.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Забони интихобшуда</string>
@@ -334,9 +339,13 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Огоҳномаи махфияти «Firefox»</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Маълумоти бештар дар «Огоҳномаи махфияти мо»</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Мо нигоҳдории бехатарии шуморо дӯст медорем</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Бифаҳмед, ки чаро миллионҳо одамон браузери «Firefox»-ро дӯст медоранд</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Браузери мо, ки аз ҷониби ташкилоти ғайритиҷоратӣ дастгирӣ мешавад, маъракаҳоеро, ки шуморо дар атрофи Интернет пинҳонӣ пайгирӣ мекунанд, қатъ мекунад.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
@@ -694,9 +703,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Хатбаракҳо</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Воридшавиҳо</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Воридшавиҳо</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Ниҳонвожаҳо</string>
+    <string name="preferences_sync_logins_2">Ниҳонвожаҳо</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Варақаҳои кушодашуда</string>
     <!-- Preference for signing out -->
@@ -723,9 +732,9 @@
     <string name="default_device_name_2">%1$s дар %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Кортҳои кредитӣ</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Кортҳои кредитӣ</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Тарзҳои пардохт</string>
+    <string name="preferences_sync_credit_cards_2">Тарзҳои пардохт</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Нишониҳо</string>
 
@@ -1675,13 +1684,13 @@
     <string name="add_to_homescreen_description_2">Шумо метавонед ин сомонаро ба экрани асосии дастгоҳи худ ба осонӣ илова кунед, то ки ба он дастрасии фаврӣ дошта бошед ва бо таҷрибаи ба барнома монанд зудтар паймоиш кунед.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Воридшавиҳо ва ниҳонвожаҳо</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Воридшавиҳо ва ниҳонвожаҳо</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Ниҳонвожаҳо</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Ниҳонвожаҳо</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Нигоҳ доштани воридшавиҳо ва ниҳонвожаҳо</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Нигоҳ доштани воридшавиҳо ва ниҳонвожаҳо</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Нигоҳ доштани ниҳонвожаҳо</string>
+    <string name="preferences_passwords_save_logins_2">Нигоҳ доштани ниҳонвожаҳо</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Бо пешниҳоди нигоҳдорӣ</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1696,47 +1705,47 @@
     <string name="preferences_android_autofill_description">Номи корбарон ва ниҳонвожаҳоро дар барномаҳои дигари дастгоҳи худ пур кунед.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Илова кардани воридшавӣ</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Илова кардани воридшавӣ</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Илова кардани ниҳонвожа</string>
+    <string name="preferences_logins_add_login_2">Илова кардани ниҳонвожа</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Воридшавиҳои ҳамоҳангшуда</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Ҳамоҳанг кардани ниҳонвожаҳо</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Воридшавиҳои ҳамоҳангшуда</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Ҳамоҳанг кардани ниҳонвожаҳо</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Ҳамоҳанг кардани воридшавиҳо байни дастгоҳҳо</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Ҳамоҳанг кардани воридшавиҳо байни дастгоҳҳо</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Ҳамоҳанг кардани ниҳонвожаҳо байни дастгоҳҳо</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Ҳамоҳанг кардани ниҳонвожаҳо байни дастгоҳҳо</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Воридшавиҳои нигоҳдошташуда</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Воридшавиҳои нигоҳдошташуда</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Ниҳонвожаҳои нигоҳдошташуда</string>
+    <string name="preferences_passwords_saved_logins_2">Ниҳонвожаҳои нигоҳдошташуда</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Воридшавиҳое, ки шумо дар %s нигоҳ медоред ё ҳамоҳанг мекунед, дар ин ҷо нишон дода мешаванд.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Воридшавиҳое, ки шумо дар %s нигоҳ медоред ё ҳамоҳанг мекунед, дар ин ҷо нишон дода мешаванд.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Ниҳонвожаҳоеро, ки шумо нигоҳ медоред ё бо «%s» ҳамоҳанг месозед, дар ин рӯйхат нишон дода мешаванд. Ҳамаи ниҳонвожаҳое, ки шумо нигоҳ медоред, рамзгузорӣ карда мешаванд.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Ниҳонвожаҳоеро, ки шумо нигоҳ медоред ё бо «%s» ҳамоҳанг месозед, дар ин рӯйхат нишон дода мешаванд. Ҳамаи ниҳонвожаҳое, ки шумо нигоҳ медоред, рамзгузорӣ карда мешаванд.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Маълумоти бештар дар бораи ҳамоҳангсозӣ</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Маълумоти бештар дар бораи ҳамоҳангсозӣ</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Маълумоти бештар дар бораи ҳамоҳангсозӣ</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Маълумоти бештар дар бораи ҳамоҳангсозӣ</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Истисноҳо</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Воридшавиҳо ва ниҳонвожаҳое, ки нигоҳ дошта нашудаанд, дар ин ҷо нишон дошта мешаванд.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Воридшавиҳо ва ниҳонвожаҳое, ки нигоҳ дошта нашудаанд, дар ин ҷо нишон дошта мешаванд.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">«%s» барои сомонаҳое, ки дар ин рӯйхат нишон дода шудаанд, ниҳонвожаҳоро нигоҳ намедорад.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">«%s» барои сомонаҳое, ки дар ин рӯйхат нишон дода шудаанд, ниҳонвожаҳоро нигоҳ намедорад.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Воридшавиҳо ва ниҳонвожаҳо барои сомонаҳои зерин нигоҳ дошта намешаванд.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Воридшавиҳо ва ниҳонвожаҳо барои сомонаҳои зерин нигоҳ дошта намешаванд.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">«%s» барои сомонаҳои зерин ниҳонвожаҳоро нигоҳ намедорад.</string>
+    <string name="preferences_passwords_exceptions_description_2">«%s» барои сомонаҳои зерин ниҳонвожаҳоро нигоҳ намедорад.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Нест кардани ҳамаи истисноҳо</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Ҷустуҷӯи воридшавиҳо</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Ҷустуҷӯи воридшавиҳо</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Ҷустуҷӯи ниҳонвожаҳо</string>
+    <string name="preferences_passwords_saved_logins_search_2">Ҷустуҷӯи ниҳонвожаҳо</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Сомона</string>
     <!-- The header for the username for a login -->
@@ -1764,17 +1773,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Пинҳон кардани ниҳонвожа</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Барои дидани воридшавиҳои нигоҳдошташуда, қулфро кушоед</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Барои дидани воридшавиҳои нигоҳдошташуда, қулфро кушоед</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Барои дидани ниҳонвожаҳои нигоҳдошташуда, қулфро кушоед</string>
+    <string name="logins_biometric_prompt_message_2">Барои дидани ниҳонвожаҳои нигоҳдошташуда, қулфро кушоед</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Воридшавиҳо ва ниҳонвожаҳои худро муҳофизат намоед</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Воридшавиҳо ва ниҳонвожаҳои худро муҳофизат намоед</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Ниҳонвожаҳои нигоҳдоштаро муҳофизат намоед</string>
+    <string name="logins_warning_dialog_title_2">Ниҳонвожаҳои нигоҳдоштаро муҳофизат намоед</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Барои муҳофизат кардани воридшавиҳо ва ниҳонвожаҳои худ аз дастрасии озод, агар касе дигар аз дастгоҳи шумо истифода барад, шаклвораи қулфи экран, рамзи PIN ё ниҳонвожаеро барои дастгоҳи худ танзим намоед.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Барои муҳофизат кардани воридшавиҳо ва ниҳонвожаҳои худ аз дастрасии озод, агар касе дигар аз дастгоҳи шумо истифода барад, шаклвораи қулфи экран, рамзи PIN ё ниҳонвожаеро барои дастгоҳи худ танзим намоед.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Барои муҳофизат кардани ниҳонвожаҳои нигоҳдошташудаи худ аз дастрасии озод, агар касе дигар аз дастгоҳи шумо истифода барад, шаклвораи қулфи экран, рамзи PIN ё ниҳонвожаеро барои дастгоҳи худ танзим намоед.</string>
+    <string name="logins_warning_dialog_message_2">Барои муҳофизат кардани ниҳонвожаҳои нигоҳдошташудаи худ аз дастрасии озод, агар касе дигар аз дастгоҳи шумо истифода барад, шаклвораи қулфи экран, рамзи PIN ё ниҳонвожаеро барои дастгоҳи худ танзим намоед.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Дертар</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1792,7 +1801,7 @@
     <string name="saved_logins_sort_strategy_last_used">Истифодашудаи охирин</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Мураттаб кардани менюи воридшавиҳо</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Мураттаб кардани менюи воридшавиҳо</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1800,38 +1809,38 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Нишониҳо</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Кортҳои кредитӣ</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Кортҳои кредитӣ</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Тарзҳои пардохт</string>
+    <string name="preferences_credit_cards_2">Тарзҳои пардохт</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Нигоҳ доштан ва ба таври худкор пур кардани кортҳо</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Нигоҳ доштан ва ба таври худкор пур кардани кортҳо</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Нигоҳ доштан ва пур кардани тарзҳои пардохт</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Нигоҳ доштан ва пур кардани тарзҳои пардохт</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Маълумот рамзгузорӣ карда шуд</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Маълумот рамзгузорӣ карда шуд</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Ҳамоҳанг кардани кортҳо байни дастгоҳҳо</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Ҳамоҳанг кардани кортҳо</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Илова кардани корти кредитӣ</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Илова кардани корти кредитӣ</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Илова кардани корт</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Илова кардани корт</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Идора кардани кортҳои нигоҳдошташуда</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Идора кардани кортҳои нигоҳдошташуда</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Идоракунии кортҳо</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Идоракунии кортҳо</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Илова кардани нишонӣ</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Идоракунии нишониҳо</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Нигоҳ доштан ва ба таври худкор пур кардани нишониҳо</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Нигоҳ доштан ва ба таври худкор пур кардани нишониҳо</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Нигоҳ доштан ва пур кардани нишониҳо</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Нигоҳ доштан ва пур кардани нишониҳо</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Илова кардани маълумот монанди рақамҳо, нишониҳои почтаи электронӣ ва бурдарасонӣ</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Илова кардани маълумот монанди рақамҳо, нишониҳои почтаи электронӣ ва бурдарасонӣ</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Илова кардани корт</string>
@@ -1853,9 +1862,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Нест кардани корт</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Шумо мутмаин ҳастед, ки мехоҳед ин корти кредитиро нест намоед?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Шумо мутмаин ҳастед, ки мехоҳед ин корти кредитиро нест намоед?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Кортро нест мекунед?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Кортро нест мекунед?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Нест кардан</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1869,20 +1878,20 @@
     <string name="credit_cards_saved_cards">Кортҳои нигоҳдошташуда</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Лутфан, рақами корти кредитии дурустро ворид намоед</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Лутфан, рақами корти кредитии дурустро ворид намоед</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Рақами корти дурустро ворид намоед</string>
+    <string name="credit_cards_number_validation_error_message_2">Рақами корти дурустро ворид намоед</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Лутфан, ин майдонро пур кунед</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Лутфан, ин майдонро пур кунед</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Номеро ворид намоед</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Номеро ворид намоед</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Барои дидани кортҳои нигоҳдошташуда, қулфро кушоед</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Кортҳои кредитии худро муҳофизат кунед</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Кортҳои кредитии худро муҳофизат кунед</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Барои муҳофизат кардани кортҳои кредитии нигоҳдошташудаи худ аз дастрасии озод, агар касе дигар аз дастгоҳи шумо истифода барад, шаклвораи қулфи экран, рамзи PIN ё ниҳонвожаеро барои дастгоҳи худ танзим намоед.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Барои муҳофизат кардани кортҳои кредитии нигоҳдошташудаи худ аз дастрасии озод, агар касе дигар аз дастгоҳи шумо истифода барад, шаклвораи қулфи экран, рамзи PIN ё ниҳонвожаеро барои дастгоҳи худ танзим намоед.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Ҳозир насб кунед</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1890,7 +1899,7 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Қулфи дастгоҳи худро кушоед</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Барои истифодаи маълумоти кортҳои кредитии нигоҳдошташуда, қулфро кушоед</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Барои истифодаи маълумоти кортҳои кредитии нигоҳдошташуда, қулфро кушоед</string>
 
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Илова кардани нишонӣ</string>
@@ -1899,11 +1908,11 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Идоракунии нишониҳо</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Ном</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Ном</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Номи падар</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Номи падар</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Насаб</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Насаб</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Нишонии кӯча</string>
     <!-- The header for the city of an address -->
@@ -1928,9 +1937,9 @@
     <string name="addressess_delete_address_button">Нест кардани нишонӣ</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Шумо мутмаин ҳастед, ки мехоҳед ин нишониро нест намоед?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Шумо мутмаин ҳастед, ки мехоҳед ин нишониро нест намоед?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Ин нишониро нест мекунед?</string>
+    <string name="addressess_confirm_dialog_message_2">Ин нишониро нест мекунед?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Нест кардан</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2027,44 +2036,44 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Таҳрир кардан</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Шумо мутмаин ҳастед, ки мехоҳед ин воридшавиро нест намоед?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Шумо мутмаин ҳастед, ки мехоҳед ин воридшавиро нест намоед?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Шумо мутмаин ҳастед, ки мехоҳед ин ниҳонвожаро нест намоед?</string>
+    <string name="login_deletion_confirmation_2">Шумо мутмаин ҳастед, ки мехоҳед ин ниҳонвожаро нест намоед?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Нест кардан</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Бекор кардан</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Имконоти воридшавӣ</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Имконоти воридшавӣ</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Инконоти ниҳонвожа</string>
+    <string name="login_options_menu_2">Инконоти ниҳонвожа</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Майдони матни таҳриршаванда барои нишонии сомонаи воридшавӣ.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Майдони матни таҳриршаванда барои нишонии сомонаи воридшавӣ.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Майдони матни таҳриршаванда барои номи корбарии воридшавӣ.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Майдони матни таҳриршаванда барои номи корбарии воридшавӣ.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Майдони матни таҳриршаванда барои ниҳонвожаи воридшавӣ.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Майдони матни таҳриршаванда барои ниҳонвожаи воридшавӣ.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Нигоҳ доштани тағйирот барои воридшавӣ</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Нигоҳ доштани тағйирот барои воридшавӣ</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Тағийротро нигоҳ медорад.</string>
+    <string name="save_changes_to_login_2">Тағийротро нигоҳ медорад.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Таҳрир кардан</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Таҳрир кардан</string>
 
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Таҳрир кардани ниҳонвожа</string>
+    <string name="edit_2">Таҳрир кардани ниҳонвожа</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Илова кардани воридшавии нав</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Илова кардани воридшавии нав</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Илова кардани ниҳонвожа</string>
+    <string name="add_login_2">Илова кардани ниҳонвожа</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Ниҳонвожа лозим аст</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Ниҳонвожа лозим аст</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Ниҳонвожаеро ворид намоед</string>
+    <string name="saved_login_password_required_2">Ниҳонвожаеро ворид намоед</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Номи корбар лозим аст</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Номи корбар лозим аст</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Номи корбареро ворид намоед</string>
+    <string name="saved_login_username_required_2">Номи корбареро ворид намоед</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Номи сервер лозим аст</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2177,7 +2186,7 @@
     <string name="radio_preference_info_content_description">Барои тафсилоти бештар зер кунед</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Ба боло гузаред</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Ба боло гузаред</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Пӯшидан</string>
@@ -2218,8 +2227,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Баҳодиҳии санҷида дурустшуда</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Тақризҳои беэътимод тоза карда шудаанд</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Дар асоси тақризҳои беэътимод</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Нуқтаҳои асосӣ аз тақризҳои охирин</string>
@@ -2275,10 +2282,6 @@
     <string name="review_quality_check_product_availability_warning_body">Агар шумо бинед, ки ин маҳсул аз нав дастрас бошад, гузориш диҳед ва мо тақризҳои онро тафтиш мекунем.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Огоҳ кунед, ки маҳсул дастрас аст</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Дар ҳоли санҷиши сифати тақризҳо</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Дар ҳоли санҷиши сифати тақризҳо</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Дар ҳоли санҷиши сифати тақризҳо (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2324,11 +2327,11 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Маълумоти бештар</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Бо интихоби «Ҳа, озмоед», шумо ба «%1$s» бо қабули «%2$s» ва «%3$s» аз ҷониби «Mozilla» розӣ мешавед.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Бо интихоби «Ҳа, озмоед», шумо ба «%1$s» бо қабули «%2$s» ва «%3$s» аз ҷониби «Mozilla» розӣ мешавед.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Бо интихоби «Ҳа, озмоед», шумо бо зерин мувофиқи «%1$s» розӣ мешавед:</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">сиёсати махфият</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">сиёсати махфият</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Сиёсати махфият</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2436,6 +2439,7 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Маълумоти бештар</string>
 
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Имконоти тарҷума</string>

From b62c0405d565f43020f36d3ccba9e91151942381 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 02:11:16 +0000
Subject: [PATCH 217/222] Uplift Fenix strings from main to releases_v124

---
 app/src/main/res/values-be/strings.xml     | 237 +++++++++++++-------
 app/src/main/res/values-eo/strings.xml     | 225 +++++++++++--------
 app/src/main/res/values-es-rES/strings.xml |   7 +
 app/src/main/res/values-gl/strings.xml     |  46 ++--
 app/src/main/res/values-in/strings.xml     | 248 ++++++++++-----------
 app/src/main/res/values-is/strings.xml     |   9 +-
 app/src/main/res/values-ja/strings.xml     |   6 +-
 app/src/main/res/values-pl/strings.xml     | 209 +++++++++--------
 app/src/main/res/values-ro/strings.xml     |  64 +++---
 app/src/main/res/values-sl/strings.xml     |   6 +
 app/src/main/res/values-tr/strings.xml     |   2 +-
 11 files changed, 614 insertions(+), 445 deletions(-)

diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index d0e080a57..5cdc0a0a1 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -253,6 +253,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Перакласці старонку</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Старонка перакладзена з %1$s на %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Абраная мова</string>
@@ -330,12 +335,20 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Паведамленне аб прыватнасці Firefox</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Даведайцеся больш у нашым паведамленні аб прыватнасці</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Нам падабаецца забяспечваць вашу бяспеку</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Даведайцеся, чаму мільёны людзей любяць Firefox</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Наш браўзер, падтрыманы некамерцыйнай арганізацыяй, дапамагае не даваць кампаніям таемна сачыць за вамі ў сеціве.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Больш за 100 мільёнаў чалавек абараняюць сваю прыватнасць, выбіраючы браўзер, які падтрымліваецца некамерцыйнай арганізацыяй.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Вядомыя трэкеры? Блакуюцца аўтаматычна. Пашырэнні? Паспрабуйце ўсе 700. PDF? Наш убудаваны чытальнік дазваляе лёгка імі кіраваць.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Наш браўзер, падтрыманы некамерцыйнай арганізацыяй, дапамагае абмяжоўваць кампаніі ад сачэння за вамі ў Інтэрнэце.\n\nДаведайцеся больш у нашым паведамленні аб прыватнасці.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -693,9 +706,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Закладкі</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Лагіны</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Лагіны</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Паролі</string>
+    <string name="preferences_sync_logins_2">Паролі</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Адкрытыя карткі</string>
     <!-- Preference for signing out -->
@@ -721,9 +734,9 @@
     <string name="default_device_name_2">%1$s на %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Крэдытныя карты</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Крэдытныя карты</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Спосабы аплаты</string>
+    <string name="preferences_sync_credit_cards_2">Спосабы аплаты</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Адрасы</string>
 
@@ -1678,13 +1691,13 @@
     <string name="add_to_homescreen_description_2">Вы можаце лёгка дадаць гэты вэб-сайт на хатні экран вашай прылады, каб мець да яго імгненны доступ і аглядаць хутчэй, нібыта гэта асобная праграма.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Лагіны і паролі</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Лагіны і паролі</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Паролі</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Паролі</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Захаванне лагінаў і пароляў</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Захаванне лагінаў і пароляў</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Захоўваць паролі</string>
+    <string name="preferences_passwords_save_logins_2">Захоўваць паролі</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Пытаць пра захаванне</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1699,36 +1712,42 @@
     <!-- Description for the preference for autofilling logins from Fenix in other apps (e.g. autofilling the Twitter app) -->
     <string name="preferences_android_autofill_description">Запаўняць імёны карыстальнікаў і паролі ў іншых праграмах на вашай прыладзе.</string>
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Дадаць лагін</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Дадаць лагін</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Дадаць пароль</string>
+    <string name="preferences_logins_add_login_2">Дадаць пароль</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Сінхранізацыя лагінаў</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Сінхранізацыя лагінаў</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Сінхранізаваць паролі</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Сінхранізаваць лагіны паміж прыладамі</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Сінхранізаваць лагіны паміж прыладамі</string>
+    <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices_2">Сінхранізаваць паролі паміж прыладамі</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Захаваныя лагіны</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Захаваныя лагіны</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Захаваныя паролі</string>
+    <string name="preferences_passwords_saved_logins_2">Захаваныя паролі</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Лагіны, якія вы захаваеце альбо сінхранізуеце праз %s, з’явяцца тут.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Лагіны, якія вы захаваеце альбо сінхранізуеце праз %s, з’явяцца тут.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Даведацца больш пра сінхранізацыю.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Даведацца больш пра сінхранізацыю.</string>
+    <!-- Clickable text for opening an external link for more information about Sync. -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Даведайцеся больш пра сінхранізацыю</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Выключэнні</string>
 
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Не захаваныя лагіны і паролі з’явяцца тут.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Не захаваныя лагіны і паролі з’явяцца тут.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Лагіны і паролі не будуць захаваны для гэтых сайтаў.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Лагіны і паролі не будуць захаваны для гэтых сайтаў.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Выдаліць усе выключэнні</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Шукаць лагіны</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Шукаць лагіны</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Пошук пароляў</string>
+    <string name="preferences_passwords_saved_logins_search_2">Пошук пароляў</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Сайт</string>
     <!-- The header for the username for a login -->
@@ -1757,16 +1776,16 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Схаваць пароль</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Разблакуйце, каб пабачыць захаваныя лагіны</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Разблакуйце, каб пабачыць захаваныя лагіны</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Разблакуйце, каб пабачыць захаваныя паролі</string>
+    <string name="logins_biometric_prompt_message_2">Разблакуйце, каб пабачыць захаваныя паролі</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Абараніце свае лагіны і паролі</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Абараніце свае лагіны і паролі</string>
 
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Абараніце захаваныя паролі</string>
+    <string name="logins_warning_dialog_title_2">Абараніце захаваныя паролі</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Наладзьце графічны ключ, пін ці пароль для блакавання прылады, каб абараніць захаваныя лагіны і паролі ад крадзяжу, калі Вашай прыладай завалодае хтосьці іншы.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Наладзьце графічны ключ, пін ці пароль для блакавання прылады, каб абараніць захаваныя лагіны і паролі ад крадзяжу, калі Вашай прыладай завалодае хтосьці іншы.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Пазней</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1783,7 +1802,7 @@
     <string name="saved_logins_sort_strategy_last_used">Апошняе выкарыстанне</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Меню сартавання лагінаў</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Меню сартавання лагінаў</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1791,40 +1810,40 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Адрасы</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Крэдытныя карты</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Крэдытныя карты</string>
 
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Спосабы аплаты</string>
+    <string name="preferences_credit_cards_2">Спосабы аплаты</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Захоўваць і аўтаматычна запаўняць карты</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Захоўваць і аўтаматычна запаўняць карты</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Захоўваць і запаўняць спосабы аплаты</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Захоўваць і запаўняць спосабы аплаты</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Дадзеныя зашыфраваны</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Дадзеныя зашыфраваны</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Сінхранізаваць карты паміж прыладамі</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Сінхранізаваць карты</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Дадаць крэдытную карту</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Дадаць крэдытную карту</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Дадаць карту</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Дадаць карту</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Кіраванне захаванымі картамі</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Кіраванне захаванымі картамі</string>
 
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Кіраваць картамі</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Кіраваць картамі</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Дадаць адрас</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Кіраваць адрасамі</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Захоўваць і аўтаматычна запаўняць адрасы</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Захоўваць і аўтаматычна запаўняць адрасы</string>
 
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Захоўваць і запаўняць адрасы</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Захоўваць і запаўняць адрасы</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Уключаць звесткі, такія як нумары, адрасы электроннай пошты і дастаўкі</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Уключаць звесткі, такія як нумары, адрасы электроннай пошты і дастаўкі</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Дадаць карту</string>
@@ -1846,9 +1865,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Выдаліць карту</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Вы ўпэўнены, што жадаеце выдаліць гэту крэдытную карту?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Вы ўпэўнены, што жадаеце выдаліць гэту крэдытную карту?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Выдаліць карту?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Выдаліць карту?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Выдаліць</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1861,22 +1880,22 @@
     <string name="credit_cards_saved_cards">Захаваныя карты</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Калі ласка, увядзіце сапраўдны нумар крэдытнай карты</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Калі ласка, увядзіце сапраўдны нумар крэдытнай карты</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Увядзіце сапраўдны нумар карты</string>
+    <string name="credit_cards_number_validation_error_message_2">Увядзіце сапраўдны нумар карты</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Калі ласка, запоўніце гэтае поле</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Калі ласка, запоўніце гэтае поле</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Дадайце імя</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Дадайце імя</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Разблакуйце, каб пабачыць захаваныя карты</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Абараніце свае крэдытныя карты</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Абараніце свае крэдытныя карты</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Абараніце захаваныя спосабы аплаты</string>
+    <string name="credit_cards_warning_dialog_title_2">Абараніце захаваныя спосабы аплаты</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Наладзьце графічны ключ, пін або пароль для блакавання прылады, каб абараніць захаваныя крэдытныя карты, калі хтось іншы атрымае доступ да вашай прылады.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Наладзьце графічны ключ, пін або пароль для блакавання прылады, каб абараніць захаваныя крэдытныя карты, калі хтось іншы атрымае доступ да вашай прылады.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Наладзіць зараз</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1885,7 +1904,7 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Разблакуйце сваю прыладу</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Разблакуйце, каб выкарыстаць захаваную інфармацыю крэдытнай карты</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Разблакуйце, каб выкарыстаць захаваную інфармацыю крэдытнай карты</string>
 
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Дадаць адрас</string>
@@ -1894,11 +1913,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Кіраваць адрасамі</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Імя</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Імя</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Імя па бацьку</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Імя па бацьку</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Прозвішча</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Прозвішча</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Назва</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Вуліца</string>
     <!-- The header for the city of an address -->
@@ -1923,9 +1944,9 @@
     <string name="addressess_delete_address_button">Выдаліць адрас</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Вы ўпэўнены, што жадаеце выдаліць гэты адрас?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Вы ўпэўнены, што жадаеце выдаліць гэты адрас?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Выдаліць гэты адрас?</string>
+    <string name="addressess_confirm_dialog_message_2">Выдаліць гэты адрас?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Выдаліць</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2029,37 +2050,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Змяніць</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Вы сапраўды хочаце выдаліць гэтае лагін?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Вы сапраўды хочаце выдаліць гэтае лагін?</string>
+    <!-- Message in delete confirmation dialog for password -->
+    <string name="login_deletion_confirmation_2">Вы ўпэўнены, што хочаце выдаліць гэты пароль?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Выдаліць</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Адмяніць</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Налады лагіна</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Налады лагіна</string>
+    <!--  The saved password options menu description. -->
+    <string name="login_options_menu_2">Параметры пароля</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Тэкставае поле для рэдагавання вэб-адраса для ўваходу ў сістэму.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Тэкставае поле для рэдагавання вэб-адраса для ўваходу ў сістэму.</string>
+    <!--  The editable text field for a website address. -->
+    <string name="saved_login_hostname_description_3">Тэкставае поле для рэдагавання адраса сайта.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Тэкставае поле для рэдагавання імені карыстальніка для ўваходу ў сістэму.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Тэкставае поле для рэдагавання імені карыстальніка для ўваходу ў сістэму.</string>
+    <!--  The editable text field for a username. -->
+    <string name="saved_login_username_description_3">Тэкставае поле для рэдагавання імя карыстальніка.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Тэкставае поле для рэдагавання пароля для ўваходу ў сістэму.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Тэкставае поле для рэдагавання пароля для ўваходу ў сістэму.</string>
+    <string name="saved_login_password_description_2">Тэкставае поле для рэдагавання пароля.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Захаваць змены ва ўваходных даных.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Захаваць змены ва ўваходных даных.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Захаваць змены.</string>
+    <string name="save_changes_to_login_2">Захаваць змены.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Рэдагаванне</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Рэдагаванне</string>
+    <!--  The page title for editing a saved password. -->
+    <string name="edit_2">Змяніць пароль</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Дадаць новы лагін</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Дадаць новы лагін</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Дадаць пароль</string>
+    <string name="add_login_2">Дадаць пароль</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Патрабуецца пароль</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Патрабуецца пароль</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Увядзіце пароль</string>
+    <string name="saved_login_password_required_2">Увядзіце пароль</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Патрабуецца імя карыстальніка</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Патрабуецца імя карыстальніка</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Увядзіце імя карыстальніка</string>
+    <string name="saved_login_username_required_2">Увядзіце імя карыстальніка</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Патрабуецца імя хоста</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2173,7 +2206,7 @@
     <string name="radio_preference_info_content_description">Пстрыкніце, каб атрымаць падрабязнасці</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Перайсці ўверх</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Перайсці ўверх</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Закрыць</string>
@@ -2214,8 +2247,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Скарэктаваны рэйтынг</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Ненадзейныя водгукі выдалены</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">На аснове надзейных водгукаў</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Асноўныя моманты з апошніх водгукаў</string>
@@ -2271,10 +2302,8 @@
     <string name="review_quality_check_product_availability_warning_body">Калі вы ўбачыце гэты прадукт ізноў у наяўнасці, паведаміце нам пра гэта, і мы будзем правяраць водгукі.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Паведаміць, што прадукт ёсць у наяўнасці</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Праверка якасці водгукаў</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Праверка якасці водгукаў</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
+    <string name="review_quality_check_analysis_in_progress_warning_title_2">Праверка якасці водгукаў (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
     <string name="review_quality_check_analysis_in_progress_warning_body">Гэта можа заняць каля 60 секунд.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
@@ -2318,13 +2347,19 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Даведацца больш</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Выбіраючы «Так, паспрабаваць», вы пагаджаецеся з %2$s і %3$s ад %1$s ад Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Выбіраючы «Так, паспрабаваць», вы пагаджаецеся з %2$s і %3$s ад %1$s ад Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Выбіраючы «Так, паспрабаваць», вы згаджаецеся з наступным ад %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Выбіраючы «Так, паспрабаваць», вы пагаджаецеся з %2$s ад %1$s і %4$s ад %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Выбіраючы «Так, паспрабаваць», вы пагаджаецеся з %2$s ад %1$s і %4$s ад %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">палітыкай прыватнасці</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">палітыкай прыватнасці</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Палітыка прыватнасці</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">паведамленні аб прыватнасці</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">ўмовамі выкарыстання</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2394,6 +2429,14 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Перакласці старонку?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Старонка перакладзена з %1$s на %2$s</string>
+    <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
+    <string name="translations_bottom_sheet_title_first_time">Паспрабуйце прыватныя пераклады ў %1$s</string>
+    <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
+    <string name="translations_bottom_sheet_info_message">Дзеля вашай прыватнасці пераклады ніколі не пакідаюць вашу прыладу. Новыя мовы і паляпшэнні хутка! %1$s</string>
     <!-- Text that links to additional information about the Firefox translations feature. -->
     <string name="translations_bottom_sheet_info_message_learn_more">Падрабязней</string>
 
@@ -2403,6 +2446,8 @@
     <string name="translations_bottom_sheet_translate_to">Перакласці на</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Не зараз</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Паказаць арыгінал</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Гатова</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2413,13 +2458,29 @@
     <string name="translations_bottom_sheet_translating_in_progress">Пераклад</string>
     <!-- Button content description (not visible, for screen readers etc.) for the translations dialog translate button that indicates a translation is currently in progress. -->
     <string name="translations_bottom_sheet_translating_in_progress_content_description">Ідзе пераклад</string>
+    <!-- Default dropdown option when initially selecting a language from the translations dialog language selection dropdown. -->
+    <string name="translations_bottom_sheet_default_dropdown_selection">Выбраць мову</string>
     <!-- The title of the warning card informs the user that a translation could not be completed. -->
     <string name="translation_error_could_not_translate_warning_text">Узнікла праблема з перакладам. Калі ласка, паспрабуйце яшчэ раз.</string>
+    <!-- The title of the warning card informs the user that the list of languages cannot be loaded. -->
+    <string name="translation_error_could_not_load_languages_warning_text">Не ўдалося загрузіць мовы. Праверце інтэрнэт-злучэнне і паўтарыце спробу.</string>
     <!-- The title of the warning card informs the user that a language is not supported. The first parameter is the name of the language that is not supported. -->
     <string name="translation_error_language_not_supported_warning_text">На жаль, мы пакуль не падтрымліваем %1$s.</string>
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Падрабязней</string>
 
+
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Пераклад…</string>
+
+
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Сцягнуць мову ў рэжыме эканоміі трафіку (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Параметры перакладу</string>
@@ -2431,6 +2492,10 @@
     <string name="translation_option_bottom_sheet_never_translate_in_language">Ніколі не перакладаць %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
     <string name="translation_option_bottom_sheet_never_translate_site">Ніколі не перакладаць гэты сайт</string>
+    <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Перавызначае ўсе іншыя налады</string>
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Перавызначае прапановы перакладу</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Налады перакладу</string>
     <!-- Button text for the button that will take the user to a website to learn more about how translations works in the given app. The first parameter is the name of the application, for example, "Fenix". -->
@@ -2441,6 +2506,8 @@
     <string name="translation_settings_toolbar_title">Пераклады</string>
     <!-- Toggle switch label that indicates that the browser should signal or indicate when a translation is possible for any page. -->
     <string name="translation_settings_offer_to_translate">Прапаноўваць пераклад, калі гэта магчыма</string>
+    <!-- Toggle switch label that indicates that downloading files required for translating is permitted when using data saver mode in Android. -->
+    <string name="translation_settings_always_download">Заўсёды сцягваць мовы ў рэжыме эканоміі трафіку</string>
     <!-- Section header text that begins the section of a list of different options the user may select to adjust their translation preferences. -->
     <string name="translation_settings_translation_preference">Налады перакладу</string>
     <!-- Button text for the button that will take the user to the automatic translations settings dialog. On the automatic translations settings dialog, the user can set if translations should occur automatically for a given language. -->
@@ -2515,6 +2582,8 @@
     <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
     <string name="delete_language_file_dialog_negative_button_text">Скасаваць</string>
 
+    <!-- Checkbox label text on the data saving mode warning dialog used by the translations feature. This checkbox allows users to ignore the data usage warnings. -->
+    <string name="download_language_file_dialog_checkbox_text">Заўсёды сцягваць у рэжыме эканоміі трафіку</string>
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
     <string name="download_language_file_dialog_positive_button_text">Сцягнуць</string>
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file and perform a translation. -->
@@ -2539,4 +2608,14 @@
     <string name="debug_drawer_tab_tools_tab_count_private">Прыватныя</string>
     <!-- The total tab count category in the tab count section in Tab Tools. -->
     <string name="debug_drawer_tab_tools_tab_count_total">Усяго</string>
-    </resources>
+    <!-- The title of the tab creation tool section in Tab Tools. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_title">Інструмент стварэння картак</string>
+    <!-- The label of the text field in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_text_field_label">Колькасць картак для стварэння</string>
+    <!-- The button text to add tabs to the active tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_active">Дадаць да актыўных картак</string>
+    <!-- The button text to add tabs to the inactive tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_inactive">Дадаць да неактыўных картак</string>
+    <!-- The button text to add tabs to the private tab group in the tab creation tool. -->
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_private">Дадаць да прыватных картак</string>
+</resources>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index adae84f57..4096e619c 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -250,6 +250,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Traduki paĝon</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Paĝo tradukita el la %1$s en la %2$sn.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Elektita lingvo</string>
@@ -326,12 +331,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Rimarko de Firefox pri privateco</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Pli da informo en nia rimarko pri privateco</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Ni amas teni vin sekura</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Malkovru kial milionoj da personoj amas Firefox</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Sekura retumo kun pli da elektebloj</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Nia retumilo, subtenata de nenprofitcela organizo, helpas eviti ke entreprenoj kaŝe sekvu vin tra la reto.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Pli ol 100 milionoj da personoj protektas sian privatecon per la elekto de retumilo farita de neprofitcela organizo.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Kio pri konataj spuriloj? Aŭtomate blokitaj.  Kio pri etendaĵoj? Testu ĉiujn 700. Kaj pri PDFs? Nia integrita legilo faciligas pritrakti ilin.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Nia retumilo, subtenata de nenprofitcela organizo, helpas eviti ke entreprenoj kaŝe sekvu vin tra la reto.\n\nPli da informo en nia rimarko pri privateco.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -689,9 +704,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">legosignojn</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">legitimilojn</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">legitimilojn</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Pasvortoj</string>
+    <string name="preferences_sync_logins_2">Pasvortoj</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Malfermitaj langetoj</string>
     <!-- Preference for signing out -->
@@ -717,9 +732,9 @@
     <string name="default_device_name_2">%1$s en %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Kreditkartoj</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditkartoj</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Pagmetodoj</string>
+    <string name="preferences_sync_credit_cards_2">Pagmetodoj</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresoj</string>
 
@@ -1670,13 +1685,13 @@
     <string name="add_to_homescreen_description_2">Vi povas facile aldoni tiun ĉi retejon al la hejmpaĝo de via aparato, por havi tujan aliron kaj retumi pli rapide per kvazaŭprograma sperto.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Legitimiloj kaj pasvortoj</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Legitimiloj kaj pasvortoj</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Pasvortoj</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Pasvortoj</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Konservi legitimilojn kaj pasvortojn</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Konservi legitimilojn kaj pasvortojn</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Konservi pasvortojn</string>
+    <string name="preferences_passwords_save_logins_2">Konservi pasvortojn</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Demandi antaŭ ol konservi</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1691,48 +1706,48 @@
     <!-- Description for the preference for autofilling logins from Fenix in other apps (e.g. autofilling the Twitter app) -->
     <string name="preferences_android_autofill_description">Plenigi nomojn de uzanto kaj pasvortojn en aliaj programoj en via aparato.</string>
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Aldoni legitimilon</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Aldoni legitimilon</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Aldoni pasvorton</string>
+    <string name="preferences_logins_add_login_2">Aldoni pasvorton</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Speguli legitimilojn</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Speguli pasvortojn</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Speguli legitimilojn</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Speguli pasvortojn</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Speguli legitimilojn inter aparatoj</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Speguli legitimilojn inter aparatoj</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Speguli pasvortojn inter aparatoj</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Speguli pasvortojn inter aparatoj</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Konservitaj legitimiloj</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Konservitaj legitimiloj</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Konservitaj pasvortoj</string>
+    <string name="preferences_passwords_saved_logins_2">Konservitaj pasvortoj</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">La legitimiloj, kiujn vi konservas aŭ spegulas al %s, aperos ĉi tie.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">La legitimiloj, kiujn vi konservas aŭ spegulas al %s, aperos ĉi tie.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">La pasvortoj konservitaj aŭ spegulitaj al %s estos listigitaj ĉi tie. Ĉiuj konservitaj pasvortoj estos ĉifritaj.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">La pasvortoj konservitaj aŭ spegulitaj al %s estos listigitaj ĉi tie. Ĉiuj konservitaj pasvortoj estos ĉifritaj.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Pli da informo pri Spegulado.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Pli da informo pri Spegulado.</string>
 
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Pli da informo pri spegulado</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Pli da informo pri spegulado</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Esceptoj</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Nekonservitaj nomoj de uzantoj kaj pasvortoj estos montritaj ĉi tie.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Nekonservitaj nomoj de uzantoj kaj pasvortoj estos montritaj ĉi tie.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s ne konservos pasvortojn por retejoj listigitaj ĉi tie.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s ne konservos pasvortojn por retejoj listigitaj ĉi tie.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Nomoj de uzanto kaj pasvortoj por tiuj ĉi retejoj ne estos konservitaj.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Nomoj de uzanto kaj pasvortoj por tiuj ĉi retejoj ne estos konservitaj.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s ne konservos pasvortojn por tiuj ĉi retejoj.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s ne konservos pasvortojn por tiuj ĉi retejoj.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Forigi ĉiujn esceptojn</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Serĉi legitimilojn</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Serĉi legitimilojn</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Serĉi pasvortojn</string>
+    <string name="preferences_passwords_saved_logins_search_2">Serĉi pasvortojn</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Retejo</string>
     <!-- The header for the username for a login -->
@@ -1760,18 +1775,18 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Kaŝi pasvorton</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Malŝlosu por vidi viajn konservitajn legitimilojn</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Malŝlosu por vidi viajn konservitajn legitimilojn</string>
 
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Malŝlosi por vidi viajn konservitajn pasvortojn</string>
+    <string name="logins_biometric_prompt_message_2">Malŝlosi por vidi viajn konservitajn pasvortojn</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Protektu viajn legitimilojn kaj pasvortojn</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Protektu viajn legitimilojn kaj pasvortojn</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Protektu viajn konservitajn pasvortojn</string>
+    <string name="logins_warning_dialog_title_2">Protektu viajn konservitajn pasvortojn</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Difinu blokan desegnon, PIN aŭ pasvorton por protekti viajn konservitajn legitimilojn kaj pasvortojn se iu alia havas vian aparaton.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Difinu blokan desegnon, PIN aŭ pasvorton por protekti viajn konservitajn legitimilojn kaj pasvortojn se iu alia havas vian aparaton.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Difinu blokan desegnon, PIN aŭ pasvorton por protekti viajn konservitajn pasvortojn se iu alia havas vian aparaton.</string>
+    <string name="logins_warning_dialog_message_2">Difinu blokan desegnon, PIN aŭ pasvorton por protekti viajn konservitajn pasvortojn se iu alia havas vian aparaton.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Poste</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1788,10 +1803,10 @@
     <string name="saved_logins_sort_strategy_last_used">Laste uzita</string>
 
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordigi menuon de legitimiloj</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Ordigi menuon de legitimiloj</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menuo por ordigi pasvortojn</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menuo por ordigi pasvortojn</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1799,42 +1814,42 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adresoj</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Kreditkartoj</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kreditkartoj</string>
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Pagmetodoj</string>
+    <string name="preferences_credit_cards_2">Pagmetodoj</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Konservi kaj aŭtomate plenigi kreditkartojn</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Konservi kaj aŭtomate plenigi kreditkartojn</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Konservi kaj aŭtomate plenigi pagmetodojn</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Konservi kaj aŭtomate plenigi pagmetodojn</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">La datumoj estas ĉifritaj</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">La datumoj estas ĉifritaj</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s ĉifras ĉiujn pagmetodojn, kiujn vi konservis</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s ĉifras ĉiujn pagmetodojn, kiujn vi konservis</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Speguli kreditkartojn inter aparatoj</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Speguli kreditkartojn</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Aldoni kreditkarton</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Aldoni kreditkarton</string>
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Aldoni kreditkarton</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Aldoni kreditkarton</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Administri konservitajn kreditkartojn</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Administri konservitajn kreditkartojn</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Administri kartojn</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Administri kartojn</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Aldoni adreson</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Administri adresojn</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Konservi kaj aŭtomate plenigi adresojn</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Konservi kaj aŭtomate plenigi adresojn</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Konservi kaj aŭtomate plenigi adresojn</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Konservi kaj aŭtomate plenigi adresojn</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Inkluzivi informojn kiel numerojn, retpoŝtajn kaj liverajn adresojn</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Inkluzivi informojn kiel numerojn, retpoŝtajn kaj liverajn adresojn</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">Telefonnumeroj kaj retpoŝtaj adresoj inkluzivitaj</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">Telefonnumeroj kaj retpoŝtaj adresoj inkluzivitaj</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Aldoni kreditkarton</string>
@@ -1856,9 +1871,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Forigi kreditkarton</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Ĉu vi certe volas forigi tiun ĉi kreditkarton?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Ĉu vi certe volas forigi tiun ĉi kreditkarton?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Ĉu forigi karton?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Ĉu forigi karton?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Forigi</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1871,24 +1886,24 @@
     <string name="credit_cards_saved_cards">Konservitaj kreditkartoj</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Bonvolu tajpi validan kreditkaran numeron</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Bonvolu tajpi validan kreditkaran numeron</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Tajpu validan numeron de karto</string>
+    <string name="credit_cards_number_validation_error_message_2">Tajpu validan numeron de karto</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Bonvolu plenigi tiun ĉi kampon</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Bonvolu plenigi tiun ĉi kampon</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Aldoni nomon</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Aldoni nomon</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Malŝlosu por vidi viajn konservitajn kreditkartojn</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Sekurigu viajn kreditkartojn</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Sekurigu viajn kreditkartojn</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Protektu viajn konservitajn pagmetodojn</string>
+    <string name="credit_cards_warning_dialog_title_2">Protektu viajn konservitajn pagmetodojn</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Difinu blokan desegnon, PIN aŭ pasvorton por protekti viajn konservitajn kreditkartojn se iu alia havas vian aparaton.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Difinu blokan desegnon, PIN aŭ pasvorton por protekti viajn konservitajn kreditkartojn se iu alia havas vian aparaton.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Difinu blokan desegnon, PIN aŭ pasvorton por protekti viajn konservitajn pagmetodojn se iu alia havas vian aparaton.</string>
+    <string name="credit_cards_warning_dialog_message_3">Difinu blokan desegnon, PIN aŭ pasvorton por protekti viajn konservitajn pagmetodojn se iu alia havas vian aparaton.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Agordi nun</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1896,10 +1911,10 @@
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
     <string name="credit_cards_biometric_prompt_message_pin">Malbloki vian aparaton</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Malŝlosu por uzi la konservitan informon pri kreditkartojn</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Malŝlosu por uzi la konservitan informon pri kreditkartojn</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Malŝlosu por uzi konservitajn pagmetodojn</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Malŝlosu por uzi konservitajn pagmetodojn</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Aldoni adreson</string>
     <!-- Title of the "Edit address" screen -->
@@ -1907,11 +1922,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Administri adresojn</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Persona nomo</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Persona nomo</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Dua nomo</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Dua nomo</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Familia nomo</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Familia nomo</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Nomo</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Strata adreso</string>
     <!-- The header for the city of an address -->
@@ -1936,9 +1953,9 @@
     <!-- The text for the "Delete address" button for deleting an address -->
     <string name="addressess_delete_address_button">Forigi adreson</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Ĉu vi certe volas forigi tiun ĉi adreson?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Ĉu vi certe volas forigi tiun ĉi adreson?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Ĉu forigi tiun ĉi adreson?</string>
+    <string name="addressess_confirm_dialog_message_2">Ĉu forigi tiun ĉi adreson?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Forigi</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2037,49 +2054,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Modifi</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Ĉu vi certe volas forigi tiun ĉi legitimilon?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Ĉu vi certe volas forigi tiun ĉi legitimilon?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Ĉu vi certe volas forigi tiun ĉi pasvorton?</string>
+    <string name="login_deletion_confirmation_2">Ĉu vi certe volas forigi tiun ĉi pasvorton?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Forigi</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Nuligi</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Preferoj de komenco de seanco</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Preferoj de komenco de seanco</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Pasvortaj elektebloj</string>
+    <string name="login_options_menu_2">Pasvortaj elektebloj</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">La modifebla teksta kampo de la retadreso por komenci seancon.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">La modifebla teksta kampo de la retadreso por komenci seancon.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">La modifebla teksta kampo de la reteja retadreso.</string>
+    <string name="saved_login_hostname_description_3">La modifebla teksta kampo de la reteja retadreso.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">La modifebla teksta kampo de la nomo de uzanto por komenci seancon.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">La modifebla teksta kampo de la nomo de uzanto por komenci seancon.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">La modifebla teksta kampo de la uzanto.</string>
+    <string name="saved_login_username_description_3">La modifebla teksta kampo de la uzanto.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">La modifebla teksta kampo de la pasvorto por komenci seancon.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">La modifebla teksta kampo de la pasvorto por komenci seancon.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">La modifebla teksta kampo de la pasvorto.</string>
+    <string name="saved_login_password_description_2">La modifebla teksta kampo de la pasvorto.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Konservi ŝanĝojn je komenco de seanco.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Konservi ŝanĝojn je komenco de seanco.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Konservi ŝanĝojn.</string>
+    <string name="save_changes_to_login_2">Konservi ŝanĝojn.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Modifi</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Modifi</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Modifi pasvorton</string>
+    <string name="edit_2">Modifi pasvorton</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Aldoni novan legitimilon</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Aldoni novan legitimilon</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Aldoni pasvorton</string>
+    <string name="add_login_2">Aldoni pasvorton</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Pasvorto postulata</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Pasvorto postulata</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Tajpu pasvorton</string>
+    <string name="saved_login_password_required_2">Tajpu pasvorton</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Nomo de uzanto postulata</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Nomo de uzanto postulata</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Tajpu nomon de uzanto</string>
+    <string name="saved_login_username_required_2">Tajpu nomon de uzanto</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Nomo de servilo postulata</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2194,7 +2211,7 @@
     <string name="radio_preference_info_content_description">Alklaku por havi pli da informo</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Iri supren</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Iri supren</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Fermi</string>
@@ -2235,8 +2252,6 @@
     <!-- Title for when the rating has been updated by the review checker -->
     <string name="review_quality_check_adjusted_rating_title">Alĝustigita taksado</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
-    <string name="review_quality_check_adjusted_rating_description" moz:RemovedIn="122" tools:ignore="UnusedResources">Nefidindaj recenzoj forigitaj</string>
-    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description_2">Bazita sur fidindaj recenzoj</string>
     <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
     <string name="review_quality_check_highlights_title">Elstaraĵoj el ĵusaj recenzoj</string>
@@ -2293,10 +2308,6 @@
     <string name="review_quality_check_product_availability_warning_body">Se vi vidas ke denove estas stoko de tiu ĉi produko, raportu tion kaj ni kontrolos la recenzojn.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action_2">Raporti ke denove estas stoko de tiu ĉi produkto</string>
-    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" moz:RemovedIn="122">Kvalito de recenzoj estas taksata</string>
-    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" moz:RemovedIn="122">Kvalito de recenzoj estas taksata</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. The parameter is the percentage progress (0-100%) of the analysis process (e.g. 56%). -->
     <string name="review_quality_check_analysis_in_progress_warning_title_2">Kvalito de recenzoj estas taksata (%s)</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
@@ -2343,13 +2354,19 @@
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Pli da informo</string>
 
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Se vi elektas “Jes, provi ĝin” vi akceptas la %2$s kaj %3$s de %1$s de Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="123" tools:ignore="UnusedResources">Se vi elektas “Jes, provi ĝin” vi akceptas la %2$s kaj %3$s de %1$s de Mozilla.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Se vi elektas “Jes, provi ĝin” vi akceptas la jenon el %1$s:</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Se vi elektas “Jes, provi ĝin” vi akceptas la jenon: %2$s de %1$s kaj %4$s de %3$s.</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
+    <string name="review_quality_check_contextual_onboarding_caption_4">Se vi elektas “Jes, provi ĝin” vi akceptas la jenon: %2$s de %1$s kaj %4$s de %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">politiko pri privateco</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">politiko pri privateco</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Politiko pri privateco</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy notice. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy_3">rimarko pri privateco</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">kondiĉoj de uzo</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2420,6 +2437,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Ĉu traduki ĉi tiun paĝon?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Paĝo tradukita el la %1$s en la %2$sn</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Provu privatajn tradukojn en %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2432,6 +2453,8 @@
     <string name="translations_bottom_sheet_translate_to">Traduki en</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Ne nun</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Montri originalon</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Farita</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2453,6 +2476,16 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Pli da informo</string>
 
+
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Traduko…</string>
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Ĉu elŝuti lingvon dum datumŝpara reĝimo (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Tradukaj elektebloj</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 65bc3a3e3..b33524cf0 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -2504,6 +2504,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Traduciendo…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">¿Descargar idioma en modo de ahorro de datos (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opciones de traducción</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 0c6a0ead9..c17604d02 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1549,7 +1549,7 @@
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
     <string name="preference_enhanced_tracking_protection_custom_cookies_5">Illar as cookies entre sitios</string>
     <!-- Preference for Global Privacy Control for the custom privacy settings for Global Privacy Control. '&amp;' is replaced with the ampersand symbol: &-->
-    <string name="preference_enhanced_tracking_protection_custom_global_privacy_control">Dille aos sitios web que non compartan nin vendan datos</string>
+    <string name="preference_enhanced_tracking_protection_custom_global_privacy_control">Dígalle aos sitios web que non compartan nin vendan datos</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content">Contido de rastrexo</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
@@ -1702,7 +1702,7 @@
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
     <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Os inicios de sesión que garde ou sincronice co %s aparecerán aquí.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2">Os contrasinais que gardes ou sincronices con %s listaranse aquí. Todos os contrasinais que gardas están cifrados.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Os contrasinais que garde ou sincronice con %s listaranse aquí. Todos os contrasinais que garde están cifrados.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Obteña máis información sobre Sync.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
@@ -1752,15 +1752,15 @@
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquee para ver os seus inicios de sesión gardados</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2">Desbloquea para ver os teus contrasinais gardados</string>
+    <string name="logins_biometric_prompt_message_2">Desbloquear para ver os seus contrasinais gardados</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Protexa os seus inicios de sesión e contrasinais</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2">Protexe os teus contrasinais gardados</string>
+    <string name="logins_warning_dialog_title_2">Protexa os seus contrasinais gardados</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configure un padrón de bloqueo de dispositivo, PIN ou contrasinal para protexer os accesos e contrasinais gardados de que non sexan accedidos se outra persoa ten o seu dispositivo.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2">Configura un patrón de bloqueo do dispositivo, un PIN ou un contrasinal para protexer o acceso aos teus contrasinais gardados se outra persoa ten o teu dispositivo.</string>
+    <string name="logins_warning_dialog_message_2">Configure un padrón de bloqueo do dispositivo, un PIN ou un contrasinal para protexer o acceso aos seus contrasinais gardados se outra persoa ten o seu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Máis tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1876,7 +1876,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configure un padrón de bloqueo de dispositivo, PIN ou contrasinal para evitar que outra persoa co seu dispositivo poida acceder a elas.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3">Configura un patrón de bloqueo do dispositivo, un PIN ou un contrasinal para protexer o acceso aos teus métodos de pago gardados se outra persoa ten o teu dispositivo.</string>
+    <string name="credit_cards_warning_dialog_message_3">Configure un padrón de bloqueo do dispositivo, un PIN ou un contrasinal para protexer o acceso aos seus métodos de pago gardados se outra persoa ten o seu dispositivo.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Configurar agora</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1886,7 +1886,7 @@
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
     <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Desbloquee para empregar a información almacenada de tarxetas de crédito</string>
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2">Desbloquea para usar os métodos de pago gardados</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Desbloquee para usar os métodos de pago gardados</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Engadir enderezo</string>
     <!-- Title of the "Edit address" screen -->
@@ -2321,9 +2321,9 @@
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
     <string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="123" tools:ignore="UnusedResources">Ao seleccionar «Si, probalo», acepta o seguinte de %1$s:</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
-    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Ao seleccionar &quot;Si, probalo&quot;, aceptas os %2$s de %1$s e os %4$s de %3$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption_3" moz:RemovedIn="124" tools:ignore="UnusedResources">Ao seleccionar «Si, probalo», acepta os %2$s de %1$s e os %4$s de %3$s.</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is Firefox app name, third parameter is the Fakespot product name. Second & fourth are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy_3 and review_quality_check_contextual_onboarding_terms_use. -->
-    <string name="review_quality_check_contextual_onboarding_caption_4">Ao seleccionar &quot;Si, probalo&quot;, aceptas os %2$s de %1$s e os %4$s de %3$s.</string>
+    <string name="review_quality_check_contextual_onboarding_caption_4">Ao seleccionar «Si, probalo», acepta os %2$s de %1$s e os %4$s de %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="123" tools:ignore="UnusedResources">política de privacidade</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
@@ -2408,7 +2408,7 @@
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Probe as traducións privadas en %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
-    <string name="translations_bottom_sheet_info_message">Para a túa privacidade, as traducións nunca saen do teu dispositivo. Novos idiomas e melloras en breve! %1$s</string>
+    <string name="translations_bottom_sheet_info_message">Para a súa privacidade, as traducións nunca saen do seu dispositivo. Novos idiomas e melloras en breve! %1$s</string>
     <!-- Text that links to additional information about the Firefox translations feature. -->
     <string name="translations_bottom_sheet_info_message_learn_more">Máis información</string>
     <!-- Label for the dropdown to select which language to translate from on the translations dialog. Usually the translate from language selected will be the same as the page language. -->
@@ -2455,7 +2455,7 @@
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to always offer or suggest translations when available. -->
     <string name="translation_option_bottom_sheet_always_translate">Ofrecer sempre a tradución</string>
     <!-- Toggle switch label that allows a user to set if they would like a given language to automatically translate or not. The first parameter is the language name, for example, "Spanish". -->
-    <string name="translation_option_bottom_sheet_always_translate_in_language">Traduce sempre %1$s</string>
+    <string name="translation_option_bottom_sheet_always_translate_in_language">Traducir sempre %1$s</string>
     <!-- Toggle switch label that allows a user to set if they would like to never be offered a translation of the given language. The first parameter is the language name, for example, "Spanish". -->
     <string name="translation_option_bottom_sheet_never_translate_in_language">Non traducir nunca %1$s</string>
     <!-- Toggle switch label that allows a user to set the setting if they would like the browser to never translate the site the user is currently visiting. -->
@@ -2463,7 +2463,7 @@
     <!-- Toggle switch description that will appear under the "Never translate these sites" settings toggle switch to provide more information on how this setting interacts with other settings. -->
     <string name="translation_option_bottom_sheet_switch_never_translate_site_description">Sobrescribe todas as demais configuracións</string>
     <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
-    <string name="translation_option_bottom_sheet_switch_description">Anula as ofertas para traducir</string>
+    <string name="translation_option_bottom_sheet_switch_description">Sobrescribir as ofertas para traducir</string>
     <!-- Button text for the button that will take the user to the translation settings dialog. -->
     <string name="translation_option_bottom_sheet_translation_settings">Configuración da tradución</string>
 
@@ -2476,7 +2476,7 @@
     <!-- Toggle switch label that indicates that the browser should signal or indicate when a translation is possible for any page. -->
     <string name="translation_settings_offer_to_translate">Ofrécese a traducir cando sexa posible</string>
     <!-- Toggle switch label that indicates that downloading files required for translating is permitted when using data saver mode in Android. -->
-    <string name="translation_settings_always_download">Descarga sempre os idiomas no modo de aforro de datos</string>
+    <string name="translation_settings_always_download">Descargar sempre os idiomas no modo de aforro de datos</string>
     <!-- Section header text that begins the section of a list of different options the user may select to adjust their translation preferences. -->
     <string name="translation_settings_translation_preference">Preferencias de tradución</string>
     <!-- Button text for the button that will take the user to the automatic translations settings dialog. On the automatic translations settings dialog, the user can set if translations should occur automatically for a given language. -->
@@ -2491,11 +2491,11 @@
     <string name="automatic_translation_toolbar_title_preference">Tradución automática</string>
 
     <!-- Screen header presenting the automatic translation preference feature. It will appear under the toolbar. -->
-    <string name="automatic_translation_header_preference">Selecciona un idioma para xestionar as preferencias de &quot;traducir sempre&quot; e &quot;nunca traducir&quot;.</string>
+    <string name="automatic_translation_header_preference">Seleccionar un idioma para xestionar as preferencias de «traducir sempre» e «nunca traducir».</string>
 
     <!-- Automatic translation options preference screen -->
     <!-- Preference option for offering to translate. Radio button title text.-->
-    <string name="automatic_translation_option_offer_to_translate_title_preference">Oferta para traducir (predeterminado)</string>
+    <string name="automatic_translation_option_offer_to_translate_title_preference">Ofrecer traducción (predeterminado)</string>
     <!-- Preference option for offering to translate. Radio button summary text. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="automatic_translation_option_offer_to_translate_summary_preference">%1$s ofrecerá traducir sitios neste idioma.</string>
     <!-- Preference option for always translate. Radio button title text. -->
@@ -2512,7 +2512,7 @@
     <!-- Title of the never translate site preference screen that will appear on the toolbar.-->
     <string name="never_translate_site_toolbar_title_preference">Non traducir nunca estes sitios</string>
     <!-- Screen header presenting the never translate site preference feature. It will appear under the toolbar. -->
-    <string name="never_translate_site_header_preference">Para engadir un sitio novo: visítao e selecciona &quot;Non traducir nunca este sitio&quot; no menú de tradución.</string>
+    <string name="never_translate_site_header_preference">Para engadir un sitio novo: visíteo e seleccione «Non traducir nunca este sitio» no menú de tradución.</string>
     <!-- Content description (not visible, for screen readers etc.): For a never-translated site list item that is selected.
              The first parameter is web site url (for example:"wikipedia.com") -->
     <string name="never_translate_site_item_list_content_description_preference">Retirar %1$s</string>
@@ -2528,7 +2528,7 @@
     <!-- Title of the download languages preference screen toolbar.-->
     <string name="download_languages_toolbar_title_preference">Descargar idiomas</string>
     <!-- Screen header presenting the download language preference feature. It will appear under the toolbar.The first parameter is "Learn More," a clickable text with a link. Talkback will append this to say "Double tap to open link to learn more". -->
-    <string name="download_languages_header_preference">Descarga idiomas completos para obter traducións máis rápidas e para traducir sen conexión. %1$s</string>
+    <string name="download_languages_header_preference">Descargar idiomas completos para obter traducións máis rápidas e para traducir sen conexión. %1$s</string>
     <!-- Clickable text from the screen header that links to a website. -->
     <string name="download_languages_header_learn_more_preference">Máis información</string>
     <!-- The subhead of the download language preference screen will appear above the pivot language. -->
@@ -2557,13 +2557,13 @@
     The first parameter is the name of the language, for example, "Spanish" and the second parameter is the size in kilobytes or megabytes of the language file. -->
     <string name="delete_language_file_dialog_title">Eliminar %1$s (%2$s)?</string>
     <!-- Additional information for the dialog used by the translations feature to confirm deleting a language. The first parameter is the name of the application, for example, "Fenix". -->
-    <string name="delete_language_file_dialog_message">Se eliminas este idioma, %1$s descargará idiomas parciais na túa caché mentres traduces.</string>
+    <string name="delete_language_file_dialog_message">Se elimina este idioma, %1$s descargará idiomas parciais na súa caché mentres traduce.</string>
     <!-- Title for the dialog used by the translations feature to confirm deleting all languages file.
     The dialog will be presented when the user requests deletion of all languages file.
     The first parameter is the size in kilobytes or megabytes of the language file. -->
-    <string name="delete_language_all_languages_file_dialog_title">Queres eliminar todos os idiomas (%1$s)?</string>
+    <string name="delete_language_all_languages_file_dialog_title">Eliminar todos os idiomas (%1$s)?</string>
     <!-- Additional information for the dialog used by the translations feature to confirm deleting all languages file. The first parameter is the name of the application, for example, "Fenix". -->
-    <string name="delete_language_all_languages_file_dialog_message">Se eliminas todos os idiomas, %1$s descargará linguas parciais na túa caché mentres traduces.</string>
+    <string name="delete_language_all_languages_file_dialog_message">Se elimina todos os idiomas, %1$s descargará linguas parciais na súa caché mentres traduce.</string>
     <!-- Button text on the dialog used by the translations feature to confirm deleting a language. -->
     <string name="delete_language_file_dialog_positive_button_text">Eliminar</string>
     <!-- Button text on the dialog used by the translations feature to cancel deleting a language. -->
@@ -2573,11 +2573,11 @@
     This dialog will be presented when the user attempts to download a language or perform
     a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
     The first parameter is the size in kilobytes or megabytes of the language file.-->
-    <string name="download_language_file_dialog_title">Descargar mentres estás no modo de aforro de datos (%1$s)?</string>
+    <string name="download_language_file_dialog_title">Descargar no modo de aforro de datos (%1$s)?</string>
     <!-- Additional information for the data saving mode warning dialog used by the translations feature. This text explains the reason a download is required for a translation. -->
-    <string name="download_language_file_dialog_message_all_languages">Descargamos idiomas parciais na túa caché para manter as traducións privadas.</string>
+    <string name="download_language_file_dialog_message_all_languages">Descargamos idiomas parciais na súa caché para manter as traducións privadas.</string>
     <!-- Checkbox label text on the data saving mode warning dialog used by the translations feature. This checkbox allows users to ignore the data usage warnings. -->
-    <string name="download_language_file_dialog_checkbox_text">Descarga sempre no modo de aforro de datos</string>
+    <string name="download_language_file_dialog_checkbox_text">Descargar sempre no modo de aforro de datos</string>
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file. -->
     <string name="download_language_file_dialog_positive_button_text">Descargar</string>
     <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to confirm they wish to continue and download the language file and perform a translation. -->
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 22acc1e75..69992102f 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -67,6 +67,14 @@
        Mitos umum tentang penjelajahan privat
     </string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Jangan tinggalkan jejak pada perangkat ini</string>
+    <!-- Clickable portion of the explanation for private browsing that links the user to our
+        about privacy page.
+        This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
+    <string name="felt_privacy_info_card_subtitle_link_text">Siapa saja yang bisa melihat aktivitas saya?</string>
+
     <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
     <!-- Text for the Private mode shortcut CFR message for adding a private mode shortcut to open private tabs from the Home screen -->
     <string name="private_mode_cfr_message_2">Luncurkan tab pribadi Anda berikutnya dengan sekali ketuk.</string>
@@ -192,6 +200,8 @@
     <string name="resync_button_content_description">Sinkron ulang</string>
     <!-- Browser menu button that opens the find in page menu -->
     <string name="browser_menu_find_in_page">Temukan di laman</string>
+    <!-- Browser menu button that opens the translations dialog, which has options to translate the current browser page. -->
+    <string name="browser_menu_translations">Terjemahkan laman</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">Simpan ke koleksi</string>
     <!-- Browser menu button that open a share menu to share the current site -->
@@ -224,10 +234,15 @@
 
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Ubahsuai halaman beranda</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Layar beranda</string>
 
+    <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
+         history and go back to the home screen. -->
+    <string name="browser_toolbar_erase">Hapus riwayat penjelajahan</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Bahasa yang dipilih</string>
@@ -239,8 +254,6 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Pindai</string>
-    <!-- Button in the search view that lets a user change their search engine -->
-    <string name="search_engine_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Mesin pencari</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Setelan mesin pencari</string>
 
@@ -297,49 +310,35 @@
     <!-- Notification pre-permission dialog -->
     <!-- Enable notification pre permission dialog title
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_title">Notifikasi membantu Anda lakukan lebih banyak hal dengan %s</string>
+    <string name="onboarding_home_enable_notifications_title" moz:removedIn="124" tools:ignore="UnusedResources">Notifikasi membantu Anda lakukan lebih banyak hal dengan %s</string>
     <!-- Enable notification pre permission dialog description with rationale
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="onboarding_home_enable_notifications_description">Sinkronkan tab Anda antar perangkat, kelola unduhan, dapatkan kiat tentang memanfaatkan perlindungan privasi %s, dan banyak lagi.</string>
+    <string name="onboarding_home_enable_notifications_description" moz:removedIn="124" tools:ignore="UnusedResources">Sinkronkan tab Anda antar perangkat, kelola unduhan, dapatkan kiat tentang memanfaatkan perlindungan privasi %s, dan banyak lagi.</string>
     <!-- Text for the button to request notification permission on the device -->
-    <string name="onboarding_home_enable_notifications_positive_button">Lanjutkan</string>
+    <string name="onboarding_home_enable_notifications_positive_button" moz:removedIn="124" tools:ignore="UnusedResources">Lanjutkan</string>
     <!-- Text for the button to not request notification permission on the device and dismiss the dialog -->
-    <string name="onboarding_home_enable_notifications_negative_button">Jangan sekarang</string>
-
-    <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-        Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_title_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Jadikan Firefox sebagai peramban pilihan Anda</string>
-    <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-        Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_description_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Firefox mengutamakan masyarakat daripada laba dan membela privasi Anda dengan memblokir pelacak lintas situs.\n\n\nPelajari lebih lanjut dalam kebijakan privasi kami.</string>
+    <string name="onboarding_home_enable_notifications_negative_button" moz:removedIn="124" tools:ignore="UnusedResources">Jangan sekarang</string>
+
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
-    <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">kebijakan privasi</string>
+    <string name="juno_onboarding_default_browser_description_link_text" moz:RemovedIn="124" tools:ignore="UnusedResources">kebijakan privasi</string>
     <!-- Text for the button to set firefox as default browser on the device -->
     <string name="juno_onboarding_default_browser_positive_button" tools:ignore="UnusedResources">Setel sebagai peramban baku</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_default_browser_negative_button" tools:ignore="UnusedResources">Jangan sekarang</string>
-    <!-- Title for sign in to sync screen. -->
-    <string name="juno_onboarding_sign_in_title" moz:removedIn="120" tools:ignore="UnusedResources">Berpindah dari ponsel ke laptop  dan sebaliknya</string>
-    <!-- Description for sign in to sync screen. -->
-    <string name="juno_onboarding_sign_in_description" moz:removedIn="120" tools:ignore="UnusedResources">Bawa tab dan kata sandi Anda dari perangkat lain untuk meneruskan jelajah terakhir.</string>
     <!-- Text for the button to sign in to sync on the device -->
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Masuk</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Jangan sekarang</string>
-    <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-        Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_enable_notifications_title_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Notifikasi membantu Anda lakukan lebih banyak hal dengan Firefox</string>
 
-    <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
-       Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_enable_notifications_description_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Kirim tab antar perangkat, kelola unduhan, dan dapatkan kiat terbaik menggunakan Firefox.</string>
     <!-- Text for the button to request notification permission on the device -->
     <string name="juno_onboarding_enable_notifications_positive_button" tools:ignore="UnusedResources">Aktifkan notifikasi</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Jangan sekarang</string>
 
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Jangan sekarang</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. The first parameter is the name of the application.-->
     <string name="search_widget_content_description_2">Buka di tab %1$s baru</string>
@@ -360,8 +359,6 @@
     <string name="preferences_category_about">Tentang</string>
     <!-- Preference category for settings related to changing the default search engine -->
     <string name="preferences_category_select_default_search_engine">Pilih satu</string>
-    <!-- Preference for settings related to managing search shortcuts for the quick search menu -->
-    <string name="preferences_manage_search_shortcuts" moz:removedIn="120" tools:ignore="UnusedResources">Kelola pintasan pencarian</string>
     <!-- Summary for preference for settings related to managing search shortcuts for the quick search menu -->
     <string name="preferences_manage_search_shortcuts_summary">Sunting mesin peramban terlihat di menu pencarian</string>
     <!-- Preference category for settings related to managing search shortcuts for the quick search menu -->
@@ -370,8 +367,8 @@
     <string name="preferences_default_search_engine">Mesin pencari baku</string>
     <!-- Preference for settings related to Search -->
     <string name="preferences_search">Cari</string>
-    <!-- Preference for settings related to Search address bar -->
-    <string name="preferences_search_address_bar" moz:removedIn="120" tools:ignore="UnusedResources">Bilah alamat</string>
+    <!-- Preference for settings related to Search engines -->
+    <string name="preferences_search_engines">Mesin pencari</string>
     <!-- Preference link to rating Fenix on the Play Store -->
     <string name="preferences_rate">Beri nilai di Google Play</string>
     <!-- Preference linking to about page for Fenix
@@ -400,19 +397,9 @@
     <!-- Preference for enabling "HTTPS-Only" mode -->
     <string name="preferences_https_only_title">Mode Hanya HTTPS</string>
 
-    <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
-    <string name="preferences_cookie_banner_reduction" moz:RemovedIn="121" tools:ignore="UnusedResources">Pengurangan Spanduk Kuki</string>
     <!-- Label for cookie banner section in quick settings panel. -->
     <string name="cookie_banner_blocker">Pemblokir Spanduk Kuki</string>
-    <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option" moz:RemovedIn="121" tools:ignore="UnusedResources">Kurangi spanduk kuki</string>
-    <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
-    <string name="reduce_cookie_banner_option_off" moz:RemovedIn="121" tools:ignore="UnusedResources">Nonaktif</string>
-    <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
-    <string name="reduce_cookie_banner_option_on" moz:RemovedIn="121" tools:ignore="UnusedResources">Aktif</string>
-
-    <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s secara otomatis coba menolak permintaan kuki di spanduk kuki.</string>
+
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">Nonaktif untuk situs ini</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -430,28 +417,8 @@
     <string name="reduce_cookie_banner_unsupported_site_request_submitted_2">Permintaan dukungan terkirim</string>
     <!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_unsupported_site">Saat ini, situs tidak didukung</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_on_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Aktifkan Pengurangan Spanduk Kuki untuk %1$s?</string>
-    <!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
-    <string name="reduce_cookie_banner_details_panel_title_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">Nonaktifkan Pengurangan Spanduk Kuki untuk %1$s?</string>
     <!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
     <string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2">%1$s tidak dapat secara otomatis menolak permintaan kuki di situs ini. Anda dapat mengirimkan permintaan dukungan untuk situs ini di masa mendatang.</string>
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_off_for_site" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s akan menghapus kuki situs ini dan menyegarkan laman ini. Membersihkan semua kuki dapat membuat Anda keluar dari suatu situs atau mengosongkan keranjang belanja.</string>
-
-    <!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_details_panel_description_on_for_site_2" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s mencoba secara otomatis menolak semua permintaan kuki di situs yang didukung.</string>
-    <!-- Title text for the cookie banner re-engagement dialog. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_title" moz:RemovedIn="121" tools:ignore="UnusedResources">Izinkan %1$s untuk menolak spanduk kuki?</string>
-    <!-- Body text for the cookie banner re-engagement dialog use. The first parameter is the application name. -->
-    <string name="reduce_cookie_banner_dialog_body" moz:RemovedIn="121" tools:ignore="UnusedResources">%1$s dapat menolak permintaan spanduk kuki secara otomatis.</string>
-    <!-- Remind me later text button for the onboarding dialog -->
-    <string name="reduce_cookie_banner_dialog_not_now_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Jangan sekarang</string>
-    <!-- Snack text for the cookie banner dialog, after user hit the dismiss banner button -->
-    <string name="reduce_cookie_banner_dialog_snackbar_text" moz:RemovedIn="121" tools:ignore="UnusedResources">Anda akan melihat lebih sedikit permintaan kuki</string>
-
-    <!-- Change setting text button, for the cookie banner re-engagement dialog -->
-    <string name="reduce_cookie_banner_dialog_change_setting_button" moz:RemovedIn="121" tools:ignore="UnusedResources">Izinkan</string>
 
     <!-- Description of the preference to enable "HTTPS-Only" mode. -->
     <string name="preferences_https_only_summary">Secara otomatis mencoba terhubung ke situs menggunakan protokol enkripsi HTTPS untuk meningkatkan keamanan.</string>
@@ -475,12 +442,8 @@
     <string name="errorpage_httpsonly_message_summary">Namun, ada juga kemungkinan seorang penyerang terlibat. Jika melanjutkan ke situs web, Anda tidak boleh memasukkan info sensitif apa pun. Jika dilanjutkan, mode Hanya HTTPS akan dinonaktifkan sementara untuk situs ini.</string>
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Aksesibilitas</string>
-    <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Penyedia Firefox Account khusus</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Penyedia Sync khusus</string>
-    <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Penyedia Firefox Account/Sync dimodifikasi. Keluar dari aplikasi untuk menerapkan pengubahan…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Akun</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -496,7 +459,7 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Masuk untuk menyinkronkan tab, markah, sandi, dan yang lainnya.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox Account</string>
+    <string name="preferences_account_default_name_2">Akun Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Hubungkan kembali untuk melanjutkan sinkronisasi</string>
     <!-- Preference for language -->
@@ -507,8 +470,6 @@
     <string name="preferences_data_collection">Pengumpulan data</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Pengawakutuan jarak jauh melalui USB</string>
-    <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Tampilkan mesin pencari</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Tampilkan saran pencarian</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -528,6 +489,13 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">URL lengkapi-otomatis</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Saran dari sponsor</string>
+    <!-- Preference title for switch preference to show Firefox Suggest search suggestions for web content.
+         The first parameter is the name of the application. -->
+    <string name="preferences_show_nonsponsored_suggestions">Saran dari %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Dapatkan rekomendasi dari web yang terkait dengan pencarian Anda</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Buka tautan di aplikasi</string>
 
@@ -548,6 +516,8 @@
     <!-- Preference for add_ons -->
     <string name="preferences_addons">Pengaya</string>
 
+    <!-- Preference for installing a local add-on -->
+    <string name="preferences_install_local_addon">Pasang pengaya dari berkas</string>
     <!-- Preference for notifications -->
     <string name="preferences_notifications">Notifikasi</string>
 
@@ -608,6 +578,12 @@
 
     <!-- Text for classic wallpapers title. The first parameter is the Firefox name. -->
     <string name="wallpaper_classic_title">%s Klasik</string>
+    <!-- Text for artist series wallpapers title. "Artist series" represents a collection of artist collaborated wallpapers. -->
+    <string name="wallpaper_artist_series_title">Karya seniman</string>
+    <!-- Description text for the artist series wallpapers with learn more link. The first parameter is the learn more string defined in wallpaper_learn_more. "Independent voices" is the name of the wallpaper collection -->
+    <string name="wallpaper_artist_series_description_with_learn_more">Koleksi Suara Independen. %s</string>
+    <!-- Description text for the artist series wallpapers. "Independent voices" is the name of the wallpaper collection -->
+    <string name="wallpaper_artist_series_description">Koleksi Suara Independen.</string>
     <!-- Wallpaper onboarding dialog header text. -->
     <string name="wallpapers_onboarding_dialog_title_text">Coba berbagai ragam warna</string>
     <!-- Wallpaper onboarding dialog body text. -->
@@ -615,15 +591,25 @@
     <!-- Wallpaper onboarding dialog learn more button text. The button navigates to the wallpaper settings screen. -->
     <string name="wallpapers_onboarding_dialog_explore_more_button_text">Telusuri lebih banyak wallpaper</string>
 
-    <!-- Add-on Installation from AMO-->
-    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Pengaya tidak didukung</string>
-    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Pengaya telah didukung</string>
+    <!-- Add-ons general availability nimbus message-->
+    <!-- Title of the Nimbus message for add-ons general availability-->
+    <string name="addon_ga_message_title" tools:ignore="UnusedResources">Pengaya baru kini tersedia</string>
+    <!-- Button text of the Nimbus message for add-ons general availability. -->
+    <string name="addon_ga_message_button" tools:ignore="UnusedResources">Jelajahi pengaya</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Pengaya dinonaktifkan sementara</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Coba mulai ulang pengaya</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Lanjutkan dengan pengaya yang dinonaktifkan</string>
 
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Kelola akun</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Ubah sandi Anda, kelola pengumpulan data, atau hapus akun Anda</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sinkronkan sekarang</string>
     <!-- Preference category for sync -->
@@ -633,7 +619,7 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Markah</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Info Masuk</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Info Masuk</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Tab terbuka</string>
     <!-- Preference for signing out -->
@@ -660,7 +646,7 @@
     <string name="default_device_name_2">%1$s dalam %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Kartu kredit</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kartu kredit</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Alamat</string>
 
@@ -1202,7 +1188,7 @@
     <!-- Text for standard error snackbar dismiss button. -->
     <string name="standard_snackbar_error_dismiss">Tutup</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Gagal mencetak</string>
+    <string name="unable_to_print_page_error">Gagal mencetak laman ini</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Cetak</string>
     <!-- Sub-header in the dialog to share a link to another sync device -->
@@ -1247,6 +1233,7 @@
     <!-- Notifications -->
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">Tutup tab privat</string>
+
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">Pemasaran</string>
 
@@ -1300,6 +1287,8 @@
     <string name="snackbar_private_tab_closed">Tab pribadi ditutup</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Tab pribadi ditutup</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Data penjelajahan pribadi telah dihapus</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">URUNGKAN</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -1345,10 +1334,15 @@
     <string name="preferences_delete_browsing_data_tabs_title_2">Tab terbuka</string>
     <!-- Subtitle for the tabs item in Delete browsing data, parameter will be replaced with the number of open tabs -->
     <string name="preferences_delete_browsing_data_tabs_subtitle">%d tab</string>
+    <!-- Title for the data and history items in Delete browsing data -->
+    <!-- Title for the history item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_browsing_history_title">Riwayat peramban</string>
     <!-- Subtitle for the data and history items in delete browsing data, parameter will be replaced with the
         number of history items the user has -->
     <string name="preferences_delete_browsing_data_browsing_data_subtitle">%d alamat situs</string>
 
+    <!-- Title for the cookies and site data items in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cookies_and_site_data">Kuki dan data situs</string>
     <!-- Subtitle for the cookies item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cookies_subtitle">Anda\ akan keluar dari sebagian besar situs</string>
     <!-- Title for the cached images and files item in Delete browsing data -->
@@ -1594,9 +1588,9 @@
     <string name="add_to_homescreen_description_2">Anda dapat dengan mudah menambahkan situs web ini ke layar Beranda perangkat Anda untuk mendapatkan akses instan dan penjelajahan lebih cepat seperti menggunakan aplikasi.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Info masuk dan kata sandi</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Info masuk dan kata sandi</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Simpan info masuk dan kata sandi</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Simpan info masuk dan kata sandi</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Minta untuk menyimpan</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1611,28 +1605,28 @@
     <string name="preferences_android_autofill_description">Isi nama pengguna dan sandi di aplikasi lain pada perangkat Anda.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Tambahkan log masuk</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Tambahkan log masuk</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sinkronkan info masuk</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sinkronkan info masuk</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sinkronkan log masuk antar perangkat</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sinkronkan log masuk antar perangkat</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Info masuk tersimpan</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Info masuk tersimpan</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Info masuk yang Anda simpan atau sinkronkan ke %s akan ditampilkan di sini.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Info masuk yang Anda simpan atau sinkronkan ke %s akan ditampilkan di sini.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Pelajari lebih lanjut mengenai Sinkronisasi.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Pelajari lebih lanjut mengenai Sinkronisasi.</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Kekecualian</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Info masuk dan kata sandi yang tidak disimpan akan ditampilkan di sini.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Info masuk dan kata sandi yang tidak disimpan akan ditampilkan di sini.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Info masuk dan kata sandi tidak akan disimpan untuk situs-situs ini.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Info masuk dan kata sandi tidak akan disimpan untuk situs-situs ini.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Hapus semua pengecualian</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Cari log masuk</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Cari log masuk</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Situs</string>
     <!-- The header for the username for a login -->
@@ -1660,11 +1654,11 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Sembunyikan sandi</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Buka kunci untuk melihat info masuk Anda yang tersimpan</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Buka kunci untuk melihat info masuk Anda yang tersimpan</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Amankan info masuk dan kata sandi Anda</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Amankan info masuk dan kata sandi Anda</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Atur pola, PIN, atau kata sandi kunci perangkat untuk melindungi info masuk dan kata sandi Anda yang tersimpan agar tidak diakses jika orang lain memiliki perangkat Anda.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Atur pola, PIN, atau kata sandi kunci perangkat untuk melindungi info masuk dan kata sandi Anda yang tersimpan agar tidak diakses jika orang lain memiliki perangkat Anda.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Nanti</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1681,7 +1675,7 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Terakhir digunakan</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sortir menu info masuk</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Sortir menu info masuk</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1689,27 +1683,27 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Alamat</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Kartu kredit</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kartu kredit</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Simpan dan isi otomatis kartu</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Simpan dan isi otomatis kartu</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data terenkripsi</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Data terenkripsi</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sinkronisasi kartu antar perangkat</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Sinkronkan kartu</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Tambahkan kartu kredit</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Tambahkan kartu kredit</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Kelola kartu tersimpan</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Kelola kartu tersimpan</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Tambahkan alamat</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Kelola alamat</string>
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Simpan dan isi otomatis alamat</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Simpan dan isi otomatis alamat</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Sertakan informasi seperti nomor, alamat surel dan pengiriman</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Sertakan informasi seperti nomor, alamat surel dan pengiriman</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Tambah kartu</string>
@@ -1730,7 +1724,7 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Hapus kartu</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Apakah Anda yakin ingin menghapus kartu kredit ini?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Apakah Anda yakin ingin menghapus kartu kredit ini?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Hapus</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1742,15 +1736,15 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Kartu tersimpan</string>
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Masukkan nomor kartu kredit yang sah</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Masukkan nomor kartu kredit yang sah</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Silahkan isi kolom ini</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Silahkan isi kolom ini</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Buka kunci untuk melihat kartu yang Anda simpan</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Amankan kartu kredit Anda</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Amankan kartu kredit Anda</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Atur pola, PIN, atau kata sandi kunci perangkat untuk melindungi kartu kredit Anda yang tersimpan agar tidak diakses jika orang lain memiliki perangkat Anda.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Atur pola, PIN, atau kata sandi kunci perangkat untuk melindungi kartu kredit Anda yang tersimpan agar tidak diakses jika orang lain memiliki perangkat Anda.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Atur sekarang</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1759,7 +1753,7 @@
     <string name="credit_cards_biometric_prompt_message_pin">Buka perangkat Anda</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Buka kunci untuk menggunakan informasi kartu kredit tersimpan</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Buka kunci untuk menggunakan informasi kartu kredit tersimpan</string>
 
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Tambahkan alamat</string>
@@ -1768,11 +1762,11 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Kelola alamat</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Nama Depan</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Nama Depan</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Nama Tengah</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Nama Tengah</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Nama Belakang</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Nama Belakang</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Jalan</string>
     <!-- The header for the city of an address -->
@@ -1797,7 +1791,7 @@
     <string name="addressess_delete_address_button">Hapus alamat</string>
 
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Yakin ingin menghapus alamat ini?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Yakin ingin menghapus alamat ini?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Hapus</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -1813,28 +1807,18 @@
     <string name="search_engine_add_custom_search_engine_button_content_description">Tambah mesin pencari baru</string>
     <!-- Title of the Edit search engine screen -->
     <string name="search_engine_edit_custom_search_engine_title">Ubah mesin pencari</string>
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
-    <string name="search_engine_add_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Tambah</string>
-    <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Simpan</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Ubah</string>
     <!-- Text for the menu button to delete a search engine -->
     <string name="search_engine_delete">Hapus</string>
 
-    <!-- Text for the button to create a custom search engine on the Add search engine screen -->
-    <string name="search_add_custom_engine_label_other" moz:RemovedIn="120" tools:ignore="UnusedResources">Lainnya</string>
     <!-- Label for the TextField in which user enters custom search engine name -->
     <string name="search_add_custom_engine_name_label">Nama</string>
-    <!-- Placeholder text shown in the Search Engine Name TextField before a user enters text -->
-    <string name="search_add_custom_engine_name_hint" moz:RemovedIn="120" tools:ignore="UnusedResources">Nama</string>
     <!-- Placeholder text shown in the Search Engine Name text field before a user enters text -->
     <string name="search_add_custom_engine_name_hint_2">Nama mesin pencari</string>
     <!-- Label for the TextField in which user enters custom search engine URL -->
     <string name="search_add_custom_engine_url_label">URL string pencarian</string>
     <!-- Placeholder text shown in the Search String TextField before a user enters text -->
-    <string name="search_add_custom_engine_search_string_hint" moz:RemovedIn="120" tools:ignore="UnusedResources">String pencarian untuk digunakan</string>
-    <!-- Placeholder text shown in the Search String TextField before a user enters text -->
     <string name="search_add_custom_engine_search_string_hint_2">URL yang digunakan untuk pencarian</string>
     <!-- Description text for the Search String TextField. The %s is part of the string -->
     <string name="search_add_custom_engine_search_string_example" formatted="false">Ganti kueir dengan “%s”. Contoh:\nhttps://www.google.com/search?q=%s</string>
@@ -1903,29 +1887,29 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Ubah</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Yakin ingin menghapus info masuk ini?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Yakin ingin menghapus info masuk ini?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Hapus</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Batal</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Opsi info masuk</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Opsi info masuk</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Bidang teks yang dapat diubah untuk alamat web info masuk</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Bidang teks yang dapat diubah untuk alamat web info masuk</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Bidang teks yang dapat diubah untuk nama pengguna info masuk</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Bidang teks yang dapat diubah untuk nama pengguna info masuk</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Bidang teks yang dapat diubah untuk kata sandi info masuk</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Bidang teks yang dapat diubah untuk kata sandi info masuk</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Simpan perubahan untuk masuk</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Simpan perubahan untuk masuk</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Ubah</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Ubah</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Tambahkan log masuk baru</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Tambahkan log masuk baru</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Kata sandi diperlukan</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Kata sandi diperlukan</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Nama pengguna diperlukan</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Nama pengguna diperlukan</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Nama host diperlukan</string>
     <!-- Voice search button content description  -->
@@ -2023,7 +2007,7 @@
     <!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
     <string name="other_default_search_engine_suggestion_header">Pencarian %s</string>
 
-    <!-- Default browser experiment -->
+    <!-- Default browser card text -->
     <string name="default_browser_experiment_card_text">Setel tautan dari situs web, surel, dan pesan untuk secara otomatis dibuka di Firefox.</string>
 
     <!-- Content description for close button in collection placeholder. -->
@@ -2033,7 +2017,7 @@
     <string name="radio_preference_info_content_description">Klik untuk lebih jelasnya</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Arahkan ke atas</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Arahkan ke atas</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Tutup</string>
@@ -2071,4 +2055,8 @@
     <string name="a11y_action_label_read_article">baca artikel</string>
     <!-- Action label for links to the Firefox Pocket website. Talkback will append this to say "Double tap to open link to learn more". -->
     <string name="a11y_action_label_pocket_learn_more">buka tautan untuk mempelajari lebih lanjut</string>
+
+    <!-- Translations feature-->
+
+
     </resources>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 8975bc760..9a5f4cae1 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -336,7 +336,7 @@
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Meðferð persónuupplýsinga í Firefox</string>
     <!-- Description for learning more about our privacy notice. -->
-    <string name="juno_onboarding_privacy_notice_text_2" tools:ignore="UnusedResources">Sjáðu nánar í persónuverndaryfirlýsingu okkar</string>
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Sjáðu nánar í persónuverndaryfirlýsingu okkar</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Við fáum kikk út úr því að halda þér öruggum</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments.
@@ -2462,6 +2462,13 @@
     <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
     <string name="translation_in_progress_snackbar">Þýðing…</string>
 
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Sækja tungumál á meðan verið er í gagnasparnaðarham (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Valkostir þýðinga</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 2f77186c2..2b8a1d015 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -356,6 +356,8 @@
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">1 億人以上の人が、非営利団体が支援するブラウザーを選択してプライバシーを保護しています。</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">既知のトラッカーが自動的にブロックされます。700 個すべての拡張機能を試せます。PDF は内蔵のリーダーで管理が簡単になります。</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">非営利で作られた私たちのブラウザーは、企業によるウェブ上の密かな追跡を阻止するのに役立ちます。\n\n詳細はプライバシー通知をご覧ください。</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -2652,7 +2654,7 @@
     <!-- The active tab count category in the tab count section in Tab Tools. -->
     <string name="debug_drawer_tab_tools_tab_count_normal">使用中</string>
     <!-- The inactive tab count category in the tab count section in Tab Tools. -->
-    <string name="debug_drawer_tab_tools_tab_count_inactive">未使用</string>
+    <string name="debug_drawer_tab_tools_tab_count_inactive">休止中</string>
     <!-- The private tab count category in the tab count section in Tab Tools. -->
     <string name="debug_drawer_tab_tools_tab_count_private">プライベート</string>
     <!-- The total tab count category in the tab count section in Tab Tools. -->
@@ -2664,7 +2666,7 @@
     <!-- The button text to add tabs to the active tab group in the tab creation tool. -->
     <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_active">使用中のタブに追加</string>
     <!-- The button text to add tabs to the inactive tab group in the tab creation tool. -->
-    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_inactive">未使用のタブに追加</string>
+    <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_inactive">休止中のタブに追加</string>
     <!-- The button text to add tabs to the private tab group in the tab creation tool. -->
     <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_private">プライベートタブに追加</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ae67905ff..3af775459 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -255,6 +255,11 @@
     <!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
     <string name="browser_toolbar_translate">Przetłumacz stronę</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for the translate page toolbar button that opens the translations dialog when the page is translated successfully.
+         The first parameter is the name of the language that is displayed in the original page. (For example: English)
+         The second parameter is the name of the language which the page was translated to. (For example: French) -->
+    <string name="browser_toolbar_translated_successfully">Język oryginalnej strony: %1$s, język tłumaczenia: %2$s.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Wybrany język</string>
@@ -332,12 +337,22 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Description for learning more about our privacy notice. -->
     <string name="juno_onboarding_privacy_notice_text">Zasady ochrony prywatności Firefoksa</string>
-    <!-- Text for the button to set firefox as default browser on the device -->
+    <!-- Description for learning more about our privacy notice. -->
+    <string name="juno_onboarding_privacy_notice_text_2" moz:removedIn="125" tools:ignore="UnusedResources">Więcej informacji znajdziesz w naszych zasadach ochrony prywatności</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Uwielbiamy zapewniać Ci bezpieczeństwo</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_default_browser_title_nimbus_3" tools:ignore="UnusedResources">Dowiedz się, dlaczego miliony kochają Firefoksa</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_4" tools:ignore="UnusedResources">Bezpieczne przeglądanie i większy wybór</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_3">Nasza przeglądarka wspierana przez organizację non-profit pomaga powstrzymywać firmy przed potajemnym śledzeniem Cię w Internecie.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_4" tools:ignore="UnusedResources">Ponad 100 milionów osób chroni swoją prywatność, wybierając przeglądarkę wspieraną przez organizację non-profit.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_5" tools:ignore="UnusedResources">Znane elementy śledzące? Blokowane automatycznie. Rozszerzenia? Wypróbuj wszystkie 700. PDF-y? Nasz wbudowany czytnik ułatwia zarządzanie nimi.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_description_nimbus_2" moz:RemovedIn="124" tools:ignore="UnusedResources">Nasza przeglądarka wspierana przez organizację non-profit pomaga powstrzymywać firmy przed potajemnym śledzeniem Cię w Internecie.\n\nWięcej informacji znajdziesz w naszych zasadach ochrony prywatności.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
@@ -695,9 +710,9 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Zakładki</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Dane logowania</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Dane logowania</string>
     <!-- Preference for syncing passwords -->
-    <string name="preferences_sync_logins_2" tools:ignore="UnusedResources">Hasła</string>
+    <string name="preferences_sync_logins_2">Hasła</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">Otwarte karty</string>
     <!-- Preference for signing out -->
@@ -725,9 +740,9 @@
     <string name="default_device_name_2">%1$s na urządzeniu %2$s %3$s</string>
 
     <!-- Preference for syncing credit cards -->
-    <string name="preferences_sync_credit_cards">Karty płatnicze</string>
+    <string name="preferences_sync_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Karty płatnicze</string>
     <!-- Preference for syncing payment methods -->
-    <string name="preferences_sync_credit_cards_2" tools:ignore="UnusedResources">Metody płatności</string>
+    <string name="preferences_sync_credit_cards_2">Metody płatności</string>
     <!-- Preference for syncing addresses -->
     <string name="preferences_sync_address">Adresy</string>
 
@@ -1672,13 +1687,13 @@
     <string name="add_to_homescreen_description_2">Można łatwo dodać tę stronę do ekranu głównego urządzenia, aby mieć do niej bezpośredni dostęp i używać jej jak aplikację.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Dane logowania i hasła</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Dane logowania i hasła</string>
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords_2" tools:ignore="UnusedResources">Hasła</string>
+    <string name="preferences_passwords_logins_and_passwords_2">Hasła</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Zachowywanie danych logowania i haseł</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Zachowywanie danych logowania i haseł</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_2" tools:ignore="UnusedResources">Zachowywanie haseł</string>
+    <string name="preferences_passwords_save_logins_2">Zachowywanie haseł</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Pytanie o zachowanie</string>
     <!-- Preference option for never saving passwords in Fenix -->
@@ -1693,47 +1708,47 @@
     <string name="preferences_android_autofill_description">Wypełnia nazwy użytkowników i hasła w innych aplikacjach na urządzeniu.</string>
 
     <!-- Preference option for adding a login -->
-    <string name="preferences_logins_add_login">Dodaj dane logowania</string>
+    <string name="preferences_logins_add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Dodaj dane logowania</string>
 
     <!-- Preference option for adding a password -->
-    <string name="preferences_logins_add_login_2" tools:ignore="UnusedResources">Dodaj hasło</string>
+    <string name="preferences_logins_add_login_2">Dodaj hasło</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Synchronizowanie danych logowania</string>
     <!-- Preference for syncing saved passwords in Fenix -->
-    <string name="preferences_passwords_sync_logins_2" tools:ignore="UnusedResources">Synchronizowanie haseł</string>
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Synchronizowanie danych logowania</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins_2">Synchronizowanie haseł</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Synchronizuj dane logowania między urządzeniami</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Synchronizuj dane logowania między urządzeniami</string>
     <!-- Preference for syncing saved passwords in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices_2" tools:ignore="UnusedResources">Synchronizuj hasła między urządzeniami</string>
+    <string name="preferences_passwords_sync_logins_across_devices_2">Synchronizuj hasła między urządzeniami</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Zachowane dane logowania</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Zachowane dane logowania</string>
     <!-- Preference to access list of saved passwords -->
-    <string name="preferences_passwords_saved_logins_2" tools:ignore="UnusedResources">Zachowane hasła</string>
+    <string name="preferences_passwords_saved_logins_2">Zachowane hasła</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Zachowane lub synchronizowane z przeglądarką %s dane logowania będą wyświetlane w tym miejscu.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Zachowane lub synchronizowane z przeglądarką %s dane logowania będą wyświetlane w tym miejscu.</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text_2" tools:ignore="UnusedResources">Tutaj będą wyświetlane hasła zachowane lub synchronizowane w przeglądarce %s. Wszystkie zachowywane hasła są zaszyfrowane.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text_2">Tutaj będą wyświetlane hasła zachowane lub synchronizowane w przeglądarce %s. Wszystkie zachowywane hasła są zaszyfrowane.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Więcej informacji o synchronizacji.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Więcej informacji o synchronizacji.</string>
     <!-- Clickable text for opening an external link for more information about Sync. -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2" tools:ignore="UnusedResources">Więcej informacji o synchronizacji</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link_2">Więcej informacji o synchronizacji</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Wyjątki</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Tutaj będą wyświetlane dane logowania i hasła, które nie będą zachowywane.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Tutaj będą wyświetlane dane logowania i hasła, które nie będą zachowywane.</string>
     <!-- Empty description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_empty_2" tools:ignore="UnusedResources">%s nie będzie zachowywać haseł do wymienionych tutaj witryn.</string>
+    <string name="preferences_passwords_exceptions_description_empty_2">%s nie będzie zachowywać haseł do wymienionych tutaj witryn.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Dane logowania i hasła dla tych witryn nie będą zachowywane.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Dane logowania i hasła dla tych witryn nie będą zachowywane.</string>
     <!-- Description of list of login exceptions that we never save passwords for. Parameter will be replaced by app name. -->
-    <string name="preferences_passwords_exceptions_description_2" tools:ignore="UnusedResources">%s nie będzie zachowywać haseł do tych witryn.</string>
+    <string name="preferences_passwords_exceptions_description_2">%s nie będzie zachowywać haseł do tych witryn.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Usuń wszystkie wyjątki</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Szukaj danych logowania</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Szukaj danych logowania</string>
     <!-- Hint for search box in passwords list -->
-    <string name="preferences_passwords_saved_logins_search_2" tools:ignore="UnusedResources">Szukaj haseł</string>
+    <string name="preferences_passwords_saved_logins_search_2">Szukaj haseł</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Witryna</string>
     <!-- The header for the username for a login -->
@@ -1761,17 +1776,17 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Ukryj hasło</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Odblokuj, aby wyświetlić zachowane dane logowania</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Odblokuj, aby wyświetlić zachowane dane logowania</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their passwords -->
-    <string name="logins_biometric_prompt_message_2" tools:ignore="UnusedResources">Odblokuj, aby wyświetlić zachowane hasła</string>
+    <string name="logins_biometric_prompt_message_2">Odblokuj, aby wyświetlić zachowane hasła</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Zabezpiecz dane logowania i hasła</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Zabezpiecz dane logowania i hasła</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title_2" tools:ignore="UnusedResources">Zabezpiecz zachowane hasła</string>
+    <string name="logins_warning_dialog_title_2">Zabezpiecz zachowane hasła</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Skonfiguruj wzór blokady, kod PIN lub hasło, aby ochronić zachowane dane logowania i hasła w przypadku, gdy ktoś inny uzyska dostęp do urządzenia.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Skonfiguruj wzór blokady, kod PIN lub hasło, aby ochronić zachowane dane logowania i hasła w przypadku, gdy ktoś inny uzyska dostęp do urządzenia.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message_2" tools:ignore="UnusedResources">Skonfiguruj wzór blokady, kod PIN lub hasło, aby ochronić zachowane hasła w przypadku, gdy ktoś inny uzyska dostęp do urządzenia.</string>
+    <string name="logins_warning_dialog_message_2">Skonfiguruj wzór blokady, kod PIN lub hasło, aby ochronić zachowane hasła w przypadku, gdy ktoś inny uzyska dostęp do urządzenia.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Później</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1788,10 +1803,10 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Ostatnie użycie</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menu sortowania danych logowania</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Menu sortowania danych logowania</string>
 
     <!-- Content description (not visible, for screen readers etc.) -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2" tools:ignore="UnusedResources">Menu sortowania haseł</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description_2">Menu sortowania haseł</string>
 
     <!-- Autofill -->
     <!-- Preference and title for managing the autofill settings -->
@@ -1799,45 +1814,45 @@
     <!-- Preference and title for managing the settings for addresses -->
     <string name="preferences_addresses">Adresy</string>
     <!-- Preference and title for managing the settings for credit cards -->
-    <string name="preferences_credit_cards">Karty płatnicze</string>
+    <string name="preferences_credit_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Karty płatnicze</string>
 
     <!-- Preference and title for managing the settings for payment methods -->
-    <string name="preferences_credit_cards_2" tools:ignore="UnusedResources">Metody płatności</string>
+    <string name="preferences_credit_cards_2">Metody płatności</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards">Zachowywanie i automatyczne wypełnianie kart</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Zachowywanie i automatyczne wypełnianie kart</string>
     <!-- Preference for saving and autofilling credit cards -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_2" tools:ignore="UnusedResources">Zachowywanie i wypełnianie metod płatności</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Zachowywanie i wypełnianie metod płatności</string>
     <!-- Preference summary for saving and autofilling credit card data -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Dane są zaszyfrowane</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Dane są zaszyfrowane</string>
     <!-- Preference summary for saving and autofilling payment method data. Parameter will be replaced by app name. -->
-    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2" tools:ignore="UnusedResources">%s szyfruje wszystkie zachowywane metody płatności</string>
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary_2">%s szyfruje wszystkie zachowywane metody płatności</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synchronizuj karty między urządzeniami</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
     <string name="preferences_credit_cards_sync_cards">Synchronizuj karty</string>
     <!-- Preference option for adding a credit card -->
-    <string name="preferences_credit_cards_add_credit_card">Dodaj kartę płatniczą</string>
+    <string name="preferences_credit_cards_add_credit_card" moz:RemovedIn="125" tools:ignore="UnusedResources">Dodaj kartę płatniczą</string>
 
     <!-- Preference option for adding a card -->
-    <string name="preferences_credit_cards_add_credit_card_2" tools:ignore="UnusedResources">Dodaj kartę</string>
+    <string name="preferences_credit_cards_add_credit_card_2">Dodaj kartę</string>
     <!-- Preference option for managing saved credit cards -->
-    <string name="preferences_credit_cards_manage_saved_cards">Zarządzaj zachowanymi kartami</string>
+    <string name="preferences_credit_cards_manage_saved_cards" moz:RemovedIn="125" tools:ignore="UnusedResources">Zarządzaj zachowanymi kartami</string>
     <!-- Preference option for managing saved cards -->
-    <string name="preferences_credit_cards_manage_saved_cards_2" tools:ignore="UnusedResources">Zarządzaj kartami</string>
+    <string name="preferences_credit_cards_manage_saved_cards_2">Zarządzaj kartami</string>
     <!-- Preference option for adding an address -->
     <string name="preferences_addresses_add_address">Dodaj adres</string>
     <!-- Preference option for managing saved addresses -->
     <string name="preferences_addresses_manage_addresses">Zarządzaj adresami</string>
 
     <!-- Preference for saving and autofilling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses">Zachowywanie i automatyczne wypełnianie adresów</string>
+    <string name="preferences_addresses_save_and_autofill_addresses" moz:RemovedIn="125" tools:ignore="UnusedResources">Zachowywanie i automatyczne wypełnianie adresów</string>
     <!-- Preference for saving and filling addresses -->
-    <string name="preferences_addresses_save_and_autofill_addresses_2" tools:ignore="UnusedResources">Zachowywanie i wypełnianie adresów</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_2">Zachowywanie i wypełnianie adresów</string>
     <!-- Preference summary for saving and autofilling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary">Zawiera informacje takie jak numery, adresy e-mail i adresy wysyłki</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary" moz:RemovedIn="125" tools:ignore="UnusedResources">Zawiera informacje takie jak numery, adresy e-mail i adresy wysyłki</string>
 
     <!-- Preference summary for saving and filling address data -->
-    <string name="preferences_addresses_save_and_autofill_addresses_summary_2" tools:ignore="UnusedResources">W tym numery telefonów i adresy e-mail</string>
+    <string name="preferences_addresses_save_and_autofill_addresses_summary_2">W tym numery telefonów i adresy e-mail</string>
 
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Dodaj kartę</string>
@@ -1858,9 +1873,9 @@
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Usuń kartę</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation">Czy na pewno usunąć tę kartę płatniczą?</string>
+    <string name="credit_cards_delete_dialog_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Czy na pewno usunąć tę kartę płatniczą?</string>
     <!-- The text for the confirmation message of "Delete card" dialog -->
-    <string name="credit_cards_delete_dialog_confirmation_2" tools:ignore="UnusedResources">Czy usunąć kartę?</string>
+    <string name="credit_cards_delete_dialog_confirmation_2">Czy usunąć kartę?</string>
     <!-- The text for the positive button on "Delete card" dialog -->
     <string name="credit_cards_delete_dialog_button">Usuń</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1873,24 +1888,24 @@
     <string name="credit_cards_saved_cards">Zachowane karty</string>
 
     <!-- Error message for credit card number validation -->
-    <string name="credit_cards_number_validation_error_message">Wprowadź prawidłowy numer karty płatniczej</string>
+    <string name="credit_cards_number_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Wprowadź prawidłowy numer karty płatniczej</string>
 
     <!-- Error message for card number validation -->
-    <string name="credit_cards_number_validation_error_message_2" tools:ignore="UnusedResources">Podaj prawidłowy numer karty</string>
+    <string name="credit_cards_number_validation_error_message_2">Podaj prawidłowy numer karty</string>
     <!-- Error message for credit card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message">Wypełnij to pole</string>
+    <string name="credit_cards_name_on_card_validation_error_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Wypełnij to pole</string>
     <!-- Error message for card name on card validation -->
-    <string name="credit_cards_name_on_card_validation_error_message_2" tools:ignore="UnusedResources">Dodaj imię i nazwisko</string>
+    <string name="credit_cards_name_on_card_validation_error_message_2">Dodaj imię i nazwisko</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
     <string name="credit_cards_biometric_prompt_message">Odblokuj, aby wyświetlić zachowane karty</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title">Zabezpiecz karty płatnicze</string>
+    <string name="credit_cards_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Zabezpiecz karty płatnicze</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_title_2" tools:ignore="UnusedResources">Zabezpiecz zachowane metody płatności</string>
+    <string name="credit_cards_warning_dialog_title_2">Zabezpiecz zachowane metody płatności</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message">Skonfiguruj wzór blokady, kod PIN lub hasło, aby ochronić zachowane karty płatnicze w przypadku, gdy ktoś inny uzyska dostęp do urządzenia.</string>
+    <string name="credit_cards_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Skonfiguruj wzór blokady, kod PIN lub hasło, aby ochronić zachowane karty płatnicze w przypadku, gdy ktoś inny uzyska dostęp do urządzenia.</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="credit_cards_warning_dialog_message_3" tools:ignore="UnusedResources">Skonfiguruj wzór blokady, kod PIN lub hasło, aby ochronić zachowane metody płatności w przypadku, gdy ktoś inny uzyska dostęp do urządzenia.</string>
+    <string name="credit_cards_warning_dialog_message_3">Skonfiguruj wzór blokady, kod PIN lub hasło, aby ochronić zachowane metody płatności w przypadku, gdy ktoś inny uzyska dostęp do urządzenia.</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="credit_cards_warning_dialog_set_up_now">Skonfiguruj teraz</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
@@ -1899,10 +1914,10 @@
     <string name="credit_cards_biometric_prompt_message_pin">Odblokuj urządzenie</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
-    <string name="credit_cards_biometric_prompt_unlock_message">Odblokuj, aby użyć przechowywanych informacji o kartach płatniczych</string>
+    <string name="credit_cards_biometric_prompt_unlock_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Odblokuj, aby użyć przechowywanych informacji o kartach płatniczych</string>
 
     <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored payment method information -->
-    <string name="credit_cards_biometric_prompt_unlock_message_2" tools:ignore="UnusedResources">Odblokuj, aby użyć zachowanych metod płatności</string>
+    <string name="credit_cards_biometric_prompt_unlock_message_2">Odblokuj, aby użyć zachowanych metod płatności</string>
     <!-- Title of the "Add address" screen -->
     <string name="addresses_add_address">Dodaj adres</string>
     <!-- Title of the "Edit address" screen -->
@@ -1910,11 +1925,13 @@
     <!-- Title of the "Manage addresses" screen -->
     <string name="addresses_manage_addresses">Zarządzaj adresami</string>
     <!-- The header for the first name of an address -->
-    <string name="addresses_first_name">Imię</string>
+    <string name="addresses_first_name" moz:removedIn="125" tools:ignore="UnusedResources">Imię</string>
     <!-- The header for the middle name of an address -->
-    <string name="addresses_middle_name">Drugie imię</string>
+    <string name="addresses_middle_name" moz:removedIn="125" tools:ignore="UnusedResources">Drugie imię</string>
     <!-- The header for the last name of an address -->
-    <string name="addresses_last_name">Nazwisko</string>
+    <string name="addresses_last_name" moz:removedIn="125" tools:ignore="UnusedResources">Nazwisko</string>
+    <!-- The header for the name of an address. Name represents a person's full name, typically made up of a first, middle and last name, e.g. John Joe Doe. -->
+    <string name="addresses_name">Imię i nazwisko</string>
     <!-- The header for the street address of an address -->
     <string name="addresses_street_address">Adres</string>
     <!-- The header for the city of an address -->
@@ -1938,9 +1955,9 @@
     <!-- The text for the "Delete address" button for deleting an address -->
     <string name="addressess_delete_address_button">Usuń adres</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message">Czy na pewno usunąć ten adres?</string>
+    <string name="addressess_confirm_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Czy na pewno usunąć ten adres?</string>
     <!-- The title for the "Delete address" confirmation dialog -->
-    <string name="addressess_confirm_dialog_message_2" tools:ignore="UnusedResources">Czy usunąć ten adres?</string>
+    <string name="addressess_confirm_dialog_message_2">Czy usunąć ten adres?</string>
     <!-- The text for the positive button on "Delete address" dialog -->
     <string name="addressess_confirm_dialog_ok_button">Usuń</string>
     <!-- The text for the negative button on "Delete address" dialog -->
@@ -2038,49 +2055,49 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Edytuj</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Czy na pewno usunąć te dane logowania?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Czy na pewno usunąć te dane logowania?</string>
     <!-- Message in delete confirmation dialog for password -->
-    <string name="login_deletion_confirmation_2" tools:ignore="UnusedResources">Czy na pewno usunąć to hasło?</string>
+    <string name="login_deletion_confirmation_2">Czy na pewno usunąć to hasło?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Usuń</string>
     <!-- Negative action of a dialog asking to delete login -->
     <string name="dialog_delete_negative">Anuluj</string>
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Opcje danych logowania</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Opcje danych logowania</string>
     <!--  The saved password options menu description. -->
-    <string name="login_options_menu_2" tools:ignore="UnusedResources">Opcje haseł</string>
+    <string name="login_options_menu_2">Opcje haseł</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Edytowalne pole tekstowe dla adresu witryny danych logowania.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Edytowalne pole tekstowe dla adresu witryny danych logowania.</string>
     <!--  The editable text field for a website address. -->
-    <string name="saved_login_hostname_description_3" tools:ignore="UnusedResources">Edytowalne pole tekstowe dla adresu witryny.</string>
+    <string name="saved_login_hostname_description_3">Edytowalne pole tekstowe dla adresu witryny.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Edytowalne pole tekstowe dla nazwy użytkownika danych logowania.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Edytowalne pole tekstowe dla nazwy użytkownika danych logowania.</string>
     <!--  The editable text field for a username. -->
-    <string name="saved_login_username_description_3" tools:ignore="UnusedResources">Edytowalne pole tekstowe dla nazwy użytkownika.</string>
+    <string name="saved_login_username_description_3">Edytowalne pole tekstowe dla nazwy użytkownika.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Edytowalne pole tekstowe dla hasła danych logowania.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Edytowalne pole tekstowe dla hasła danych logowania.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description_2" tools:ignore="UnusedResources">Edytowalne pole tekstowe dla hasła.</string>
+    <string name="saved_login_password_description_2">Edytowalne pole tekstowe dla hasła.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Zachowaj zmiany danych logowania.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Zachowaj zmiany danych logowania.</string>
     <!--  The button description to save changes to an edited password. -->
-    <string name="save_changes_to_login_2" tools:ignore="UnusedResources">Zachowaj zmiany.</string>
+    <string name="save_changes_to_login_2">Zachowaj zmiany.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Edycja</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Edycja</string>
     <!--  The page title for editing a saved password. -->
-    <string name="edit_2" tools:ignore="UnusedResources">Edycja hasła</string>
+    <string name="edit_2">Edycja hasła</string>
     <!--  The page title for adding new login. -->
-    <string name="add_login">Dodanie nowych danych logowania</string>
+    <string name="add_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Dodanie nowych danych logowania</string>
     <!--  The page title for adding new password. -->
-    <string name="add_login_2" tools:ignore="UnusedResources">Dodanie hasła</string>
+    <string name="add_login_2">Dodanie hasła</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Hasło jest wymagane</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Hasło jest wymagane</string>
     <!--  Error text displayed underneath the password field when it is in an error case. -->
-    <string name="saved_login_password_required_2" tools:ignore="UnusedResources">Wpisz hasło</string>
+    <string name="saved_login_password_required_2">Wpisz hasło</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required">Nazwa użytkownika jest wymagana</string>
+    <string name="saved_login_username_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Nazwa użytkownika jest wymagana</string>
     <!--  The error message in add login view when username field is blank. -->
-    <string name="saved_login_username_required_2" tools:ignore="UnusedResources">Wpisz nazwę użytkownika</string>
+    <string name="saved_login_username_required_2">Wpisz nazwę użytkownika</string>
     <!--  The error message in add login view when hostname field is blank. -->
     <string name="saved_login_hostname_required" tools:ignore="UnusedResources">Adres jest wymagany</string>
     <!--  The error message in add login view when hostname field is blank. -->
@@ -2192,7 +2209,7 @@
     <string name="radio_preference_info_content_description">Kliknij, aby wyświetlić więcej informacji</string>
 
     <!-- Content description for the action bar "up" button -->
-    <string name="action_bar_up_description">Przejdź w górę</string>
+    <string name="action_bar_up_description" moz:removedIn="124" tools:ignore="UnusedResources">Przejdź w górę</string>
 
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Zamknij</string>
@@ -2250,6 +2267,10 @@
     <!-- Translation request dialog -->
     <!-- Title for the translation dialog that allows a user to translate the webpage. -->
     <string name="translations_bottom_sheet_title">Przetłumaczyć tę stronę?</string>
+    <!-- Title for the translation dialog after a translation was completed successfully.
+    The first parameter is the name of the language that the page was translated from, for example, "French".
+    The second parameter is the name of the language that the page was translated to, for example, "English". -->
+    <string name="translations_bottom_sheet_title_translation_completed">Język oryginalnej strony: %1$s, język tłumaczenia: %2$s</string>
     <!-- Title for the translation dialog that allows a user to translate the webpage when a user uses the translation feature the first time. The first parameter is the name of the application, for example, "Fenix". -->
     <string name="translations_bottom_sheet_title_first_time">Wypróbuj prywatne tłumaczenia w przeglądarce %1$s</string>
     <!-- Additional information on the translation dialog that appears when a user uses the translation feature the first time. The first parameter is clickable text with a link, for example, "Learn more". -->
@@ -2262,6 +2283,8 @@
     <string name="translations_bottom_sheet_translate_to">Język docelowy:</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Nie teraz</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Wyświetl w oryginale</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">OK</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2283,6 +2306,16 @@
     <!-- Button text on the warning card when a language is not supported. The link will take the user to a page to a support page about translations. -->
     <string name="translation_error_language_not_supported_learn_more">Więcej informacji</string>
 
+
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Tłumaczenie…</string>
+    <!-- Title for the data saving mode warning dialog used in the translation request dialog.
+    This dialog will be presented when the user attempts to perform
+    a translation without the necessary language files downloaded first when Android's data saver mode is enabled and the user is not using WiFi.
+    The first parameter is the size in kilobytes or megabytes of the language file. -->
+    <string name="translations_download_language_file_dialog_title">Pobrać język w trybie oszczędzania danych (%1$s)?</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Opcje tłumaczenia</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index b6efef041..6a482c19c 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -203,7 +203,6 @@
     <!-- Content description (not visible, for screen readers etc.): Search engine icon. The first parameter is the search engine name (for example: DuckDuckGo). -->
     <string name="search_engine_icon_content_description" tools:ignore="UnusedResources">Motor de căutare %s</string>
 
-    <!-- Text for the button to set firefox as default browser on the device -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
     <string name="juno_onboarding_default_browser_title_nimbus_2">Ne place să te protejăm</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
@@ -357,7 +356,7 @@
     <!-- Preference for syncing bookmarks -->
     <string name="preferences_sync_bookmarks">Marcaje</string>
     <!-- Preference for syncing logins -->
-    <string name="preferences_sync_logins">Date de autentificare</string>
+    <string name="preferences_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Date de autentificare</string>
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">File deschise</string>
     <!-- Preference for signing out -->
@@ -382,6 +381,9 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s pe %2$s %3$s</string>
 
+    <!-- Preference for syncing payment methods -->
+    <string name="preferences_sync_credit_cards_2">Metode de plată</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">File primite</string>
@@ -1033,34 +1035,34 @@
     <string name="add_to_homescreen_description_2">Poți adăuga cu ușurință acest site web în ecranul de start al dispozitivului pentru acces instant și o navigare mai rapidă, ca și cum ai fi într-o aplicație.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
-    <string name="preferences_passwords_logins_and_passwords">Date de autentificare și parole</string>
+    <string name="preferences_passwords_logins_and_passwords" moz:RemovedIn="125" tools:ignore="UnusedResources">Date de autentificare și parole</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
-    <string name="preferences_passwords_save_logins">Salvează datele de autentificare și parolele</string>
+    <string name="preferences_passwords_save_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Salvează datele de autentificare și parolele</string>
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Întreabă pentru salvare</string>
     <!-- Preference option for never saving passwords in Fenix -->
     <string name="preferences_passwords_save_logins_never_save">Nu salva niciodată</string>
 
-    <!-- Preference for syncing saved logins in Fenix -->
-    <string name="preferences_passwords_sync_logins">Sincronizează datele de autentificare</string>
+    <!-- Preference for syncing saved passwords in Fenix -->
+    <string name="preferences_passwords_sync_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizează datele de autentificare</string>
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
-    <string name="preferences_passwords_sync_logins_across_devices">Sincronizează datele de autentificare între dispozitive</string>
+    <string name="preferences_passwords_sync_logins_across_devices" moz:RemovedIn="125" tools:ignore="UnusedResources">Sincronizează datele de autentificare între dispozitive</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins">Date de autentificare salvate</string>
+    <string name="preferences_passwords_saved_logins" moz:RemovedIn="125" tools:ignore="UnusedResources">Date de autentificare salvate</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Aici vor apărea datele de autentificare pe care le salvezi sau le sincronizezi în %s.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text" moz:RemovedIn="125" tools:ignore="UnusedResources">Aici vor apărea datele de autentificare pe care le salvezi sau le sincronizezi în %s.</string>
     <!-- Preference to access list of saved logins -->
-    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Află mai multe despre Sync.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link" moz:RemovedIn="125" tools:ignore="UnusedResources">Află mai multe despre Sync.</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Excepții</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Aici vor apărea datele de autentificare și parolele nesalvate.</string>
+    <string name="preferences_passwords_exceptions_description_empty" moz:RemovedIn="125" tools:ignore="UnusedResources">Aici vor apărea datele de autentificare și parolele nesalvate.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Datele de autentificare și parolele nu vor fi salvate pentru aceste site-uri.</string>
+    <string name="preferences_passwords_exceptions_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Datele de autentificare și parolele nu vor fi salvate pentru aceste site-uri.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Șterge toate excepțiile</string>
     <!-- Hint for search box in logins list -->
-    <string name="preferences_passwords_saved_logins_search">Caută date de autentificare</string>
+    <string name="preferences_passwords_saved_logins_search" moz:RemovedIn="125" tools:ignore="UnusedResources">Caută date de autentificare</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Site</string>
     <!-- The header for the username for a login -->
@@ -1082,12 +1084,12 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Ascunde parola</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
-    <string name="logins_biometric_prompt_message">Deblochează pentru a vizualiza datele de autentificare salvate</string>
+    <string name="logins_biometric_prompt_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Deblochează pentru a vizualiza datele de autentificare salvate</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_title">Securizează-ți datele de autentificare și parolele</string>
+    <string name="logins_warning_dialog_title" moz:RemovedIn="125" tools:ignore="UnusedResources">Securizează-ți datele de autentificare și parolele</string>
 
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Configurează un șablon de blocare a dispozitivului, un PIN sau o parolă pentru a-ți proteja datele de autentificare și parolele salvate împotriva accesării de către altcineva care are dispozitivul.</string>
+    <string name="logins_warning_dialog_message" moz:RemovedIn="125" tools:ignore="UnusedResources">Configurează un șablon de blocare a dispozitivului, un PIN sau o parolă pentru a-ți proteja datele de autentificare și parolele salvate împotriva accesării de către altcineva care are dispozitivul.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Mai târziu</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1104,7 +1106,12 @@
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Folosite ultima dată</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
-    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Meniu de sortare a datelor de autentificare</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Meniu de sortare a datelor de autentificare</string>
+
+    <!-- Preference and title for managing the settings for payment methods -->
+    <string name="preferences_credit_cards_2">Metode de plată</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_2">Salvează și completează metodele de plată</string>
 
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Adaugă un motor de căutare</string>
@@ -1163,24 +1170,24 @@
     <!-- Login overflow menu edit button -->
     <string name="login_menu_edit_button">Editează</string>
     <!-- Message in delete confirmation dialog for logins -->
-    <string name="login_deletion_confirmation">Sigur vrei să ștergi aceste date de autentificare?</string>
+    <string name="login_deletion_confirmation" moz:RemovedIn="125" tools:ignore="UnusedResources">Sigur vrei să ștergi aceste date de autentificare?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Șterge</string>
 
     <!--  The saved login options menu description. -->
-    <string name="login_options_menu">Opțiuni de autentificare</string>
+    <string name="login_options_menu" moz:RemovedIn="125" tools:ignore="UnusedResources">Opțiuni de autentificare</string>
     <!--  The editable text field for a login's web address. -->
-    <string name="saved_login_hostname_description">Câmpul de text editabil pentru adresa web a datelor de autentificare.</string>
+    <string name="saved_login_hostname_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Câmpul de text editabil pentru adresa web a datelor de autentificare.</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Câmpul de text editabil pentru numele de utilizator al datelor de autentificare.</string>
+    <string name="saved_login_username_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Câmpul de text editabil pentru numele de utilizator al datelor de autentificare.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Câmp de text editabil pentru parola datelor de autentificare.</string>
+    <string name="saved_login_password_description" moz:RemovedIn="125" tools:ignore="UnusedResources">Câmp de text editabil pentru parola datelor de autentificare.</string>
     <!--  The button description to save changes to an edited login. -->
-    <string name="save_changes_to_login">Salvează modificările datelor de autentificare.</string>
+    <string name="save_changes_to_login" moz:RemovedIn="125" tools:ignore="UnusedResources">Salvează modificările datelor de autentificare.</string>
     <!--  The page title for editing a saved login. -->
-    <string name="edit">Editează</string>
+    <string name="edit" moz:RemovedIn="125" tools:ignore="UnusedResources">Editează</string>
     <!--  The error message in add/edit login view when password field is blank. -->
-    <string name="saved_login_password_required">Necesită o parolă</string>
+    <string name="saved_login_password_required" moz:RemovedIn="125" tools:ignore="UnusedResources">Necesită o parolă</string>
     <!-- Voice search button content description  -->
     <string name="voice_search_content_description">Căutare vocală</string>
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
@@ -1225,4 +1232,11 @@
 
     <!-- Translations feature-->
 
+
+    <!-- Toggle switch label that allows a user to set the setting if they would like the browser to always offer or suggest translations when available. -->
+    <string name="translation_option_bottom_sheet_always_translate">Oferă întotdeauna traducerea</string>
+
+    <!-- Toggle switch description that will appear under the "Never translate" and "Always translate" toggle switch settings to provide more information on how these  settings interacts with other settings. -->
+    <string name="translation_option_bottom_sheet_switch_description">Suprascrie oferirea traducerii</string>
+
     </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 25a69fae9..801e3c08c 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -2425,6 +2425,8 @@
     <string name="translations_bottom_sheet_translate_to">Ciljni jezik</string>
     <!-- Button text on the translations dialog to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button">Ne zdaj</string>
+    <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. -->
+    <string name="translations_bottom_sheet_negative_button_restore">Prikaži izvirnik</string>
     <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. -->
     <string name="translations_bottom_sheet_negative_button_error">Končano</string>
     <!-- Button text on the translations dialog to begin a translation of the website. -->
@@ -2448,6 +2450,10 @@
     <string name="translation_error_language_not_supported_learn_more">Več o tem</string>
 
 
+    <!-- Snackbar title shown if the user closes the Translation Request dialogue and a translation is in progress. -->
+    <string name="translation_in_progress_snackbar">Prevajanje …</string>
+
+
     <!-- Translations options dialog -->
     <!-- Title of the translation options dialog that allows a user to set their translation options for the site the user is currently on. -->
     <string name="translation_option_bottom_sheet_title">Možnosti prevajanja</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index dbd652bb7..1e66dc40a 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1518,7 +1518,7 @@
     <!-- Text shown in confirmation dialog to sign out of account. The first parameter is the name of the app (e.g. Firefox Preview) -->
     <string name="sign_out_confirmation_message_2">%s artık hesabınızla eşitlenmeyecek ama bu cihazdaki gezinti geçmişiniz silinmeyecek.</string>
     <!-- Option to continue signing out of account shown in confirmation dialog to sign out of account -->
-    <string name="sign_out_disconnect">Bağlatıyı kes</string>
+    <string name="sign_out_disconnect">Bağlantıyı kes</string>
     <!-- Option to cancel signing out shown in confirmation dialog to sign out of account -->
     <string name="sign_out_cancel">İptal</string>
 

From 085ee2155802233a51e0a7d875d29a12df66a956 Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Mon, 11 Mar 2024 16:24:37 -0400
Subject: [PATCH 218/222] Bug 1884666 - Only add Google additional header in
 search, preferences and webhp urls

(cherry picked from commit dcc48c0e7c0e8f650234a72c0bd805077bc64ce9)
---
 .../fenix/components/UrlRequestInterceptor.kt       | 13 ++++++++++++-
 .../fenix/components/UrlRequestInterceptorTest.kt   |  6 +++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/UrlRequestInterceptor.kt b/app/src/main/java/org/mozilla/fenix/components/UrlRequestInterceptor.kt
index 0c113755b..675b4c6af 100644
--- a/app/src/main/java/org/mozilla/fenix/components/UrlRequestInterceptor.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/UrlRequestInterceptor.kt
@@ -11,6 +11,8 @@ import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.AL
 import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.BYPASS_CACHE
 import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE
 import mozilla.components.concept.engine.request.RequestInterceptor
+import java.net.MalformedURLException
+import java.net.URL
 
 /**
  * [RequestInterceptor] implementation for intercepting URL load requests to allow custom
@@ -23,6 +25,7 @@ class UrlRequestInterceptor(private val isDeviceRamAboveThreshold: Boolean) : Re
     private val isGoogleRequest by lazy {
         Regex("^https://www\\.google\\..+")
     }
+    private val googleRequestPaths = setOf("/search", "/webhp", "/preferences")
 
     @VisibleForTesting
     internal fun getAdditionalHeaders(isDeviceRamAboveThreshold: Boolean): Map<String, String> {
@@ -42,7 +45,15 @@ class UrlRequestInterceptor(private val isDeviceRamAboveThreshold: Boolean) : Re
         uri: String,
         isSubframeRequest: Boolean,
     ): Boolean {
-        return !isSubframeRequest && isGoogleRequest.containsMatchIn(uri)
+        if (isSubframeRequest || !isGoogleRequest.containsMatchIn(uri)) {
+            return false
+        }
+
+        return try {
+            googleRequestPaths.contains(URL(uri).path)
+        } catch (e: MalformedURLException) {
+            false
+        }
     }
 
     override fun onLoadRequest(
diff --git a/app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt b/app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt
index a53dde2d8..f323adb3c 100644
--- a/app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/UrlRequestInterceptorTest.kt
@@ -60,7 +60,7 @@ class UrlRequestInterceptorTest {
     fun `WHEN should intercept request is called THEN return the correct boolean value`() {
         val urlRequestInterceptor = getUrlRequestInterceptor()
 
-        assertTrue(
+        assertFalse(
             urlRequestInterceptor.shouldInterceptRequest(
                 uri = "https://www.google.com",
                 isSubframeRequest = false,
@@ -128,8 +128,8 @@ class UrlRequestInterceptorTest {
     }
 
     @Test
-    fun `WHEN a Google request is loaded THEN request is intercepted`() {
-        val uri = "https://www.google.com"
+    fun `WHEN a Google preferences request is loaded THEN request is intercepted`() {
+        val uri = "https://www.google.com/preferences"
 
         assertEquals(
             RequestInterceptor.InterceptionResponse.Url(

From 0705b9b9f6c7e7b65803e97d0184c7d40de308cb Mon Sep 17 00:00:00 2001
From: JohanLorenzo <JohanLorenzo@users.noreply.github.com>
Date: Tue, 12 Mar 2024 13:02:32 +0000
Subject: [PATCH 219/222] Update Fenix initial_experiments.json based on the
 current first-run experiments in experimenter

(cherry picked from commits 911fc74f6701d3b8b173d50bb217655148066e36 & 068f97524c55bbb65944ba09fc158a11ae089723)
---
 app/src/main/res/raw/initial_experiments.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/raw/initial_experiments.json b/app/src/main/res/raw/initial_experiments.json
index 5dc81c4d6..c771ed397 100644
--- a/app/src/main/res/raw/initial_experiments.json
+++ b/app/src/main/res/raw/initial_experiments.json
@@ -223,20 +223,20 @@
     },
     {
       "schemaVersion": "1.12.0",
-      "slug": "android-optimize-set-as-default-browser-screen",
-      "id": "android-optimize-set-as-default-browser-screen",
+      "slug": "android-optimize-set-as-default-browser-screen-release",
+      "id": "android-optimize-set-as-default-browser-screen-release",
       "arguments": {},
-      "application": "org.mozilla.fenix",
+      "application": "org.mozilla.firefox",
       "appName": "fenix",
-      "appId": "org.mozilla.fenix",
-      "channel": "nightly",
-      "userFacingName": "Android - Optimize “Set as Default Browser” Screen",
+      "appId": "org.mozilla.firefox",
+      "channel": "release",
+      "userFacingName": "Android - Optimize “Set as Default Browser” Screen Release",
       "userFacingDescription": "This experiment is designed to optimize the set-to-default browser experience on Android.",
       "isEnrollmentPaused": false,
       "isRollout": false,
       "bucketConfig": {
         "randomizationUnit": "nimbus_id",
-        "namespace": "fenix-juno-onboarding-nightly-2",
+        "namespace": "fenix-juno-onboarding-release-6",
         "start": 0,
         "count": 10000,
         "total": 10000
@@ -367,7 +367,7 @@
         }
       ],
       "targeting": "((is_already_enrolled) || ((isFirstRun == 'true') && (app_version|versionCompare('124.!') >= 0) && (language in ['en'])))",
-      "startDate": "2024-03-08",
+      "startDate": "2024-03-12",
       "enrollmentEndDate": null,
       "endDate": null,
       "proposedDuration": 35,
@@ -376,7 +376,7 @@
       "featureValidationOptOut": false,
       "localizations": null,
       "locales": null,
-      "publishedDate": "2024-03-08T16:48:36.645956Z"
+      "publishedDate": "2024-03-12T15:23:02.314682Z"
     }
   ]
 }

From 8a082c4c0d951ea974f2bca124ee523614a36a60 Mon Sep 17 00:00:00 2001
From: Rahul Sainani <rahulsainani5@gmail.com>
Date: Wed, 13 Mar 2024 09:58:16 +0100
Subject: [PATCH 220/222] Revert "Bug 1867717 - Add DownloadsFeature to
 AddonPopupBaseFragment."

This reverts commit cc65693e4f8811906f344d0e902af0bccbb7edbf.

(cherry picked from commit 15c6eb2c4a22e68b65f982b59ea83c8e7a6886ef)
---
 .../addons/AddonInternalSettingsFragment.kt   |  18 +-
 .../fenix/addons/AddonPopupBaseFragment.kt    | 124 +------------
 .../addons/WebExtensionActionPopupFragment.kt |  19 +-
 .../fenix/browser/BaseBrowserFragment.kt      |  86 ++++-----
 .../fenix/browser/DownloadDialogUtils.kt      |  62 -------
 .../mozilla/fenix/browser/DownloadUtils.kt    |  53 ++++++
 .../mozilla/fenix/components/Components.kt    |  11 --
 .../fenix/components/DownloadStyling.kt       |  36 ----
 .../fragment_add_on_internal_settings.xml     |  14 --
 .../addons/AddonPopupBaseFragmentTest.kt      |  53 ------
 .../fenix/browser/BaseBrowserFragmentTest.kt  |  73 +++++++-
 .../fenix/browser/DownloadDialogUtilsTest.kt  | 173 ------------------
 12 files changed, 165 insertions(+), 557 deletions(-)
 delete mode 100644 app/src/main/java/org/mozilla/fenix/browser/DownloadDialogUtils.kt
 create mode 100644 app/src/main/java/org/mozilla/fenix/browser/DownloadUtils.kt
 delete mode 100644 app/src/main/java/org/mozilla/fenix/components/DownloadStyling.kt
 delete mode 100644 app/src/test/java/org/mozilla/fenix/addons/AddonPopupBaseFragmentTest.kt
 delete mode 100644 app/src/test/java/org/mozilla/fenix/browser/DownloadDialogUtilsTest.kt

diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonInternalSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonInternalSettingsFragment.kt
index 7155c90ee..8c08a95fd 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonInternalSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonInternalSettingsFragment.kt
@@ -12,7 +12,6 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import mozilla.components.feature.addons.ui.translateName
 import org.mozilla.fenix.R
-import org.mozilla.fenix.databinding.DownloadDialogLayoutBinding
 import org.mozilla.fenix.databinding.FragmentAddOnInternalSettingsBinding
 import org.mozilla.fenix.ext.showToolbar
 
@@ -22,8 +21,6 @@ import org.mozilla.fenix.ext.showToolbar
 class AddonInternalSettingsFragment : AddonPopupBaseFragment() {
 
     private val args by navArgs<AddonInternalSettingsFragmentArgs>()
-    private var _binding: FragmentAddOnInternalSettingsBinding? = null
-    internal val binding get() = _binding!!
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -34,17 +31,9 @@ class AddonInternalSettingsFragment : AddonPopupBaseFragment() {
         return inflater.inflate(R.layout.fragment_add_on_internal_settings, container, false)
     }
 
-    override fun getSnackBarContainer(): ViewGroup {
-        return binding.dynamicSnackbarContainer
-    }
-
-    override fun getDownloadDialogLayoutBinding(): DownloadDialogLayoutBinding {
-        return binding.viewDynamicDownloadDialog
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentAddOnInternalSettingsBinding.bind(view)
+        val binding = FragmentAddOnInternalSettingsBinding.bind(view)
         args.addon.installedState?.optionsPageUrl?.let {
             engineSession?.let { engineSession ->
                 binding.addonSettingsEngineView.render(engineSession)
@@ -59,9 +48,4 @@ class AddonInternalSettingsFragment : AddonPopupBaseFragment() {
             showToolbar(title = args.addon.translateName(it))
         }
     }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt
index 05eeb740b..b1c54ee1f 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt
@@ -5,33 +5,21 @@
 package org.mozilla.fenix.addons
 
 import android.os.Bundle
-import android.os.Environment
 import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.VisibleForTesting
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
-import com.google.android.material.snackbar.Snackbar
 import mozilla.components.browser.state.action.ContentAction
 import mozilla.components.browser.state.action.CustomTabListAction
 import mozilla.components.browser.state.state.CustomTabSessionState
 import mozilla.components.browser.state.state.EngineState
 import mozilla.components.browser.state.state.SessionState
-import mozilla.components.browser.state.state.content.DownloadState
 import mozilla.components.browser.state.state.createCustomTab
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.prompt.PromptRequest
 import mozilla.components.concept.engine.window.WindowRequest
-import mozilla.components.concept.fetch.Response
-import mozilla.components.feature.downloads.DownloadsFeature
 import mozilla.components.feature.prompts.PromptFeature
 import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
-import org.mozilla.fenix.browser.DownloadDialogUtils
-import org.mozilla.fenix.components.DownloadStyling
-import org.mozilla.fenix.components.FenixSnackbar
-import org.mozilla.fenix.databinding.DownloadDialogLayoutBinding
-import org.mozilla.fenix.downloads.DynamicDownloadDialog
 import org.mozilla.fenix.ext.requireComponents
 
 /**
@@ -40,22 +28,19 @@ import org.mozilla.fenix.ext.requireComponents
  */
 abstract class AddonPopupBaseFragment : Fragment(), EngineSession.Observer, UserInteractionHandler {
     private val promptsFeature = ViewBoundFeatureWrapper<PromptFeature>()
-    private val downloadsFeature = ViewBoundFeatureWrapper<DownloadsFeature>()
 
-    internal var session: SessionState? = null
+    protected var session: SessionState? = null
     protected var engineSession: EngineSession? = null
     private var canGoBack: Boolean = false
 
     @Suppress("DEPRECATION")
     // https://github.com/mozilla-mobile/fenix/issues/19920
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val store = requireComponents.core.store
-        val safeContext = requireContext()
         session?.let {
             promptsFeature.set(
                 feature = PromptFeature(
                     fragment = this,
-                    store = store,
+                    store = requireComponents.core.store,
                     customTabId = it.id,
                     fragmentManager = parentFragmentManager,
                     fileUploadsDirCleaner = requireComponents.core.fileUploadsDirCleaner,
@@ -67,52 +52,6 @@ abstract class AddonPopupBaseFragment : Fragment(), EngineSession.Observer, User
                 owner = this,
                 view = view,
             )
-
-            downloadsFeature.set(
-                DownloadsFeature(
-                    safeContext,
-                    store = store,
-                    useCases = requireComponents.useCases.downloadUseCases,
-                    fragmentManager = parentFragmentManager,
-                    tabId = it.id,
-                    downloadManager = requireComponents.downloadManager,
-                    promptsStyling = DownloadStyling.createPrompt(safeContext),
-                    onNeedToRequestPermissions = { permissions ->
-                        requestPermissions(permissions, REQUEST_CODE_DOWNLOAD_PERMISSIONS)
-                    },
-                ),
-                owner = this,
-                view = view,
-            )
-
-            downloadsFeature.get()?.onDownloadStopped = { downloadState, _, downloadJobStatus ->
-                val onCannotOpenFile: (DownloadState) -> Unit = {
-                    FenixSnackbar.make(
-                        view = getSnackBarContainer(),
-                        duration = Snackbar.LENGTH_SHORT,
-                        isDisplayedWithBrowserToolbar = true,
-                    ).setText(DynamicDownloadDialog.getCannotOpenFileErrorMessage(requireContext(), it))
-                        .show()
-                }
-                DownloadDialogUtils.handleOnDownloadFinished(
-                    context = requireContext(),
-                    downloadState = downloadState,
-                    downloadJobStatus = downloadJobStatus,
-                    currentTab = it,
-                    onCannotOpenFile = onCannotOpenFile,
-                    onFinishedDialogShown = {
-                        DynamicDownloadDialog(
-                            context = requireContext(),
-                            downloadState = downloadState,
-                            didFail = downloadJobStatus == DownloadState.Status.FAILED,
-                            tryAgain = downloadsFeature.get()!!::tryAgain,
-                            onCannotOpenFile = onCannotOpenFile,
-                            binding = getDownloadDialogLayoutBinding(),
-                            toolbarHeight = 0,
-                        ) {}.show()
-                    },
-                )
-            }
         }
     }
 
@@ -134,44 +73,6 @@ abstract class AddonPopupBaseFragment : Fragment(), EngineSession.Observer, User
         engineSession?.unregister(this)
     }
 
-    override fun onExternalResource(
-        url: String,
-        fileName: String?,
-        contentLength: Long?,
-        contentType: String?,
-        cookie: String?,
-        userAgent: String?,
-        isPrivate: Boolean,
-        skipConfirmation: Boolean,
-        openInApp: Boolean,
-        response: Response?,
-    ) {
-        session?.let { session ->
-            val fileSize = if (contentLength != null && contentLength < 0) null else contentLength
-            val download = DownloadState(
-                url,
-                fileName,
-                contentType,
-                fileSize,
-                0,
-                DownloadState.Status.INITIATED,
-                userAgent,
-                Environment.DIRECTORY_DOWNLOADS,
-                private = isPrivate,
-                skipConfirmation = skipConfirmation,
-                openInApp = openInApp,
-                response = response,
-            )
-
-            provideBrowserStore().dispatch(
-                ContentAction.UpdateDownloadAction(
-                    session.id,
-                    download,
-                ),
-            )
-        }
-    }
-
     override fun onPromptRequest(promptRequest: PromptRequest) {
         session?.let { session ->
             requireComponents.core.store.dispatch(
@@ -213,34 +114,17 @@ abstract class AddonPopupBaseFragment : Fragment(), EngineSession.Observer, User
         requireComponents.core.store.dispatch(CustomTabListAction.AddCustomTabAction(session as CustomTabSessionState))
     }
 
-    @VisibleForTesting
-    internal fun provideBrowserStore() = requireComponents.core.store
-
     final override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<String>,
         grantResults: IntArray,
     ) {
-        val feature = when (requestCode) {
-            REQUEST_CODE_PROMPT_PERMISSIONS -> promptsFeature.get()
-            REQUEST_CODE_DOWNLOAD_PERMISSIONS -> downloadsFeature.get()
-            else -> null
+        when (requestCode) {
+            REQUEST_CODE_PROMPT_PERMISSIONS -> promptsFeature.get()?.onPermissionsResult(permissions, grantResults)
         }
-        feature?.onPermissionsResult(permissions, grantResults)
     }
 
-    /**
-     * Returns a [ViewGroup] where a SnackBar message should be anchored.
-     */
-    abstract fun getSnackBarContainer(): ViewGroup
-
-    /**
-     * Returns a [DownloadDialogLayoutBinding] to access the download dialog items.
-     */
-    abstract fun getDownloadDialogLayoutBinding(): DownloadDialogLayoutBinding
-
     companion object {
         private const val REQUEST_CODE_PROMPT_PERMISSIONS = 1
-        private const val REQUEST_CODE_DOWNLOAD_PERMISSIONS = 2
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/addons/WebExtensionActionPopupFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/WebExtensionActionPopupFragment.kt
index 12fa3597a..95b2246c5 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/WebExtensionActionPopupFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/WebExtensionActionPopupFragment.kt
@@ -15,7 +15,6 @@ import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.EngineView
 import mozilla.components.lib.state.ext.consumeFrom
 import org.mozilla.fenix.R
-import org.mozilla.fenix.databinding.DownloadDialogLayoutBinding
 import org.mozilla.fenix.databinding.FragmentAddOnInternalSettingsBinding
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.showToolbar
@@ -34,9 +33,6 @@ class WebExtensionActionPopupFragment : AddonPopupBaseFragment(), EngineSession.
             safeArguments.putBoolean("isSessionConsumed", value)
         }
 
-    private var _binding: FragmentAddOnInternalSettingsBinding? = null
-    internal val binding get() = _binding!!
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -50,14 +46,6 @@ class WebExtensionActionPopupFragment : AddonPopupBaseFragment(), EngineSession.
         return inflater.inflate(R.layout.fragment_add_on_internal_settings, container, false)
     }
 
-    override fun getSnackBarContainer(): ViewGroup {
-        return binding.dynamicSnackbarContainer
-    }
-
-    override fun getDownloadDialogLayoutBinding(): DownloadDialogLayoutBinding {
-        return binding.viewDynamicDownloadDialog
-    }
-
     override fun onResume() {
         super.onResume()
         val title = args.webExtensionTitle ?: args.webExtensionId
@@ -67,7 +55,7 @@ class WebExtensionActionPopupFragment : AddonPopupBaseFragment(), EngineSession.
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        _binding = FragmentAddOnInternalSettingsBinding.bind(view)
+        val binding = FragmentAddOnInternalSettingsBinding.bind(view)
 
         val session = engineSession
         // If we have the session, render it otherwise consume it from the store.
@@ -94,11 +82,6 @@ class WebExtensionActionPopupFragment : AddonPopupBaseFragment(), EngineSession.
         }
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
     private fun consumePopupSession() {
         coreComponents.store.dispatch(
             WebExtensionAction.UpdatePopupSessionAction(args.webExtensionId, popupSession = null),
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 5476a21c4..f09dff9f6 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -13,6 +13,7 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import android.util.Log
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -68,6 +69,7 @@ import mozilla.components.feature.app.links.AppLinksFeature
 import mozilla.components.feature.contextmenu.ContextMenuCandidate
 import mozilla.components.feature.contextmenu.ContextMenuFeature
 import mozilla.components.feature.downloads.DownloadsFeature
+import mozilla.components.feature.downloads.manager.FetchDownloadManager
 import mozilla.components.feature.downloads.temporary.CopyDownloadFeature
 import mozilla.components.feature.downloads.temporary.ShareDownloadFeature
 import mozilla.components.feature.intent.ext.EXTRA_SESSION_ID
@@ -123,7 +125,6 @@ import org.mozilla.fenix.OnBackLongPressedListener
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.readermode.DefaultReaderModeController
-import org.mozilla.fenix.components.DownloadStyling
 import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.components.FindInPageIntegration
 import org.mozilla.fenix.components.StoreProvider
@@ -139,6 +140,7 @@ import org.mozilla.fenix.components.toolbar.interactor.DefaultBrowserToolbarInte
 import org.mozilla.fenix.crashes.CrashContentIntegration
 import org.mozilla.fenix.customtabs.ExternalAppBrowserActivity
 import org.mozilla.fenix.databinding.FragmentBrowserBinding
+import org.mozilla.fenix.downloads.DownloadService
 import org.mozilla.fenix.downloads.DynamicDownloadDialog
 import org.mozilla.fenix.downloads.FirstPartyDownloadDialog
 import org.mozilla.fenix.downloads.StartDownloadDialog
@@ -534,14 +536,31 @@ abstract class BaseBrowserFragment :
             useCases = context.components.useCases.downloadUseCases,
             fragmentManager = childFragmentManager,
             tabId = customTabSessionId,
-            downloadManager = context.components.downloadManager,
+            downloadManager = FetchDownloadManager(
+                context.applicationContext,
+                store,
+                DownloadService::class,
+                notificationsDelegate = context.components.notificationsDelegate,
+            ),
             shouldForwardToThirdParties = {
                 PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
                     context.getPreferenceKey(R.string.pref_key_external_download_manager),
                     false,
                 )
             },
-            promptsStyling = DownloadStyling.createPrompt(context),
+            promptsStyling = DownloadsFeature.PromptsStyling(
+                gravity = Gravity.BOTTOM,
+                shouldWidthMatchParent = true,
+                positiveButtonBackgroundColor = ThemeManager.resolveAttribute(
+                    R.attr.accent,
+                    context,
+                ),
+                positiveButtonTextColor = ThemeManager.resolveAttribute(
+                    R.attr.textOnColorPrimary,
+                    context,
+                ),
+                positiveButtonRadius = (resources.getDimensionPixelSize(R.dimen.tab_corner_radius)).toFloat(),
+            ),
             onNeedToRequestPermissions = { permissions ->
                 requestPermissions(permissions, REQUEST_CODE_DOWNLOAD_PERMISSIONS)
             },
@@ -594,46 +613,7 @@ abstract class BaseBrowserFragment :
         )
 
         downloadFeature.onDownloadStopped = { downloadState, _, downloadJobStatus ->
-            val onCannotOpenFile: (DownloadState) -> Unit = {
-                FenixSnackbar.make(
-                    view = binding.dynamicSnackbarContainer,
-                    duration = Snackbar.LENGTH_SHORT,
-                    isDisplayedWithBrowserToolbar = true,
-                ).setText(
-                    DynamicDownloadDialog.getCannotOpenFileErrorMessage(
-                        context,
-                        downloadState,
-                    ),
-                ).show()
-            }
-
-            DownloadDialogUtils.handleOnDownloadFinished(
-                context = requireContext(),
-                downloadState = downloadState,
-                downloadJobStatus = downloadJobStatus,
-                currentTab = getCurrentTab(),
-                onFinishedDialogShown = {
-                    saveDownloadDialogState(
-                        downloadState.sessionId,
-                        downloadState,
-                        downloadJobStatus,
-                    )
-                    browserToolbarView.expand()
-
-                    DynamicDownloadDialog(
-                        context = context,
-                        downloadState = downloadState,
-                        didFail = downloadJobStatus == DownloadState.Status.FAILED,
-                        tryAgain = downloadFeature::tryAgain,
-                        onCannotOpenFile = onCannotOpenFile,
-                        binding = binding.viewDynamicDownloadDialog,
-                        toolbarHeight = toolbarHeight,
-                    ) {
-                        sharedViewModel.downloadDialogState.remove(downloadState.sessionId)
-                    }.show()
-                },
-                onCannotOpenFile = onCannotOpenFile,
-            )
+            handleOnDownloadFinished(downloadState, downloadJobStatus, downloadFeature::tryAgain)
         }
 
         resumeDownloadDialogState(
@@ -1126,12 +1106,7 @@ abstract class BaseBrowserFragment :
             didFail = savedDownloadState.second,
             tryAgain = onTryAgain,
             onCannotOpenFile = {
-                FenixSnackbar.make(
-                    view = binding.dynamicSnackbarContainer,
-                    duration = Snackbar.LENGTH_SHORT,
-                    isDisplayedWithBrowserToolbar = true,
-                ).setText(DynamicDownloadDialog.getCannotOpenFileErrorMessage(context, it))
-                    .show()
+                showCannotOpenFileError(binding.dynamicSnackbarContainer, context, it)
             },
             binding = binding.viewDynamicDownloadDialog,
             toolbarHeight = toolbarHeight,
@@ -1635,6 +1610,19 @@ abstract class BaseBrowserFragment :
         )
     }
 
+    internal fun showCannotOpenFileError(
+        container: ViewGroup,
+        context: Context,
+        downloadState: DownloadState,
+    ) {
+        FenixSnackbar.make(
+            view = container,
+            duration = Snackbar.LENGTH_SHORT,
+            isDisplayedWithBrowserToolbar = true,
+        ).setText(DynamicDownloadDialog.getCannotOpenFileErrorMessage(context, downloadState))
+            .show()
+    }
+
     companion object {
         private const val KEY_CUSTOM_TAB_SESSION_ID = "custom_tab_session_id"
         private const val REQUEST_CODE_DOWNLOAD_PERMISSIONS = 1
diff --git a/app/src/main/java/org/mozilla/fenix/browser/DownloadDialogUtils.kt b/app/src/main/java/org/mozilla/fenix/browser/DownloadDialogUtils.kt
deleted file mode 100644
index ee5926b5b..000000000
--- a/app/src/main/java/org/mozilla/fenix/browser/DownloadDialogUtils.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.browser
-
-import android.content.Context
-import androidx.annotation.VisibleForTesting
-import mozilla.components.browser.state.state.SessionState
-import mozilla.components.browser.state.state.content.DownloadState
-import mozilla.components.browser.state.state.content.DownloadState.Status
-import mozilla.components.feature.downloads.AbstractFetchDownloadService
-
-/**
- * Utilities for handling download dialogs.
- */
-object DownloadDialogUtils {
-
-    internal fun handleOnDownloadFinished(
-        context: Context,
-        downloadState: DownloadState,
-        downloadJobStatus: Status,
-        currentTab: SessionState?,
-        onFinishedDialogShown: () -> Unit = {},
-        onCannotOpenFile: (DownloadState) -> Unit,
-    ) {
-        // If the download is just paused, don't show any in-app notification
-        if (shouldShowCompletedDownloadDialog(downloadState, downloadJobStatus, currentTab)) {
-            if (downloadState.openInApp && downloadJobStatus == Status.COMPLETED) {
-                val fileWasOpened = openFile(context, downloadState)
-                if (!fileWasOpened) {
-                    onCannotOpenFile(downloadState)
-                }
-            } else {
-                onFinishedDialogShown()
-            }
-        }
-    }
-
-    @VisibleForTesting
-    internal var openFile: (Context, DownloadState) -> (Boolean) = { context, downloadState ->
-        AbstractFetchDownloadService.openFile(
-            applicationContext = context.applicationContext,
-            download = downloadState,
-        )
-    }
-
-    /**
-     * Indicates whether or not a completed download dialog should be shown.
-     */
-    fun shouldShowCompletedDownloadDialog(
-        downloadState: DownloadState,
-        status: Status,
-        currentTab: SessionState?,
-    ): Boolean {
-        val isValidStatus =
-            status in listOf(Status.COMPLETED, Status.FAILED)
-        val isSameTab = downloadState.sessionId == (currentTab?.id ?: false)
-
-        return isValidStatus && isSameTab
-    }
-}
diff --git a/app/src/main/java/org/mozilla/fenix/browser/DownloadUtils.kt b/app/src/main/java/org/mozilla/fenix/browser/DownloadUtils.kt
new file mode 100644
index 000000000..ed0930f76
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/browser/DownloadUtils.kt
@@ -0,0 +1,53 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.browser
+
+import mozilla.components.browser.state.state.content.DownloadState
+import mozilla.components.browser.state.state.content.DownloadState.Status
+import mozilla.components.feature.downloads.AbstractFetchDownloadService
+import org.mozilla.fenix.R
+import org.mozilla.fenix.downloads.DynamicDownloadDialog
+
+internal fun BaseBrowserFragment.handleOnDownloadFinished(
+    downloadState: DownloadState,
+    downloadJobStatus: Status,
+    tryAgain: (String) -> Unit,
+) {
+    // If the download is just paused, don't show any in-app notification
+    if (shouldShowCompletedDownloadDialog(downloadState, downloadJobStatus)) {
+        val safeContext = context ?: return
+        val onCannotOpenFile: (DownloadState) -> Unit = {
+            showCannotOpenFileError(binding.dynamicSnackbarContainer, safeContext, it)
+        }
+        if (downloadState.openInApp && downloadJobStatus == Status.COMPLETED) {
+            val fileWasOpened = AbstractFetchDownloadService.openFile(
+                applicationContext = safeContext.applicationContext,
+                download = downloadState,
+            )
+            if (!fileWasOpened) {
+                onCannotOpenFile(downloadState)
+            }
+        } else {
+            saveDownloadDialogState(
+                downloadState.sessionId,
+                downloadState,
+                downloadJobStatus,
+            )
+
+            val dynamicDownloadDialog = DynamicDownloadDialog(
+                context = safeContext,
+                downloadState = downloadState,
+                didFail = downloadJobStatus == Status.FAILED,
+                tryAgain = tryAgain,
+                onCannotOpenFile = onCannotOpenFile,
+                binding = binding.viewDynamicDownloadDialog,
+                toolbarHeight = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height),
+            ) { sharedViewModel.downloadDialogState.remove(downloadState.sessionId) }
+
+            dynamicDownloadDialog.show()
+            browserToolbarView.expand()
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt
index 6a4ea2328..fb5dc1072 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Components.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt
@@ -16,7 +16,6 @@ import mozilla.components.feature.addons.amo.AMOAddonsProvider
 import mozilla.components.feature.addons.migration.DefaultSupportedAddonsChecker
 import mozilla.components.feature.addons.update.DefaultAddonUpdater
 import mozilla.components.feature.autofill.AutofillConfiguration
-import mozilla.components.feature.downloads.manager.FetchDownloadManager
 import mozilla.components.lib.publicsuffixlist.PublicSuffixList
 import mozilla.components.support.base.android.NotificationsDelegate
 import mozilla.components.support.base.worker.Frequency
@@ -30,7 +29,6 @@ import org.mozilla.fenix.autofill.AutofillUnlockActivity
 import org.mozilla.fenix.components.appstate.AppState
 import org.mozilla.fenix.components.metrics.MetricsMiddleware
 import org.mozilla.fenix.datastore.pocketStoriesSelectedCategoriesDataStore
-import org.mozilla.fenix.downloads.DownloadService
 import org.mozilla.fenix.ext.asRecentTabs
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.filterState
@@ -101,15 +99,6 @@ class Components(private val context: Context) {
         )
     }
 
-    val downloadManager by lazyMonitored {
-        FetchDownloadManager(
-            context.applicationContext,
-            core.store,
-            DownloadService::class,
-            notificationsDelegate = notificationsDelegate,
-        )
-    }
-
     val intentProcessors by lazyMonitored {
         IntentProcessors(
             context,
diff --git a/app/src/main/java/org/mozilla/fenix/components/DownloadStyling.kt b/app/src/main/java/org/mozilla/fenix/components/DownloadStyling.kt
deleted file mode 100644
index 199f2312b..000000000
--- a/app/src/main/java/org/mozilla/fenix/components/DownloadStyling.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.components
-
-import android.content.Context
-import android.view.Gravity
-import mozilla.components.feature.downloads.DownloadsFeature
-import org.mozilla.fenix.R
-import org.mozilla.fenix.theme.ThemeManager
-
-/**
- * Provides access to all Fenix download styling.
- */
-object DownloadStyling {
-
-    /**
-     * creates [DownloadsFeature.PromptsStyling].
-     */
-    fun createPrompt(context: Context): DownloadsFeature.PromptsStyling {
-        return DownloadsFeature.PromptsStyling(
-            gravity = Gravity.BOTTOM,
-            shouldWidthMatchParent = true,
-            positiveButtonBackgroundColor = ThemeManager.resolveAttribute(
-                R.attr.accent,
-                context,
-            ),
-            positiveButtonTextColor = ThemeManager.resolveAttribute(
-                R.attr.textOnColorPrimary,
-                context,
-            ),
-            positiveButtonRadius = (context.resources.getDimensionPixelSize(R.dimen.tab_corner_radius)).toFloat(),
-        )
-    }
-}
diff --git a/app/src/main/res/layout/fragment_add_on_internal_settings.xml b/app/src/main/res/layout/fragment_add_on_internal_settings.xml
index 0b3fa0573..282f5bd3b 100644
--- a/app/src/main/res/layout/fragment_add_on_internal_settings.xml
+++ b/app/src/main/res/layout/fragment_add_on_internal_settings.xml
@@ -13,18 +13,4 @@
         android:id="@+id/addonSettingsEngineView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-
-    <include
-        android:id="@+id/viewDynamicDownloadDialog"
-        layout="@layout/download_dialog_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:visibility="gone" />
-
-    <FrameLayout
-        android:id="@+id/dynamicSnackbarContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="@dimen/browser_fragment_toolbar_elevation"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/test/java/org/mozilla/fenix/addons/AddonPopupBaseFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/addons/AddonPopupBaseFragmentTest.kt
deleted file mode 100644
index 28fc9e261..000000000
--- a/app/src/test/java/org/mozilla/fenix/addons/AddonPopupBaseFragmentTest.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.addons
-
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.spyk
-import io.mockk.verify
-import mozilla.components.browser.state.action.ContentAction
-import mozilla.components.browser.state.state.SessionState
-import mozilla.components.browser.state.store.BrowserStore
-import mozilla.components.concept.fetch.Response
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
-
-@RunWith(FenixRobolectricTestRunner::class)
-class AddonPopupBaseFragmentTest {
-
-    private lateinit var fragment: AddonPopupBaseFragment
-
-    @Before
-    fun setup() {
-        fragment = spyk()
-    }
-
-    @Test
-    fun `WHEN onExternalResource is call THEN  dispatch an UpdateDownloadAction`() {
-        val store = mockk<BrowserStore>(relaxed = true)
-        val session = mockk<SessionState>(relaxed = true)
-        val response = mockk<Response>(relaxed = true)
-        every { fragment.provideBrowserStore() } returns store
-
-        fragment.session = session
-
-        fragment.onExternalResource(
-            url = "url",
-            fileName = "fileName",
-            contentLength = 1,
-            contentType = "contentType",
-            userAgent = "userAgent",
-            isPrivate = true,
-            skipConfirmation = false,
-            openInApp = false,
-            response = response,
-        )
-
-        verify { store.dispatch(any<ContentAction.UpdateDownloadAction>()) }
-    }
-}
diff --git a/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt
index 4a7e37e36..ac0a109f9 100644
--- a/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt
@@ -12,7 +12,11 @@ import io.mockk.mockk
 import io.mockk.slot
 import io.mockk.spyk
 import io.mockk.verify
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertTrue
 import mozilla.components.browser.state.state.SessionState
+import mozilla.components.browser.state.state.content.DownloadState
+import mozilla.components.browser.state.state.createTab
 import mozilla.components.concept.engine.EngineView
 import mozilla.components.concept.engine.permission.SitePermissions
 import mozilla.components.feature.contextmenu.ContextMenuCandidate
@@ -104,7 +108,6 @@ class BaseBrowserFragmentTest {
     }
 
     @Test
-    @Suppress("ktlint:standard:max-line-length")
     fun `initializeEngineView should set toolbar height as EngineView parent's bottom margin when using bottom toolbar`() {
         every { settings.isDynamicToolbarEnabled } returns false
         every { settings.shouldUseBottomToolbar } returns true
@@ -115,7 +118,7 @@ class BaseBrowserFragmentTest {
     }
 
     @Test
-    fun `initializeEngineView set toolbar height as EngineView parent's bottom margin if top toolbar`() {
+    fun `initializeEngineView should set toolbar height as EngineView parent's bottom margin if top toolbar is forced for a11y`() {
         every { settings.shouldUseBottomToolbar } returns false
         every { settings.shouldUseFixedTopToolbar } returns true
 
@@ -125,8 +128,7 @@ class BaseBrowserFragmentTest {
     }
 
     @Test
-    @Suppress("MaxLineLength")
-    fun `initializeEngineView set toolbar height as EngineView parent's bottom margin if bottom toolbar`() {
+    fun `initializeEngineView should set toolbar height as EngineView parent's bottom margin if bottom toolbar is forced for a11y`() {
         every { settings.shouldUseBottomToolbar } returns true
         every { settings.shouldUseFixedTopToolbar } returns true
 
@@ -134,6 +136,69 @@ class BaseBrowserFragmentTest {
 
         verify { (swipeRefreshLayout.layoutParams as CoordinatorLayout.LayoutParams).bottomMargin = 13 }
     }
+
+    @Test
+    fun `WHEN status is equals to FAILED or COMPLETED and it is the same tab then shouldShowCompletedDownloadDialog will be true`() {
+        every { fragment.getCurrentTab() } returns createTab(id = "1", url = "")
+
+        val download = DownloadState(
+            url = "",
+            sessionId = "1",
+            destinationDirectory = "/",
+        )
+
+        val status = DownloadState.Status.values()
+            .filter { it == DownloadState.Status.COMPLETED && it == DownloadState.Status.FAILED }
+
+        status.forEach {
+            val result =
+                fragment.shouldShowCompletedDownloadDialog(download, it)
+
+            assertTrue(result)
+        }
+    }
+
+    @Test
+    fun `WHEN status is different from FAILED or COMPLETED then shouldShowCompletedDownloadDialog will be false`() {
+        every { fragment.getCurrentTab() } returns createTab(id = "1", url = "")
+
+        val download = DownloadState(
+            url = "",
+            sessionId = "1",
+            destinationDirectory = "/",
+        )
+
+        val status = DownloadState.Status.values()
+            .filter { it != DownloadState.Status.COMPLETED && it != DownloadState.Status.FAILED }
+
+        status.forEach {
+            val result =
+                fragment.shouldShowCompletedDownloadDialog(download, it)
+
+            assertFalse(result)
+        }
+    }
+
+    @Test
+    fun `WHEN the tab is different from the initial one then shouldShowCompletedDownloadDialog will be false`() {
+        every { fragment.getCurrentTab() } returns createTab(id = "1", url = "")
+
+        val download = DownloadState(
+            url = "",
+            sessionId = "2",
+            destinationDirectory = "/",
+        )
+
+        val status = DownloadState.Status.values()
+            .filter { it != DownloadState.Status.COMPLETED && it != DownloadState.Status.FAILED }
+
+        status.forEach {
+            val result =
+                fragment.shouldShowCompletedDownloadDialog(download, it)
+
+            assertFalse(result)
+        }
+    }
 }
 
 private class TestBaseBrowserFragment : BaseBrowserFragment() {
diff --git a/app/src/test/java/org/mozilla/fenix/browser/DownloadDialogUtilsTest.kt b/app/src/test/java/org/mozilla/fenix/browser/DownloadDialogUtilsTest.kt
deleted file mode 100644
index fbd3d013e..000000000
--- a/app/src/test/java/org/mozilla/fenix/browser/DownloadDialogUtilsTest.kt
+++ /dev/null
@@ -1,173 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.browser
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import mozilla.components.browser.state.state.content.DownloadState
-import mozilla.components.browser.state.state.content.DownloadState.Status.COMPLETED
-import mozilla.components.browser.state.state.content.DownloadState.Status.FAILED
-import mozilla.components.browser.state.state.createTab
-import mozilla.components.support.test.robolectric.testContext
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class DownloadDialogUtilsTest {
-
-    @Test
-    @Suppress("MaxLineLength")
-    fun `GIVEN final status WHEN handleOnDownloadFinished try to open the file fails THEN show error message`() {
-        val downloadUtils = DownloadDialogUtils
-        val currentTab = createTab(id = "1", url = "")
-        val download = DownloadState(
-            url = "",
-            sessionId = currentTab.id,
-            destinationDirectory = "/",
-            openInApp = true,
-        )
-        var dialogWasShown = false
-        var onCannotOpenFileWasCalled = false
-
-        downloadUtils.openFile = { _, _ -> false }
-
-        downloadUtils.handleOnDownloadFinished(
-            context = testContext,
-            downloadState = download,
-            downloadJobStatus = COMPLETED,
-            currentTab = currentTab,
-            onFinishedDialogShown = { dialogWasShown = true },
-            onCannotOpenFile = {
-                onCannotOpenFileWasCalled = true
-            },
-        )
-
-        assertTrue(onCannotOpenFileWasCalled)
-        assertFalse(dialogWasShown)
-    }
-
-    @Test
-    fun `GIVEN final status and openInApp WHEN calling handleOnDownloadFinished THEN try to open the file`() {
-        val downloadUtils = DownloadDialogUtils
-        val download = DownloadState(
-            url = "",
-            sessionId = "1",
-            destinationDirectory = "/",
-            openInApp = true,
-        )
-        val currentTab = createTab(id = "1", url = "")
-        var dialogWasShown = false
-        var onCannotOpenFileWasCalled = false
-
-        downloadUtils.openFile = { _, _ -> true }
-
-        downloadUtils.handleOnDownloadFinished(
-            context = testContext,
-            downloadState = download,
-            downloadJobStatus = COMPLETED,
-            currentTab = currentTab,
-            onFinishedDialogShown = { dialogWasShown = true },
-            onCannotOpenFile = {
-                onCannotOpenFileWasCalled = true
-            },
-        )
-
-        assertFalse(onCannotOpenFileWasCalled)
-        assertFalse(dialogWasShown)
-    }
-
-    @Test
-    fun `GIVEN final status WHEN calling handleOnDownloadFinished THEN show a finished download dialog`() {
-        val downloadUtils = DownloadDialogUtils
-        val download = DownloadState(
-            url = "",
-            sessionId = "1",
-            destinationDirectory = "/",
-        )
-        val currentTab = createTab(id = "1", url = "")
-        var dialogWasShown = false
-
-        downloadUtils.handleOnDownloadFinished(
-            context = testContext,
-            downloadState = download,
-            downloadJobStatus = COMPLETED,
-            currentTab = currentTab,
-            onFinishedDialogShown = { dialogWasShown = true },
-            onCannotOpenFile = {},
-        )
-
-        assertTrue(dialogWasShown)
-    }
-
-    @Test
-    fun `WHEN status is final and is same tab THEN shouldShowCompletedDownloadDialog will be true`() {
-        val currentTab = createTab(id = "1", url = "")
-
-        val download = DownloadState(
-            url = "",
-            sessionId = "1",
-            destinationDirectory = "/",
-        )
-
-        val status = DownloadState.Status.values().filter { it == COMPLETED || it == FAILED }
-
-        status.forEach {
-            val result = DownloadDialogUtils.shouldShowCompletedDownloadDialog(
-                downloadState = download,
-                status = it,
-                currentTab = currentTab,
-            )
-
-            assertTrue(result)
-        }
-    }
-
-    @Test
-    fun `WHEN status is different from FAILED or COMPLETED then shouldShowCompletedDownloadDialog will be false`() {
-        val currentTab = createTab(id = "1", url = "")
-
-        val download = DownloadState(
-            url = "",
-            sessionId = "1",
-            destinationDirectory = "/",
-        )
-
-        val completedStatus = listOf(COMPLETED, FAILED)
-        val status = DownloadState.Status.values().filter { it !in completedStatus }
-
-        status.forEach {
-            val result = DownloadDialogUtils.shouldShowCompletedDownloadDialog(
-                downloadState = download,
-                status = it,
-                currentTab = currentTab,
-            )
-
-            assertFalse(result)
-        }
-    }
-
-    @Test
-    fun `WHEN the tab is different from the initial one then shouldShowCompletedDownloadDialog will be false`() {
-        val currentTab = createTab(id = "1", url = "")
-
-        val download = DownloadState(
-            url = "",
-            sessionId = "2",
-            destinationDirectory = "/",
-        )
-        val completedStatus = listOf(COMPLETED, FAILED)
-        val status = DownloadState.Status.values().filter { it !in completedStatus }
-        status.forEach {
-            val result =
-                DownloadDialogUtils.shouldShowCompletedDownloadDialog(
-                    downloadState = download,
-                    status = it,
-                    currentTab = currentTab,
-                )
-            assertFalse(result)
-        }
-    }
-}

From 24fbc002f673f45d5b0a0adb8731ba644b956eaa Mon Sep 17 00:00:00 2001
From: JohanLorenzo <JohanLorenzo@users.noreply.github.com>
Date: Wed, 13 Mar 2024 15:32:10 +0000
Subject: [PATCH 221/222] Update Fenix initial_experiments.json based on the
 current first-run experiments in experimenter

(cherry picked from commit 0392c921cd0c016a0a90938d66ff963fd6c9b9e6)
---
 app/src/main/res/raw/initial_experiments.json | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)

diff --git a/app/src/main/res/raw/initial_experiments.json b/app/src/main/res/raw/initial_experiments.json
index c771ed397..1be096876 100644
--- a/app/src/main/res/raw/initial_experiments.json
+++ b/app/src/main/res/raw/initial_experiments.json
@@ -377,6 +377,111 @@
       "localizations": null,
       "locales": null,
       "publishedDate": "2024-03-12T15:23:02.314682Z"
+    },
+    {
+      "schemaVersion": "1.12.0",
+      "slug": "splash-screen-max-duration-test-lower-times",
+      "id": "splash-screen-max-duration-test-lower-times",
+      "arguments": {},
+      "application": "org.mozilla.firefox",
+      "appName": "fenix",
+      "appId": "org.mozilla.firefox",
+      "channel": "release",
+      "userFacingName": "Splash screen max duration test - lower times",
+      "userFacingDescription": "Testing a splashscreen on app launch.",
+      "isEnrollmentPaused": false,
+      "isRollout": false,
+      "bucketConfig": {
+        "randomizationUnit": "nimbus_id",
+        "namespace": "fenix-splash-screen-release-3",
+        "start": 0,
+        "count": 10000,
+        "total": 10000
+      },
+      "featureIds": [
+        "splash-screen"
+      ],
+      "probeSets": [],
+      "outcomes": [
+        {
+          "slug": "onboarding",
+          "priority": "primary"
+        },
+        {
+          "slug": "default-browser",
+          "priority": "primary"
+        }
+      ],
+      "branches": [
+        {
+          "slug": "control",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "splash-screen",
+              "enabled": true,
+              "value": {
+                "enabled": true,
+                "maximum_duration_ms": 0
+              }
+            }
+          ]
+        },
+        {
+          "slug": "treatment-a",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "splash-screen",
+              "enabled": true,
+              "value": {
+                "enabled": true,
+                "maximum_duration_ms": 1750
+              }
+            }
+          ]
+        },
+        {
+          "slug": "treatment-b",
+          "ratio": 1,
+          "feature": {
+            "featureId": "this-is-included-for-mobile-pre-96-support",
+            "enabled": false,
+            "value": {}
+          },
+          "features": [
+            {
+              "featureId": "splash-screen",
+              "enabled": true,
+              "value": {
+                "enabled": true,
+                "maximum_duration_ms": 2500
+              }
+            }
+          ]
+        }
+      ],
+      "targeting": "((is_already_enrolled) || ((isFirstRun == 'true') && (app_version|versionCompare('124.!') >= 0) && (region in ['AD', 'AE', 'AF', 'AG', 'AI', 'AL', 'AM', 'AO', 'AQ', 'AR', 'AS', 'AT', 'AU', 'AW', 'AX', 'AZ', 'BA', 'BB', 'BD', 'BE', 'BF', 'BG', 'BH', 'BI', 'BJ', 'BL', 'BM', 'BN', 'BO', 'BQ', 'BR', 'BS', 'BT', 'BV', 'BW', 'BY', 'BZ', 'CA', 'CC', 'CD', 'CF', 'CG', 'CH', 'CI', 'CK', 'CL', 'CM', 'CN', 'CO', 'CR', 'CU', 'CV', 'CW', 'CX', 'CY', 'CZ', 'DJ', 'DK', 'DM', 'DO', 'DZ', 'EC', 'EE', 'EG', 'EH', 'ER', 'ES', 'ET', 'FI', 'FJ', 'FK', 'FM', 'FO', 'FR', 'GA', 'GB', 'GD', 'GE', 'GF', 'GG', 'GH', 'GI', 'GL', 'GM', 'GN', 'GP', 'GQ', 'GR', 'GS', 'GT', 'GU', 'GW', 'GY', 'HK', 'HM', 'HN', 'HR', 'HT', 'HU', 'ID', 'IE', 'IL', 'IM', 'IN', 'IO', 'IQ', 'IR', 'IS', 'IT', 'JE', 'JM', 'JO', 'JP', 'KE', 'KG', 'KH', 'KI', 'KM', 'KN', 'KP', 'KR', 'KW', 'KY', 'KZ', 'LA', 'LB', 'LC', 'LI', 'LK', 'LR', 'LS', 'LT', 'LU', 'LV', 'LY', 'MA', 'MC', 'MD', 'ME', 'MF', 'MG', 'MH', 'MK', 'ML', 'MM', 'MN', 'MO', 'MP', 'MQ', 'MR', 'MS', 'MT', 'MU', 'MV', 'MW', 'MX', 'MY', 'MZ', 'NA', 'NC', 'NE', 'NF', 'NG', 'NI', 'NL', 'NO', 'NP', 'NR', 'NU', 'NZ', 'OM', 'PA', 'PE', 'PF', 'PG', 'PH', 'PK', 'PL', 'PM', 'PN', 'PR', 'PS', 'PT', 'PW', 'PY', 'QA', 'RE', 'RO', 'RS', 'RU', 'RW', 'SA', 'SB', 'SC', 'SD', 'SE', 'SG', 'SH', 'SI', 'SJ', 'SK', 'SL', 'SM', 'SN', 'SO', 'SR', 'SS', 'ST', 'SV', 'SX', 'SY', 'SZ', 'TC', 'TD', 'TF', 'TG', 'TH', 'TJ', 'TK', 'TL', 'TM', 'TN', 'TO', 'TR', 'TT', 'TV', 'TW', 'TZ', 'UA', 'UG', 'UM', 'US', 'UY', 'UZ', 'VA', 'VC', 'VE', 'VG', 'VI', 'VN', 'VU', 'WF', 'WS', 'YE', 'YT', 'ZA', 'ZM', 'ZW'])))",
+      "startDate": "2024-03-13",
+      "enrollmentEndDate": null,
+      "endDate": null,
+      "proposedDuration": 56,
+      "proposedEnrollment": 28,
+      "referenceBranch": "control",
+      "featureValidationOptOut": false,
+      "localizations": null,
+      "locales": null,
+      "publishedDate": "2024-03-13T15:04:41.938148Z"
     }
   ]
 }

From 382ca721c4788c348da1bc4c24f702a26fdbe707 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 7 Mar 2024 13:32:00 -0500
Subject: [PATCH 222/222] Bug 1879332 - ensure synced tabs includes the
 inactive property

(cherry picked from commit 5b559a4e485fa859e43e5eb3bbca95abbcbdb151)
---
 .../org/mozilla/fenix/components/BackgroundServices.kt     | 3 ++-
 app/src/main/java/org/mozilla/fenix/tabstray/TabsTray.kt   | 1 +
 .../java/org/mozilla/fenix/tabstray/browser/TabSorter.kt   | 2 +-
 .../java/org/mozilla/fenix/tabstray/ext/TabSessionState.kt | 7 +------
 .../org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt    | 1 +
 .../org/mozilla/fenix/sync/ext/SyncedDeviceTabsTest.kt     | 3 +++
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
index 250a380ca..078cbcaab 100644
--- a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
@@ -43,6 +43,7 @@ import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.GleanMetrics.SyncAuth
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.maxActiveTime
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.perf.StrictModeManager
 import org.mozilla.fenix.perf.lazyMonitored
@@ -143,7 +144,7 @@ class BackgroundServices(
     }
 
     val syncedTabsStorage by lazyMonitored {
-        SyncedTabsStorage(accountManager, context.components.core.store, remoteTabsStorage.value)
+        SyncedTabsStorage(accountManager, context.components.core.store, remoteTabsStorage.value, maxActiveTime)
     }
     val syncedTabsAutocompleteProvider by lazyMonitored {
         SyncedTabsAutocompleteProvider(syncedTabsStorage)
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTray.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTray.kt
index cff61af7d..cfa020a33 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTray.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTray.kt
@@ -626,5 +626,6 @@ private fun generateFakeSyncedTab(tabName: String, tabUrl: String): SyncedTabsLi
             history = listOf(TabEntry(tabName, tabUrl, null)),
             active = 0,
             lastUsed = 0L,
+            inactive = false,
         ),
     )
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabSorter.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabSorter.kt
index 8ad653c27..7f7c62d15 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabSorter.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabSorter.kt
@@ -6,12 +6,12 @@ package org.mozilla.fenix.tabstray.browser
 
 import mozilla.components.browser.state.state.TabPartition
 import mozilla.components.browser.state.state.TabSessionState
+import mozilla.components.browser.state.state.isActive
 import mozilla.components.browser.tabstray.TabsTray
 import mozilla.components.feature.tabs.tabstray.TabsFeature
 import org.mozilla.fenix.ext.maxActiveTime
 import org.mozilla.fenix.tabstray.TabsTrayAction
 import org.mozilla.fenix.tabstray.TabsTrayStore
-import org.mozilla.fenix.tabstray.ext.isActive
 import org.mozilla.fenix.utils.Settings
 
 /**
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/ext/TabSessionState.kt b/app/src/main/java/org/mozilla/fenix/tabstray/ext/TabSessionState.kt
index 5fb9f02d6..7419aa65b 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/ext/TabSessionState.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/ext/TabSessionState.kt
@@ -5,14 +5,9 @@
 package org.mozilla.fenix.tabstray.ext
 
 import mozilla.components.browser.state.state.TabSessionState
+import mozilla.components.browser.state.state.isActive
 import mozilla.components.support.ktx.kotlin.trimmed
 
-fun TabSessionState.isActive(maxActiveTime: Long): Boolean {
-    val lastActiveTime = maxOf(lastAccess, createdAt)
-    val now = System.currentTimeMillis()
-    return (now - lastActiveTime <= maxActiveTime)
-}
-
 /**
  * Returns true if the [TabSessionState] has a search term.
  */
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt
index 489914cd8..fe3976044 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt
@@ -309,5 +309,6 @@ private fun generateFakeTab(tabName: String, tabUrl: String): SyncedTabsListItem
             history = listOf(TabEntry(tabName, tabUrl, null)),
             active = 0,
             lastUsed = 0L,
+            inactive = false,
         ),
     )
diff --git a/app/src/test/java/org/mozilla/fenix/sync/ext/SyncedDeviceTabsTest.kt b/app/src/test/java/org/mozilla/fenix/sync/ext/SyncedDeviceTabsTest.kt
index f99f36893..acf66374b 100644
--- a/app/src/test/java/org/mozilla/fenix/sync/ext/SyncedDeviceTabsTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/sync/ext/SyncedDeviceTabsTest.kt
@@ -43,6 +43,7 @@ class SyncedDeviceTabsTest {
                 ),
                 active = 0,
                 lastUsed = 0L,
+                inactive = false,
             ),
         ),
     )
@@ -64,6 +65,7 @@ class SyncedDeviceTabsTest {
                 ),
                 active = 0,
                 lastUsed = 0L,
+                inactive = false,
             ),
             Tab(
                 history = listOf(
@@ -75,6 +77,7 @@ class SyncedDeviceTabsTest {
                 ),
                 active = 0,
                 lastUsed = 0L,
+                inactive = false,
             ),
         ),
     )