From 6e85bb1e08d6512ad6c034757d926e0c54c6ee05 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 01/51] 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/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt
index 1a25a39e6915..53f1121bfaea 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt
+++ b/fenix/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 b4daeab8c98ed5b3809d70ba1022633c52daa3fe 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 02/51] 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/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt
index 01959e7b8560..3c4d37710a50 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt
+++ b/fenix/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 d566743ea0f041ce27c1204da903de380f96b46e 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 03/51] 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/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt
index 975000dd2095..eab72fffb12a 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt
+++ b/fenix/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 01c2307b2bb198e97a403b674aa44b893e482361 Mon Sep 17 00:00:00 2001
From: sarah541 <sarahkhan1107@hotmail.com>
Date: Thu, 8 Feb 2024 10:59:45 -0500
Subject: [PATCH 04/51] Bug 1879135 - Add ecosia crawl website

---
 .../src/main/assets/extensions/ads/manifest.template.json      | 3 ++-
 .../src/main/assets/extensions/search/manifest.template.json   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/android-components/components/feature/search/src/main/assets/extensions/ads/manifest.template.json b/android-components/components/feature/search/src/main/assets/extensions/ads/manifest.template.json
index bacc0d7cac73..219e41b55454 100644
--- a/android-components/components/feature/search/src/main/assets/extensions/ads/manifest.template.json
+++ b/android-components/components/feature/search/src/main/assets/extensions/ads/manifest.template.json
@@ -204,7 +204,8 @@
         "https://www.bing.com/search*",
         "https://www.baidu.com/*",
         "https://m.baidu.com/*",
-        "https://duckduckgo.com/*"
+        "https://duckduckgo.com/*",
+        "https://www.ecosia.org/*"
       ],
       "js": ["adsTelemetry.js"],
       "run_at": "document_end"
diff --git a/android-components/components/feature/search/src/main/assets/extensions/search/manifest.template.json b/android-components/components/feature/search/src/main/assets/extensions/search/manifest.template.json
index 642ad819ffc0..ae9cf13dac99 100644
--- a/android-components/components/feature/search/src/main/assets/extensions/search/manifest.template.json
+++ b/android-components/components/feature/search/src/main/assets/extensions/search/manifest.template.json
@@ -205,7 +205,8 @@
         "https://m.baidu.com/*",
         "https://*search.yahoo.com/search*",
         "https://www.bing.com/search*",
-        "https://duckduckgo.com/*"
+        "https://duckduckgo.com/*",
+        "https://www.ecosia.org/*"
       ],
       "js": ["searchTelemetry.js"],
       "run_at": "document_end"

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

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

diff --git a/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 7b8f0343e656..1808eb3a30d6 100644
--- a/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/fenix/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 48c917f78f4c94664790dba80c0874b92756d3ed Mon Sep 17 00:00:00 2001
From: Matthew Tighe <matthewdtighe@gmail.com>
Date: Fri, 9 Feb 2024 09:19:20 -0800
Subject: [PATCH 06/51] Revert "Bug 1833666 - Update original RFC guidelines
 with stakeholders"

This reverts commit e1e6e86bf6525a123518919bfc620108396ad3dc.
---
 docs/rfcs/0001-rfc-process.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/rfcs/0001-rfc-process.md b/docs/rfcs/0001-rfc-process.md
index 8f120399fa58..09919475460c 100644
--- a/docs/rfcs/0001-rfc-process.md
+++ b/docs/rfcs/0001-rfc-process.md
@@ -35,7 +35,6 @@ The high-level process of creating an RFC is:
 * Create an RFC document (like this one) using the template.
 * Open a pull request for the RFC document.
 * Ask for feedback on the pull request, via the [mailing list]() or in [chat](https://chat.mozilla.org/#/room/#android-components:mozilla.org).
-* Assign or receive volunteers to act as stakeholders for the RFC. They will be responsible for a final decision on the proposal. This should include at least 2 internal team members, and at least 1 external team member if the proposal has been suggested from an external team.
 
 During the lifetime of an RFC:
 

From 62072cdbec13bfca1d950eee968e6bc4e54e56eb 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 07/51] Import translations from android-l10n

---
 .../addons/src/main/res/values-rm/strings.xml |   2 +
 .../src/main/res/values-cy/strings.xml        |   2 +-
 .../media/src/main/res/values-et/strings.xml  |  23 +++-
 .../media/src/main/res/values-rm/strings.xml  |  11 +-
 .../src/main/res/values-hy-rAM/strings.xml    |   3 +
 .../src/main/res/values-rm/strings.xml        |  36 ++++++
 fenix/app/src/main/res/values-azb/strings.xml | 104 ++++++++++++++++++
 fenix/app/src/main/res/values-bg/strings.xml  |   2 +-
 fenix/app/src/main/res/values-et/strings.xml  |  68 ++++++++++++
 .../src/main/res/values-hy-rAM/strings.xml    |   3 +
 fenix/app/src/main/res/values-kab/strings.xml |  16 ++-
 fenix/app/src/main/res/values-rm/strings.xml  |  74 ++++++-------
 fenix/app/src/main/res/values-sk/strings.xml  |   3 +
 fenix/app/src/main/res/values-ug/strings.xml  |   3 +
 14 files changed, 301 insertions(+), 49 deletions(-)

diff --git a/android-components/components/feature/addons/src/main/res/values-rm/strings.xml b/android-components/components/feature/addons/src/main/res/values-rm/strings.xml
index f7b752cd4b87..2a1b17137b40 100644
--- a/android-components/components/feature/addons/src/main/res/values-rm/strings.xml
+++ b/android-components/components/feature/addons/src/main/res/values-rm/strings.xml
@@ -22,6 +22,8 @@
      then we will show another collapsed entry saying "Access your data on 2 other domains". This entry it's for the plural case, when the add-on is accessing more than one extra domain.
      %1$d will be replaced by an integer indicating the number of additional domains for which this web extension is requesting permission. -->
     <string name="mozac_feature_addons_permissions_extra_domains_description_plural" tools:ignore="PluralsCandidate">Acceder a tias datas per %1$d autras domenas</string>
+    <!-- Content description for a permission item, for an installed add-on details page. %1$s will be replaced with the permission text name, %2$d will be replaced with the permission position in the list and %3$d will be replaced with the total number of permissions in the list.Taking as an example "Read and modify privacy settings" the whole text will read Read and modify privacy settings, 2 of 6. -->
+    <string name="mozac_feature_addons_permissions_content_description_item">%1$s, %2$d da %3$d</string>
     <!-- Description for tabs add-on permission. -->
     <string name="mozac_feature_addons_permissions_tabs_description">Acceder als tabs dal navigatur</string>
     <!-- Description for unlimited_storage permission. -->
diff --git a/android-components/components/feature/downloads/src/main/res/values-cy/strings.xml b/android-components/components/feature/downloads/src/main/res/values-cy/strings.xml
index 4eb29e47c223..ba05a7e8248e 100644
--- a/android-components/components/feature/downloads/src/main/res/values-cy/strings.xml
+++ b/android-components/components/feature/downloads/src/main/res/values-cy/strings.xml
@@ -13,7 +13,7 @@
     <!-- Alert dialog confirmation before download a file, this is the title. %1$s will be replaced with the name of the file. -->
     <string name="mozac_feature_downloads_dialog_title2">Llwytho (%1$s)</string>
     <!-- Alert dialog confirmation before download a file, this is the positive action. -->
-    <string name="mozac_feature_downloads_dialog_download">Llwytho</string>
+    <string name="mozac_feature_downloads_dialog_download">Llwytho i Lawr</string>
     <!-- Alert dialog confirmation before download a file, this is the negative action. -->
     <string name="mozac_feature_downloads_dialog_cancel">Diddymu</string>
     <!-- Error shown when the user is trying to download a invalid file. %1$s will be replaced with the name of the app. -->
diff --git a/android-components/components/feature/media/src/main/res/values-et/strings.xml b/android-components/components/feature/media/src/main/res/values-et/strings.xml
index e8f8b7f37668..de103560f60e 100644
--- a/android-components/components/feature/media/src/main/res/values-et/strings.xml
+++ b/android-components/components/feature/media/src/main/res/values-et/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
     <!-- Name of the "notification channel" used for displaying media notification. See https://developer.android.com/training/notify-user/channels -->
     <string name="mozac_feature_media_notification_channel">Meedia</string>
 
@@ -10,6 +10,27 @@
     <!-- Title of notification shown when the device's camera and microphone is shared with a website (WebRTC) -->
     <string name="mozac_feature_media_sharing_camera_and_microphone">Kaamera ja mikrofon on sisse lülitatud</string>
 
+    <!-- Text of notification shown when the device's camera is shared with a website (WebRTC) -->
+    <string name="mozac_feature_media_sharing_camera_text">Puuduta kaamerat kasutava kaardi avamiseks.</string>
+    <!-- Text of notification shown when the device's microphone is shared with a website (WebRTC) -->
+    <string name="mozac_feature_media_sharing_microphone_text">Puuduta mikrofoni kasutava kaardi avamiseks.</string>
+
+
+    <!-- Text of notification shown when the device's camera and microphone is shared with a website (WebRTC) -->
+    <string name="mozac_feature_media_sharing_camera_and_microphone_text">Puuduta mikrofoni ja kaamerat kasutava kaardi avamiseks.</string>
+
+
+    <!-- Text of reminder notification shown when the device's camera is shared with a website (WebRTC). %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_camera_reminder_text">Meeldetuletus: %1$s kasutab endiselt kaamerat. Puuduta kaardi avamiseks.</string>
+    <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Meeldetuletus: %1$s kasutab endiselt mikrofoni. Puuduta kaardi avamiseks.</string>
+    <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_microphone_reminder_text_2">Meeldetuletus: %1$s kasutab endiselt mikrofoni. Puuduta kaardi avamiseks.</string>
+    <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Meeldetuletus: %1$s kasutab endiselt mikrofoni ja kaamerat. Puuduta kaardi avamiseks.</string>
+    <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text_2">Meeldetuletus: %1$s kasutab endiselt mikrofoni ja kaamerat. Puuduta kaardi avamiseks.</string>
+
     <!--This is the title of the "play" action media shown in the media notification while web content is playing media. Clicking it will resume playing paused media. On most modern Android system only an icon is visible. But screen readers may read this title. -->
     <string name="mozac_feature_media_notification_action_play">Esita</string>
 
diff --git a/android-components/components/feature/media/src/main/res/values-rm/strings.xml b/android-components/components/feature/media/src/main/res/values-rm/strings.xml
index 7d7b70d08ef7..5564d782111c 100644
--- a/android-components/components/feature/media/src/main/res/values-rm/strings.xml
+++ b/android-components/components/feature/media/src/main/res/values-rm/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
     <!-- Name of the "notification channel" used for displaying media notification. See https://developer.android.com/training/notify-user/channels -->
     <string name="mozac_feature_media_notification_channel">Medias</string>
 
@@ -21,9 +21,14 @@
     <!-- Text of reminder notification shown when the device's camera is shared with a website (WebRTC). %1$s is a placeholder that will be replaced by the app name-->
     <string name="mozac_feature_media_sharing_camera_reminder_text">Promemoria: %1$s utilisescha anc adina tia camera. Tutgar per avrir il tab.</string>
     <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
-    <string name="mozac_feature_media_sharing_microphone_reminder_text">Promemoria: %1$s utilisescha anc adina tes microfon. Tutgar per avrir il tab</string>
+    <string name="mozac_feature_media_sharing_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Promemoria: %1$s utilisescha anc adina tes microfon. Tutgar per avrir il tab</string>
+    <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_microphone_reminder_text_2">Promemoria: %1$s utilisescha anc adina tes microfon. Tutgar per avrir il tab.</string>
+    <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Promemoria: %1$s utilisescha anc adina tes microfon e tia camera. Tutgar per avrir il tab</string>
+
     <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
-    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text">Promemoria: %1$s utilisescha anc adina tes microfon e tia camera. Tutgar per avrir il tab</string>
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text_2">Promemoria: %1$s utilisescha anc adina tes microfon e tia camera. Tutgar per avrir il tab.</string>
 
     <!--This is the title of the "play" action media shown in the media notification while web content is playing media. Clicking it will resume playing paused media. On most modern Android system only an icon is visible. But screen readers may read this title. -->
     <string name="mozac_feature_media_notification_action_play">Far ir</string>
diff --git a/android-components/components/feature/prompts/src/main/res/values-hy-rAM/strings.xml b/android-components/components/feature/prompts/src/main/res/values-hy-rAM/strings.xml
index 4af6100e87d7..8190f8d45b30 100644
--- a/android-components/components/feature/prompts/src/main/res/values-hy-rAM/strings.xml
+++ b/android-components/components/feature/prompts/src/main/res/values-hy-rAM/strings.xml
@@ -152,6 +152,9 @@
     <!-- Subtitle text displayed under the title of the save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_body">Քարտի համարը կկոդավորվի: Անվտանգության կոդը չի պահվի:</string>
 
+    <!-- Subtitle text displayed under the title of the saved card dialog. Parameter will be replaced by app name-->
+    <string name="mozac_feature_prompts_save_credit_card_prompt_body_2" tools:ignore="UnusedResources">%s-ը գաղտնագրում է ձեր քարտի համարը: Անվտանգության ձեր կոդը չի պահպանվի:</string>
+
     <!-- Address Autofill -->
     <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
     <string name="mozac_feature_prompts_select_address_2">Ընտրեք հասցե</string>
diff --git a/android-components/components/feature/prompts/src/main/res/values-rm/strings.xml b/android-components/components/feature/prompts/src/main/res/values-rm/strings.xml
index 29183ab85343..2b7976fc1042 100644
--- a/android-components/components/feature/prompts/src/main/res/values-rm/strings.xml
+++ b/android-components/components/feature/prompts/src/main/res/values-rm/strings.xml
@@ -18,6 +18,8 @@
     <string name="mozac_feature_prompt_password_hint">Pled-clav</string>
     <!-- Negative confirmation that we should not save the new or updated login -->
     <string name="mozac_feature_prompt_dont_save">Betg memorisar</string>
+    <!-- Negative confirmation that we should not save the new or updated login -->
+    <string name="mozac_feature_prompt_dont_save_2" tools:ignore="UnusedResources">Betg ussa</string>
     <!-- Negative confirmation that we should never save a login for this site -->
     <string name="mozac_feature_prompt_never_save">Mai memorisar</string>
     <!-- Negative confirmation that we should not save a credit card for this site -->
@@ -26,16 +28,26 @@
     <string name="mozac_feature_prompt_save_confirmation">Memorisar</string>
     <!-- Negative confirmation that we should not save the updated login -->
     <string name="mozac_feature_prompt_dont_update">Betg actualisar</string>
+    <!-- Negative confirmation that we should not save the updated login -->
+    <string name="mozac_feature_prompt_dont_update_2" tools:ignore="UnusedResources">Betg ussa</string>
     <!-- Positive confirmation that we should save the updated login -->
     <string name="mozac_feature_prompt_update_confirmation">Actualisar</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
     <string name="mozac_feature_prompt_error_empty_password">Il champ dal pled-clav na dastga betg esser vid</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_empty_password_2" tools:ignore="UnusedResources">Endatar in pled-clav</string>
+    <!-- Error text displayed underneath the login field when it is in an error case -->
     <string name="mozac_feature_prompt_error_unknown_cause">Impussibel da memorisar las datas d\'annunzia</string>
+    <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_unknown_cause_2" tools:ignore="UnusedResources">Impussibel da memorisar il pled-clav</string>
     <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new login. -->
     <string name="mozac_feature_prompt_login_save_headline">Memorisar questa infurmaziun d\'annunzia?</string>
+    <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new password. -->
+    <string name="mozac_feature_prompt_login_save_headline_2" tools:ignore="UnusedResources">Memorisar il pled-clav?</string>
     <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_update_headline">Actualisar questa infurmaziun d\'annunzia?</string>
+    <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the password. -->
+    <string name="mozac_feature_prompt_login_update_headline_2" tools:ignore="UnusedResources">Actualisar il pled-clav?</string>
     <!-- Prompt message displayed when app detects a user has entered a username for an existing login without a username and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_add_username_headline">Agiuntar in num d\'utilisader al pled-clav memorisà?</string>
     <!-- Text for a label for the field when prompt requesting a text is shown. -->
@@ -85,13 +97,22 @@
     <string name="mozac_feature_prompts_set_time">Drizzar l\'ura</string>
     <!-- Option in expanded select login prompt that links to login settings -->
     <string name="mozac_feature_prompts_manage_logins">Administrar las datas d\'annunzia</string>
+    <!-- Option in expanded select password prompt that links to password settings -->
+    <string name="mozac_feature_prompts_manage_logins_2" tools:ignore="UnusedResources">Administrar ils pleds-clav</string>
     <!-- Content description for expanding the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_expand_logins_content_description">Expander las datas d\'annunzia proponidas</string>
+    <!-- Content description for expanding the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_expand_logins_content_description_2" tools:ignore="UnusedResources">Extender ils pleds-clav memorisads</string>
     <!-- Content description for collapsing the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_collapse_logins_content_description">Reducir las datas d\'annunzia proponidas</string>
+    <!-- Content description for collapsing the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_collapse_logins_content_description_2" tools:ignore="UnusedResources">Reducir ils pleds-clav memorisads</string>
     <!-- Header for the select login prompt to allow users to fill a form with a saved login -->
     <string name="mozac_feature_prompts_saved_logins">Datas d\'annunzia proponidas</string>
 
+    <!-- Header for the select password prompt to allow users to fill a form with a saved password -->
+    <string name="mozac_feature_prompts_saved_logins_2" tools:ignore="UnusedResources">Pleds-clav memorisads</string>
+
     <!-- Content description for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
     <string name="mozac_feature_prompts_suggest_strong_password_content_description">Proponer in ferm pled-clav</string>
     <!-- Header for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
@@ -110,12 +131,20 @@
     <!-- Credit Card Autofill -->
     <!-- Header for the select credit card prompt to allow users to fill a form with a saved credit card. -->
     <string name="mozac_feature_prompts_select_credit_card">Tscherner ina carta da credit</string>
+    <!-- Header for the select card prompt to allow users to fill a form with a saved card. -->
+    <string name="mozac_feature_prompts_select_credit_card_2" tools:ignore="UnusedResources">Utilisar ina carta memorisada</string>
     <!-- Content description for expanding the select credit card options in the select credit card prompt. -->
     <string name="mozac_feature_prompts_expand_credit_cards_content_description">Expander las cartas da credit proponidas</string>
+    <!-- Content description for expanding the saved card options in the select card prompt. -->
+    <string name="mozac_feature_prompts_expand_credit_cards_content_description_2" tools:ignore="UnusedResources">Extender las cartas memorisadas</string>
     <!-- Content description for collapsing the select credit card options in the select credit prompt. -->
     <string name="mozac_feature_prompts_collapse_credit_cards_content_description">Reducir las cartas da credit proponidas</string>
+    <!-- Content description for collapsing the saved card options in the select prompt. -->
+    <string name="mozac_feature_prompts_collapse_credit_cards_content_description_2" tools:ignore="UnusedResources">Reducir las cartas memorisadas</string>
     <!-- Option in the expanded select credit card prompt that links to credit cards settings. -->
     <string name="mozac_feature_prompts_manage_credit_cards">Administrar las cartas da credit</string>
+    <!-- Option in the expanded select card prompt that links to cards settings. -->
+    <string name="mozac_feature_prompts_manage_credit_cards_2" tools:ignore="UnusedResources">Administrar las cartas</string>
     <!-- Text for the title of a save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_title">Memorisar questa carta a moda segira?</string>
     <!-- Text for the title of an update credit card dialog. -->
@@ -123,13 +152,20 @@
     <!-- Subtitle text displayed under the title of the save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_body">Il numer da la carta vegn criptà. Il code da segirezza na vegn betg memorisà.</string>
 
+    <!-- Subtitle text displayed under the title of the saved card dialog. Parameter will be replaced by app name-->
+    <string name="mozac_feature_prompts_save_credit_card_prompt_body_2" tools:ignore="UnusedResources">%s criptescha il numer da tia carta. Tes code da segirezza na vegn betg memorisà.</string>
+
     <!-- Address Autofill -->
     <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
     <string name="mozac_feature_prompts_select_address_2">Tscherner l\'adressa</string>
     <!-- Content description for expanding the select addresses options in the select address prompt. -->
     <string name="mozac_feature_prompts_expand_address_content_description">Expander las adressas proponidas</string>
+    <!-- Content description for expanding the saved addresses options in the select address prompt. -->
+    <string name="mozac_feature_prompts_expand_address_content_description_2" tools:ignore="UnusedResources">Extender las adressas proponidas</string>
     <!-- Content description for collapsing the select address options in the select address prompt. -->
     <string name="mozac_feature_prompts_collapse_address_content_description">Cumprimer las adressas proponidas</string>
+    <!-- Content description for collapsing the saved address options in the select address prompt. -->
+    <string name="mozac_feature_prompts_collapse_address_content_description_2" tools:ignore="UnusedResources">Reducir las adressas memorisadas</string>
     <!-- Text for the manage addresses button. -->
     <string name="mozac_feature_prompts_manage_address">Administrar las adressas</string>
 
diff --git a/fenix/app/src/main/res/values-azb/strings.xml b/fenix/app/src/main/res/values-azb/strings.xml
index dd604a09ab9c..37a4ebc5fce0 100644
--- a/fenix/app/src/main/res/values-azb/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-bg/strings.xml b/fenix/app/src/main/res/values-bg/strings.xml
index 04883adee5ec..90068f68de43 100644
--- a/fenix/app/src/main/res/values-bg/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-et/strings.xml b/fenix/app/src/main/res/values-et/strings.xml
index 998bcdd8f8b4..b7312a3b4029 100644
--- a/fenix/app/src/main/res/values-et/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-hy-rAM/strings.xml b/fenix/app/src/main/res/values-hy-rAM/strings.xml
index 50cd8346f91e..2e069658692a 100644
--- a/fenix/app/src/main/res/values-hy-rAM/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-kab/strings.xml b/fenix/app/src/main/res/values-kab/strings.xml
index bdb13932b350..9f1bd4710373 100644
--- a/fenix/app/src/main/res/values-kab/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-rm/strings.xml b/fenix/app/src/main/res/values-rm/strings.xml
index 9d9fbb672b23..efa79cba3148 100644
--- a/fenix/app/src/main/res/values-rm/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-sk/strings.xml b/fenix/app/src/main/res/values-sk/strings.xml
index 03d13eb44897..9be4f869c3d9 100644
--- a/fenix/app/src/main/res/values-sk/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-ug/strings.xml b/fenix/app/src/main/res/values-ug/strings.xml
index 27f068117454..d0b0e1fdfd1b 100644
--- a/fenix/app/src/main/res/values-ug/strings.xml
+++ b/fenix/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 1509e4504097de0ab054521f0f635c418eb6e9a3 Mon Sep 17 00:00:00 2001
From: MickeyMoz <sebastian@mozilla.com>
Date: Sat, 10 Feb 2024 02:31:44 +0000
Subject: [PATCH 08/51] Update GeckoView (Nightly) to 124.0.20240209214145.

---
 android-components/plugins/dependencies/src/main/java/Gecko.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/Gecko.kt b/android-components/plugins/dependencies/src/main/java/Gecko.kt
index 5763b408ca4b..fba0773afb05 100644
--- a/android-components/plugins/dependencies/src/main/java/Gecko.kt
+++ b/android-components/plugins/dependencies/src/main/java/Gecko.kt
@@ -9,7 +9,7 @@ object Gecko {
     /**
      * GeckoView Version.
      */
-    const val version = "124.0.20240208210654"
+    const val version = "124.0.20240209214145"
 
     /**
      * GeckoView channel

From c077ee9dbfed5c037a8606e4466dc31470cf3028 Mon Sep 17 00:00:00 2001
From: MickeyMoz <sebastian@mozilla.com>
Date: Sat, 10 Feb 2024 05:34:48 +0000
Subject: [PATCH 09/51] Update A-S to 124.20240210050349.

---
 .../plugins/dependencies/src/main/java/ApplicationServices.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt b/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
index 5dea01104e03..188a9b88fdf8 100644
--- a/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
+++ b/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // These lines are generated by android-components/automation/application-services-nightly-bump.py
-val VERSION = "124.20240209050256"
+val VERSION = "124.20240210050349"
 val CHANNEL = ApplicationServicesChannel.NIGHTLY
 
 object ApplicationServicesConfig {

From 283c9f56842712f9e6aeb5d4945e085b0529e169 Mon Sep 17 00:00:00 2001
From: MickeyMoz <sebastian@mozilla.com>
Date: Sat, 10 Feb 2024 13:05:06 +0000
Subject: [PATCH 10/51] Update GeckoView (Nightly) to 124.0.20240210094249.

---
 android-components/plugins/dependencies/src/main/java/Gecko.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/Gecko.kt b/android-components/plugins/dependencies/src/main/java/Gecko.kt
index fba0773afb05..62d9b0ca99b9 100644
--- a/android-components/plugins/dependencies/src/main/java/Gecko.kt
+++ b/android-components/plugins/dependencies/src/main/java/Gecko.kt
@@ -9,7 +9,7 @@ object Gecko {
     /**
      * GeckoView Version.
      */
-    const val version = "124.0.20240209214145"
+    const val version = "124.0.20240210094249"
 
     /**
      * GeckoView channel

From 0d564109bca765ceaeb64cba5d774e4810c0b011 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 11/51] Import translations from android-l10n

---
 .../addons/src/main/res/values-co/strings.xml |   4 +-
 .../addons/src/main/res/values-cy/strings.xml |   2 +-
 .../src/main/res/values-nb-rNO/strings.xml    |   4 +-
 .../src/main/res/values-et/strings.xml        |   5 +
 .../src/main/res/values-et/strings.xml        |   5 +
 .../media/src/main/res/values-co/strings.xml  |  13 +-
 .../src/main/res/values-nb-rNO/strings.xml    |  21 ++-
 .../src/main/res/values-co/strings.xml        |  36 +++++
 .../src/main/res/values-et/strings.xml        |  56 ++++++-
 .../src/main/res/values-nb-rNO/strings.xml    |  43 ++++++
 .../search/src/main/res/values-et/strings.xml |  12 ++
 .../src/main/res/values-cy/strings.xml        |   2 +-
 .../src/main/res/values-et/strings.xml        |   5 +
 fenix/app/src/main/res/values-co/strings.xml  | 146 +++++++++++++-----
 fenix/app/src/main/res/values-cy/strings.xml  |  22 +--
 fenix/app/src/main/res/values-da/strings.xml  |   3 +
 fenix/app/src/main/res/values-et/strings.xml  |  28 ++++
 fenix/app/src/main/res/values-fi/strings.xml  |   9 ++
 fenix/app/src/main/res/values-fur/strings.xml |   3 +
 fenix/app/src/main/res/values-kab/strings.xml |   5 +
 .../src/main/res/values-nb-rNO/strings.xml    | 110 +++++++------
 .../src/main/res/values-pt-rBR/strings.xml    |   2 +-
 fenix/app/src/main/res/values-uk/strings.xml  |   3 +
 fenix/app/src/main/res/values-vi/strings.xml  |   3 +
 .../app/src/main/res/values-cy/strings.xml    |   6 +-
 .../app/src/main/res/values-kab/strings.xml   |   2 +
 .../src/main/res/values-nb-rNO/strings.xml    |   8 +-
 27 files changed, 438 insertions(+), 120 deletions(-)
 create mode 100644 android-components/components/feature/fxsuggest/src/main/res/values-et/strings.xml
 create mode 100644 android-components/components/feature/search/src/main/res/values-et/strings.xml
 create mode 100644 android-components/components/ui/widgets/src/main/res/values-et/strings.xml

diff --git a/android-components/components/feature/addons/src/main/res/values-co/strings.xml b/android-components/components/feature/addons/src/main/res/values-co/strings.xml
index e299aec205d6..5d431f3afef4 100644
--- a/android-components/components/feature/addons/src/main/res/values-co/strings.xml
+++ b/android-components/components/feature/addons/src/main/res/values-co/strings.xml
@@ -22,6 +22,8 @@
      then we will show another collapsed entry saying "Access your data on 2 other domains". This entry it's for the plural case, when the add-on is accessing more than one extra domain.
      %1$d will be replaced by an integer indicating the number of additional domains for which this web extension is requesting permission. -->
     <string name="mozac_feature_addons_permissions_extra_domains_description_plural" tools:ignore="PluralsCandidate">Accede à i vostri dati per %1$d altri duminii</string>
+    <!-- Content description for a permission item, for an installed add-on details page. %1$s will be replaced with the permission text name, %2$d will be replaced with the permission position in the list and %3$d will be replaced with the total number of permissions in the list.Taking as an example "Read and modify privacy settings" the whole text will read Read and modify privacy settings, 2 of 6. -->
+    <string name="mozac_feature_addons_permissions_content_description_item">%1$s, %2$d nant’à %3$d</string>
     <!-- Description for tabs add-on permission. -->
     <string name="mozac_feature_addons_permissions_tabs_description">Accede à l’unghjette di u navigatore</string>
     <!-- Description for unlimited_storage permission. -->
@@ -75,7 +77,7 @@
     <!-- The author of an add-on. -->
     <string name="mozac_feature_addons_author">Autore</string>
     <!-- The authors of an add-on. -->
-    <string name="mozac_feature_addons_authors" moz:removedIn="120" tools:ignore="UnusedResources">Autori</string>
+    <string name="mozac_feature_addons_authors" moz:removedIn="123" tools:ignore="UnusedResources">Autori</string>
     <!-- The last date that the add-on was updated. -->
     <string name="mozac_feature_addons_last_updated">Ultima mudificazione</string>
     <!-- The developer website (Homepage) of the add-on. -->
diff --git a/android-components/components/feature/addons/src/main/res/values-cy/strings.xml b/android-components/components/feature/addons/src/main/res/values-cy/strings.xml
index b64909330d48..fbde39f7c1c5 100644
--- a/android-components/components/feature/addons/src/main/res/values-cy/strings.xml
+++ b/android-components/components/feature/addons/src/main/res/values-cy/strings.xml
@@ -229,7 +229,7 @@
     <!-- Text shown in not yet supported add-ons section in AddonsManagerAdapter - plural. %1$s is the number of unsupported add-ons -->
     <string name="mozac_feature_addons_unsupported_caption_plural">%1$s ychwanegyn</string>
     <!-- Text link to a sumo page for learning more about unsupported add-ons. -->
-    <string name="mozac_feature_addons_unsupported_learn_more">Dysgu rhagor</string>
+    <string name="mozac_feature_addons_unsupported_learn_more">Darllen rhagor</string>
     <!-- Displayed in the "Status" field for the updater when an add-on has been correctly updated. -->
     <string name="mozac_feature_addons_updater_status_successfully_updated">Wedi’i ddiweddaru’n llwyddiannus</string>
     <!-- Displayed in the "Status" field for the updater when an add-on has no updates available. -->
diff --git a/android-components/components/feature/addons/src/main/res/values-nb-rNO/strings.xml b/android-components/components/feature/addons/src/main/res/values-nb-rNO/strings.xml
index db87ef580d98..50cd987ac8e7 100644
--- a/android-components/components/feature/addons/src/main/res/values-nb-rNO/strings.xml
+++ b/android-components/components/feature/addons/src/main/res/values-nb-rNO/strings.xml
@@ -22,6 +22,8 @@
      then we will show another collapsed entry saying "Access your data on 2 other domains". This entry it's for the plural case, when the add-on is accessing more than one extra domain.
      %1$d will be replaced by an integer indicating the number of additional domains for which this web extension is requesting permission. -->
     <string name="mozac_feature_addons_permissions_extra_domains_description_plural" tools:ignore="PluralsCandidate">Få tilgang til dine data på %1$d andre domener</string>
+    <!-- Content description for a permission item, for an installed add-on details page. %1$s will be replaced with the permission text name, %2$d will be replaced with the permission position in the list and %3$d will be replaced with the total number of permissions in the list.Taking as an example "Read and modify privacy settings" the whole text will read Read and modify privacy settings, 2 of 6. -->
+    <string name="mozac_feature_addons_permissions_content_description_item">%1$s, %2$d av %3$d</string>
     <!-- Description for tabs add-on permission. -->
     <string name="mozac_feature_addons_permissions_tabs_description">Få tilgang til faner</string>
     <!-- Description for unlimited_storage permission. -->
@@ -75,7 +77,7 @@
     <!-- The author of an add-on. -->
     <string name="mozac_feature_addons_author">Utvikler</string>
     <!-- The authors of an add-on. -->
-    <string name="mozac_feature_addons_authors" moz:removedIn="120" tools:ignore="UnusedResources">Utviklere</string>
+    <string name="mozac_feature_addons_authors" moz:removedIn="123" tools:ignore="UnusedResources">Utviklere</string>
     <!-- The last date that the add-on was updated. -->
     <string name="mozac_feature_addons_last_updated">Sist oppdatert</string>
     <!-- The developer website (Homepage) of the add-on. -->
diff --git a/android-components/components/feature/app-links/src/main/res/values-et/strings.xml b/android-components/components/feature/app-links/src/main/res/values-et/strings.xml
index eb5d9e1f3dd2..3f5389f6c08d 100644
--- a/android-components/components/feature/app-links/src/main/res/values-et/strings.xml
+++ b/android-components/components/feature/app-links/src/main/res/values-et/strings.xml
@@ -4,6 +4,11 @@
     <string name="mozac_feature_applinks_open_in">Ava link äpiga…</string>
     <!-- The description to warn users that their private browsing session changes  -->
     <string name="mozac_feature_applinks_confirm_dialog_title">Kas soovid avada äpis? Sinu tegevus ei pruugi siis enam privaatne olla.</string>
+    <!-- The title of the prompt that warns users their normal browsing session is trying to open another app  -->
+    <string name="mozac_feature_applinks_normal_confirm_dialog_title">Ava teises äpis</string>
+    <!-- The message of the prompt to confirm with users that they want to open the link in another app
+    %s is a placeholder that will be replaced by the app name -->
+    <string name="mozac_feature_applinks_normal_confirm_dialog_message">Kas soovid selle sisu vaatamiseks %sist lahkuda?</string>
     <!-- Opens the selected time -->
     <string name="mozac_feature_applinks_confirm_dialog_confirm">Ava</string>
     <!-- Cancels the prompt -->
diff --git a/android-components/components/feature/fxsuggest/src/main/res/values-et/strings.xml b/android-components/components/feature/fxsuggest/src/main/res/values-et/strings.xml
new file mode 100644
index 000000000000..7c4597fbadad
--- /dev/null
+++ b/android-components/components/feature/fxsuggest/src/main/res/values-et/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- The description for a sponsored suggestion from Firefox Suggest. -->
+    <string name="sponsored_suggestion_description">Sponsitud</string>
+</resources>
diff --git a/android-components/components/feature/media/src/main/res/values-co/strings.xml b/android-components/components/feature/media/src/main/res/values-co/strings.xml
index ed34bcd9d7e3..cffda386cb2d 100644
--- a/android-components/components/feature/media/src/main/res/values-co/strings.xml
+++ b/android-components/components/feature/media/src/main/res/values-co/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
     <!-- Name of the "notification channel" used for displaying media notification. See https://developer.android.com/training/notify-user/channels -->
     <string name="mozac_feature_media_notification_channel">Multimedià</string>
 
@@ -19,11 +19,16 @@
 
 
     <!-- Text of reminder notification shown when the device's camera is shared with a website (WebRTC). %1$s is a placeholder that will be replaced by the app name-->
-    <string name="mozac_feature_media_sharing_camera_reminder_text">Ramentu : %1$s impiegheghja ancu u vostru apparechju-fotò. Picchichjà per apre l’unghjetta.</string>
+    <string name="mozac_feature_media_sharing_camera_reminder_text">Ramentu : %1$s impiegheghja sempre u vostru apparechju-fotò. Picchichjà per apre l’unghjetta.</string>
     <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
-    <string name="mozac_feature_media_sharing_microphone_reminder_text">Ramentu : %1$s impiegheghja sempre u vostru microfonu. Picchichjà per apre l’unghjetta</string>
+    <string name="mozac_feature_media_sharing_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Ramentu : %1$s impiegheghja sempre u vostru microfonu. Picchichjà per apre l’unghjetta</string>
+    <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_microphone_reminder_text_2">Ramentu : %1$s impiegheghja sempre u vostru microfonu. Picchichjà per apre l’unghjetta.</string>
+    <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Ramentu : %1$s impiegheghja sempre i vostri microfonu è apparechju-fotò. Picchichjà per apre l’unghjetta</string>
+
     <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
-    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text">Ramentu : %1$s impiegheghja ancu i vostri microfonu è apparechju-fotò. Picchichjà per apre l’unghjetta</string>
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text_2">Ramentu : %1$s impiegheghja sempre i vostri microfonu è apparechju-fotò. Picchichjà per apre l’unghjetta.</string>
 
     <!--This is the title of the "play" action media shown in the media notification while web content is playing media. Clicking it will resume playing paused media. On most modern Android system only an icon is visible. But screen readers may read this title. -->
     <string name="mozac_feature_media_notification_action_play">Lettura</string>
diff --git a/android-components/components/feature/media/src/main/res/values-nb-rNO/strings.xml b/android-components/components/feature/media/src/main/res/values-nb-rNO/strings.xml
index 3b7167d160fd..0ec9fd943af5 100644
--- a/android-components/components/feature/media/src/main/res/values-nb-rNO/strings.xml
+++ b/android-components/components/feature/media/src/main/res/values-nb-rNO/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
     <!-- Name of the "notification channel" used for displaying media notification. See https://developer.android.com/training/notify-user/channels -->
     <string name="mozac_feature_media_notification_channel">Medier</string>
 
@@ -10,6 +10,25 @@
     <!-- Title of notification shown when the device's camera and microphone is shared with a website (WebRTC) -->
     <string name="mozac_feature_media_sharing_camera_and_microphone">Kamera og mikrofon er på</string>
 
+    <!-- Text of notification shown when the device's camera is shared with a website (WebRTC) -->
+    <string name="mozac_feature_media_sharing_camera_text">Trykk for å åpne fanen som bruker kameraet ditt.</string>
+    <!-- Text of notification shown when the device's microphone is shared with a website (WebRTC) -->
+    <string name="mozac_feature_media_sharing_microphone_text">Trykk for å åpne fanen som bruker mikrofonen din.</string>
+    <!-- Text of notification shown when the device's camera and microphone is shared with a website (WebRTC) -->
+    <string name="mozac_feature_media_sharing_camera_and_microphone_text">Trykk for å åpne fanen som bruker mikrofonen og kameraet ditt.</string>
+
+
+    <!-- Text of reminder notification shown when the device's camera is shared with a website (WebRTC). %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_camera_reminder_text">Påminnelse: %1$s bruker fortsatt kameraet ditt. Trykk for å åpne fanen.</string>
+    <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Påminnelse: %1$s bruker fortsatt mikrofonen din. Trykk for å åpne fanen</string>
+    <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_microphone_reminder_text_2">Påminnelse: %1$s bruker fortsatt mikrofonen din. Trykk for å åpne fanen.</string>
+    <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Påminnelse: %1$s bruker fortsatt mikrofonen og kameraet ditt. Trykk for å åpne fanen</string>
+    <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text_2">Påminnelse: %1$s bruker fortsatt mikrofonen og kameraet ditt. Trykk for å åpne fanen.</string>
+
     <!--This is the title of the "play" action media shown in the media notification while web content is playing media. Clicking it will resume playing paused media. On most modern Android system only an icon is visible. But screen readers may read this title. -->
     <string name="mozac_feature_media_notification_action_play">Spill av</string>
 
diff --git a/android-components/components/feature/prompts/src/main/res/values-co/strings.xml b/android-components/components/feature/prompts/src/main/res/values-co/strings.xml
index 4396140b6a7e..7afbd91b65b0 100644
--- a/android-components/components/feature/prompts/src/main/res/values-co/strings.xml
+++ b/android-components/components/feature/prompts/src/main/res/values-co/strings.xml
@@ -18,6 +18,8 @@
     <string name="mozac_feature_prompt_password_hint">Parolla d’intesa</string>
     <!-- Negative confirmation that we should not save the new or updated login -->
     <string name="mozac_feature_prompt_dont_save">Ùn arregistrà micca</string>
+    <!-- Negative confirmation that we should not save the new or updated login -->
+    <string name="mozac_feature_prompt_dont_save_2" tools:ignore="UnusedResources">Micca subitu</string>
     <!-- Negative confirmation that we should never save a login for this site -->
     <string name="mozac_feature_prompt_never_save">Ùn arregistrà mai</string>
     <!-- Negative confirmation that we should not save a credit card for this site -->
@@ -26,16 +28,26 @@
     <string name="mozac_feature_prompt_save_confirmation">Arregistrà</string>
     <!-- Negative confirmation that we should not save the updated login -->
     <string name="mozac_feature_prompt_dont_update">Ùn micca rinnovà</string>
+    <!-- Negative confirmation that we should not save the updated login -->
+    <string name="mozac_feature_prompt_dont_update_2" tools:ignore="UnusedResources">Micca subitu</string>
     <!-- Positive confirmation that we should save the updated login -->
     <string name="mozac_feature_prompt_update_confirmation">Piglià in contu</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
     <string name="mozac_feature_prompt_error_empty_password">U campu di a parolla d’intesa ùn deve micca esse viotu</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_empty_password_2" tools:ignore="UnusedResources">Stampittate una parolla d’intesa</string>
+    <!-- Error text displayed underneath the login field when it is in an error case -->
     <string name="mozac_feature_prompt_error_unknown_cause">Impussibule d’arregistrà l’identificazione di cunnessione</string>
+    <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_unknown_cause_2" tools:ignore="UnusedResources">Ùn si pò micca arregistrà a parolla d’intesa</string>
     <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new login. -->
     <string name="mozac_feature_prompt_login_save_headline">Arregistrà st’identificazioni di cunnessione</string>
+    <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new password. -->
+    <string name="mozac_feature_prompt_login_save_headline_2" tools:ignore="UnusedResources">Arregistrà a parolla d’intesa ?</string>
     <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_update_headline">Mudificà st’identificazione di cunnessione ?</string>
+    <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the password. -->
+    <string name="mozac_feature_prompt_login_update_headline_2" tools:ignore="UnusedResources">Mudificà a parolla d’intesa ?</string>
     <!-- Prompt message displayed when app detects a user has entered a username for an existing login without a username and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_add_username_headline">Aghjunghje un nome d’utilizatore à a parolla d’intesa arregistrata ?</string>
     <!-- Text for a label for the field when prompt requesting a text is shown. -->
@@ -85,13 +97,22 @@
     <string name="mozac_feature_prompts_set_time">Sceglie l’ora</string>
     <!-- Option in expanded select login prompt that links to login settings -->
     <string name="mozac_feature_prompts_manage_logins">Urganizà l’identificazioni di cunnessione</string>
+    <!-- Option in expanded select password prompt that links to password settings -->
+    <string name="mozac_feature_prompts_manage_logins_2" tools:ignore="UnusedResources">Amministrà e parolle d’intesa</string>
     <!-- Content description for expanding the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_expand_logins_content_description">Spiegà l’identificazioni di cunnessione suggerite</string>
+    <!-- Content description for expanding the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_expand_logins_content_description_2" tools:ignore="UnusedResources">Spiegà e parolle d’intesa arregistrate</string>
     <!-- Content description for collapsing the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_collapse_logins_content_description">Ripiegà l’identificazioni di cunnessione suggerite</string>
+    <!-- Content description for collapsing the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_collapse_logins_content_description_2" tools:ignore="UnusedResources">Ripiegà e parolle d’intesa arregistrate</string>
     <!-- Header for the select login prompt to allow users to fill a form with a saved login -->
     <string name="mozac_feature_prompts_saved_logins">Identificazioni di cunnessione suggerite</string>
 
+    <!-- Header for the select password prompt to allow users to fill a form with a saved password -->
+    <string name="mozac_feature_prompts_saved_logins_2" tools:ignore="UnusedResources">Parolle d’intesa arregistrate</string>
+
     <!-- Content description for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
     <string name="mozac_feature_prompts_suggest_strong_password_content_description">Suggerisce una parolla d’intesa forte</string>
     <!-- Header for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
@@ -110,12 +131,20 @@
     <!-- Credit Card Autofill -->
     <!-- Header for the select credit card prompt to allow users to fill a form with a saved credit card. -->
     <string name="mozac_feature_prompts_select_credit_card">Selezziunà una carta bancaria</string>
+    <!-- Header for the select card prompt to allow users to fill a form with a saved card. -->
+    <string name="mozac_feature_prompts_select_credit_card_2" tools:ignore="UnusedResources">Impiegà una carta arregistrata</string>
     <!-- Content description for expanding the select credit card options in the select credit card prompt. -->
     <string name="mozac_feature_prompts_expand_credit_cards_content_description">Spiegà e carte bancarie suggerite</string>
+    <!-- Content description for expanding the saved card options in the select card prompt. -->
+    <string name="mozac_feature_prompts_expand_credit_cards_content_description_2" tools:ignore="UnusedResources">Spiegà e carte arregistrate</string>
     <!-- Content description for collapsing the select credit card options in the select credit prompt. -->
     <string name="mozac_feature_prompts_collapse_credit_cards_content_description">Ripiegà e carte bancarie suggerite</string>
+    <!-- Content description for collapsing the saved card options in the select prompt. -->
+    <string name="mozac_feature_prompts_collapse_credit_cards_content_description_2" tools:ignore="UnusedResources">Ripiegà e carte arregistrate</string>
     <!-- Option in the expanded select credit card prompt that links to credit cards settings. -->
     <string name="mozac_feature_prompts_manage_credit_cards">Urganizà e carte bancarie</string>
+    <!-- Option in the expanded select card prompt that links to cards settings. -->
+    <string name="mozac_feature_prompts_manage_credit_cards_2" tools:ignore="UnusedResources">Amministrà e carte</string>
     <!-- Text for the title of a save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_title">Arregistrà sta carta di manera sicura ?</string>
     <!-- Text for the title of an update credit card dialog. -->
@@ -123,13 +152,20 @@
     <!-- Subtitle text displayed under the title of the save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_body">U numeru di a carta serà cifratu. U codice di sicurità ùn serà micca arregistratu.</string>
 
+    <!-- Subtitle text displayed under the title of the saved card dialog. Parameter will be replaced by app name-->
+    <string name="mozac_feature_prompts_save_credit_card_prompt_body_2" tools:ignore="UnusedResources">%s cifra u vostru numeru di carta. U vostru codice di sicurità ùn serà micca arregistratu.</string>
+
     <!-- Address Autofill -->
     <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
     <string name="mozac_feature_prompts_select_address_2">Selezziunà un indirizzu</string>
     <!-- Content description for expanding the select addresses options in the select address prompt. -->
     <string name="mozac_feature_prompts_expand_address_content_description">Spiegà l’indirizzi suggeriti</string>
+    <!-- Content description for expanding the saved addresses options in the select address prompt. -->
+    <string name="mozac_feature_prompts_expand_address_content_description_2" tools:ignore="UnusedResources">Spiegà l’indirizzi arregistrati</string>
     <!-- Content description for collapsing the select address options in the select address prompt. -->
     <string name="mozac_feature_prompts_collapse_address_content_description">Ripiegà l’indirizzi suggeriti</string>
+    <!-- Content description for collapsing the saved address options in the select address prompt. -->
+    <string name="mozac_feature_prompts_collapse_address_content_description_2" tools:ignore="UnusedResources">Ripiegà l’indirizzi arregistrati</string>
     <!-- Text for the manage addresses button. -->
     <string name="mozac_feature_prompts_manage_address">Urganizà l’indirizzi</string>
 
diff --git a/android-components/components/feature/prompts/src/main/res/values-et/strings.xml b/android-components/components/feature/prompts/src/main/res/values-et/strings.xml
index 7f68c4554dec..5d0f71851a97 100644
--- a/android-components/components/feature/prompts/src/main/res/values-et/strings.xml
+++ b/android-components/components/feature/prompts/src/main/res/values-et/strings.xml
@@ -18,6 +18,8 @@
     <string name="mozac_feature_prompt_password_hint">Parool</string>
     <!-- Negative confirmation that we should not save the new or updated login -->
     <string name="mozac_feature_prompt_dont_save">Ära salvesta</string>
+    <!-- Negative confirmation that we should not save the new or updated login -->
+    <string name="mozac_feature_prompt_dont_save_2" tools:ignore="UnusedResources">Mitte praegu</string>
     <!-- Negative confirmation that we should never save a login for this site -->
     <string name="mozac_feature_prompt_never_save">Ära salvesta kunagi</string>
     <!-- Negative confirmation that we should not save a credit card for this site -->
@@ -26,16 +28,26 @@
     <string name="mozac_feature_prompt_save_confirmation">Salvesta</string>
     <!-- Negative confirmation that we should not save the updated login -->
     <string name="mozac_feature_prompt_dont_update">Ära uuenda</string>
+    <!-- Negative confirmation that we should not save the updated login -->
+    <string name="mozac_feature_prompt_dont_update_2" tools:ignore="UnusedResources">Mitte praegu</string>
     <!-- Positive confirmation that we should save the updated login -->
     <string name="mozac_feature_prompt_update_confirmation">Uuenda</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
     <string name="mozac_feature_prompt_error_empty_password">Parooli väli ei tohi olla tühi</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_empty_password_2" tools:ignore="UnusedResources">Sisesta parool</string>
+    <!-- Error text displayed underneath the login field when it is in an error case -->
     <string name="mozac_feature_prompt_error_unknown_cause">Kasutajatunnuste salvestamine pole võimalik</string>
+    <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_unknown_cause_2" tools:ignore="UnusedResources">Parooli ei saa salvestada</string>
     <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new login. -->
     <string name="mozac_feature_prompt_login_save_headline">Kas salvestada need kasutajatunnused?</string>
+    <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new password. -->
+    <string name="mozac_feature_prompt_login_save_headline_2" tools:ignore="UnusedResources">Salvesta parool?</string>
     <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_update_headline">Kas uuendada kasutajatunnused?</string>
+    <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the password. -->
+    <string name="mozac_feature_prompt_login_update_headline_2" tools:ignore="UnusedResources">Uuenda parool?</string>
     <!-- Prompt message displayed when app detects a user has entered a username for an existing login without a username and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_add_username_headline">Kas lisada salvestatud paroolile kasutajanimi?</string>
     <!-- Text for a label for the field when prompt requesting a text is shown. -->
@@ -81,15 +93,34 @@
     <string name="mozac_feature_prompts_nov">nov</string>
     <!-- December month of the year (short description), used on the month chooser dialog. -->
     <string name="mozac_feature_prompts_dec">dets</string>
+    <!-- Title of the time picker dialog. -->
+    <string name="mozac_feature_prompts_set_time">Aja määramine</string>
     <!-- Option in expanded select login prompt that links to login settings -->
     <string name="mozac_feature_prompts_manage_logins">Halda kasutajakontosid</string>
+    <!-- Option in expanded select password prompt that links to password settings -->
+    <string name="mozac_feature_prompts_manage_logins_2" tools:ignore="UnusedResources">Halda paroole</string>
     <!-- Content description for expanding the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_expand_logins_content_description">Laienda soovitatud kasutajakontosid</string>
+    <!-- Content description for expanding the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_expand_logins_content_description_2" tools:ignore="UnusedResources">Laienda salvestatud paroolid</string>
     <!-- Content description for collapsing the saved logins options in the select login prompt -->
-    <string name="mozac_feature_prompts_collapse_logins_content_description">Ahenda soovitatud kasutajakontosid</string>
+    <string name="mozac_feature_prompts_collapse_logins_content_description">Ahenda soovitatud kasutajakontod</string>
+    <!-- Content description for collapsing the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_collapse_logins_content_description_2" tools:ignore="UnusedResources">Ahenda salvestatud paroolid</string>
     <!-- Header for the select login prompt to allow users to fill a form with a saved login -->
     <string name="mozac_feature_prompts_saved_logins">Soovitatud kasutajakontod</string>
 
+    <!-- Header for the select password prompt to allow users to fill a form with a saved password -->
+    <string name="mozac_feature_prompts_saved_logins_2" tools:ignore="UnusedResources">Salvestatud paroolid</string>
+
+    <!-- Content description for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
+    <string name="mozac_feature_prompts_suggest_strong_password_content_description">Soovita tugevat parooli</string>
+    <!-- Header for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
+    <string name="mozac_feature_prompts_suggest_strong_password">Soovita tugevat parooli</string>
+
+    <!-- Title for using the suggest strong password confirmation dialog. %1$s will be replaced with the generated password -->
+    <string name="mozac_feature_prompts_suggest_strong_password_message">Kasuta tugevat parooli %1$s</string>
+
     <!-- Strings shown in a dialog that appear when users try to refresh a certain kind of webpages -->
     <string name="mozac_feature_prompt_repost_title">Kas saata andmed sellele saidile uuesti?</string>
     <string name="mozac_feature_prompt_repost_message">Selle lehe värskendamine võib dubleerida hiljutisi toiminguid, nagu makse saatmine või kommentaari postitamine.</string>
@@ -101,12 +132,20 @@
     <!-- Credit Card Autofill -->
     <!-- Header for the select credit card prompt to allow users to fill a form with a saved credit card. -->
     <string name="mozac_feature_prompts_select_credit_card">Vali krediitkaart</string>
+    <!-- Header for the select card prompt to allow users to fill a form with a saved card. -->
+    <string name="mozac_feature_prompts_select_credit_card_2" tools:ignore="UnusedResources">Kasuta salvestatud kaarti</string>
     <!-- Content description for expanding the select credit card options in the select credit card prompt. -->
     <string name="mozac_feature_prompts_expand_credit_cards_content_description">Laienda soovitatud krediitkaarte</string>
+    <!-- Content description for expanding the saved card options in the select card prompt. -->
+    <string name="mozac_feature_prompts_expand_credit_cards_content_description_2" tools:ignore="UnusedResources">Laienda salvestatud kaardid</string>
     <!-- Content description for collapsing the select credit card options in the select credit prompt. -->
     <string name="mozac_feature_prompts_collapse_credit_cards_content_description">Ahenda soovitatud krediitkaarte</string>
+    <!-- Content description for collapsing the saved card options in the select prompt. -->
+    <string name="mozac_feature_prompts_collapse_credit_cards_content_description_2" tools:ignore="UnusedResources">Ahenda salvestatud kaardid</string>
     <!-- Option in the expanded select credit card prompt that links to credit cards settings. -->
     <string name="mozac_feature_prompts_manage_credit_cards">Halda krediitkaarte</string>
+    <!-- Option in the expanded select card prompt that links to cards settings. -->
+    <string name="mozac_feature_prompts_manage_credit_cards_2" tools:ignore="UnusedResources">Halda kaarte</string>
     <!-- Text for the title of a save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_title">Kas salvestada see kaart turvaliselt?</string>
     <!-- Text for the title of an update credit card dialog. -->
@@ -114,13 +153,28 @@
     <!-- Subtitle text displayed under the title of the save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_body">Kaardi number krüptitakse. Turvakoodi ei salvestata.</string>
 
+    <!-- Subtitle text displayed under the title of the saved card dialog. Parameter will be replaced by app name-->
+    <string name="mozac_feature_prompts_save_credit_card_prompt_body_2" tools:ignore="UnusedResources">%s krüpteerib kaardi numbri. Turvakoodi ei salvestata.</string>
+
     <!-- Address Autofill -->
     <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
     <string name="mozac_feature_prompts_select_address_2">Vali aadress</string>
     <!-- Content description for expanding the select addresses options in the select address prompt. -->
     <string name="mozac_feature_prompts_expand_address_content_description">Laienda soovitatud aadressid</string>
+    <!-- Content description for expanding the saved addresses options in the select address prompt. -->
+    <string name="mozac_feature_prompts_expand_address_content_description_2" tools:ignore="UnusedResources">Laienda salvestatud aadressid</string>
     <!-- Content description for collapsing the select address options in the select address prompt. -->
     <string name="mozac_feature_prompts_collapse_address_content_description">Ahenda soovitatud aadressid</string>
+    <!-- Content description for collapsing the saved address options in the select address prompt. -->
+    <string name="mozac_feature_prompts_collapse_address_content_description_2" tools:ignore="UnusedResources">Ahenda salvestatud aadressid</string>
     <!-- Text for the manage addresses button. -->
     <string name="mozac_feature_prompts_manage_address">Halda aadresse</string>
+
+    <!-- Federated Credential Management prompts -->
+    <!--Content description for the Account picture in the Select Account FedCM prompt -->
+    <string name="mozac_feature_prompts_account_picture">Konto pilt</string>
+    <!-- Text for the positive button of the Identity Credential dialogs. -->
+    <string name="mozac_feature_prompts_identity_credentials_continue">Jätka</string>
+    <!-- Text for the cancel button of the Identity Credential dialogs. -->
+    <string name="mozac_feature_prompts_identity_credentials_cancel">Loobu</string>
 </resources>
diff --git a/android-components/components/feature/prompts/src/main/res/values-nb-rNO/strings.xml b/android-components/components/feature/prompts/src/main/res/values-nb-rNO/strings.xml
index cf3ce8418676..a35beb81bff7 100644
--- a/android-components/components/feature/prompts/src/main/res/values-nb-rNO/strings.xml
+++ b/android-components/components/feature/prompts/src/main/res/values-nb-rNO/strings.xml
@@ -18,6 +18,8 @@
     <string name="mozac_feature_prompt_password_hint">Passord</string>
     <!-- Negative confirmation that we should not save the new or updated login -->
     <string name="mozac_feature_prompt_dont_save">Ikke lagre</string>
+    <!-- Negative confirmation that we should not save the new or updated login -->
+    <string name="mozac_feature_prompt_dont_save_2" tools:ignore="UnusedResources">Ikke nå</string>
     <!-- Negative confirmation that we should never save a login for this site -->
     <string name="mozac_feature_prompt_never_save">Lagre aldri</string>
     <!-- Negative confirmation that we should not save a credit card for this site -->
@@ -26,16 +28,26 @@
     <string name="mozac_feature_prompt_save_confirmation">Lagre</string>
     <!-- Negative confirmation that we should not save the updated login -->
     <string name="mozac_feature_prompt_dont_update">Ikke oppdater</string>
+    <!-- Negative confirmation that we should not save the updated login -->
+    <string name="mozac_feature_prompt_dont_update_2" tools:ignore="UnusedResources">Ikke nå</string>
     <!-- Positive confirmation that we should save the updated login -->
     <string name="mozac_feature_prompt_update_confirmation">Oppdater</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
     <string name="mozac_feature_prompt_error_empty_password">Passordfeltet kan ikke stå tomt</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_empty_password_2" tools:ignore="UnusedResources">Skriv inn et passord</string>
+    <!-- Error text displayed underneath the login field when it is in an error case -->
     <string name="mozac_feature_prompt_error_unknown_cause">Klarte ikke å lagre innloggingen</string>
+    <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_unknown_cause_2" tools:ignore="UnusedResources">Kan ikke lagre passordet</string>
     <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new login. -->
     <string name="mozac_feature_prompt_login_save_headline">Lagre denne innloggingen?</string>
+    <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new password. -->
+    <string name="mozac_feature_prompt_login_save_headline_2" tools:ignore="UnusedResources">Lagre passord?</string>
     <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_update_headline">Vil du oppdatere denne innloggingen?</string>
+    <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the password. -->
+    <string name="mozac_feature_prompt_login_update_headline_2" tools:ignore="UnusedResources">Oppdatere passord?</string>
     <!-- Prompt message displayed when app detects a user has entered a username for an existing login without a username and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_add_username_headline">Vil du legge til brukernavn til lagret passord?</string>
     <!-- Text for a label for the field when prompt requesting a text is shown. -->
@@ -85,13 +97,29 @@
     <string name="mozac_feature_prompts_set_time">Angi tid</string>
     <!-- Option in expanded select login prompt that links to login settings -->
     <string name="mozac_feature_prompts_manage_logins">Behandle innlogginger</string>
+    <!-- Option in expanded select password prompt that links to password settings -->
+    <string name="mozac_feature_prompts_manage_logins_2" tools:ignore="UnusedResources">Behandle passord</string>
     <!-- Content description for expanding the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_expand_logins_content_description">Utvid foreslåtte innlogginger</string>
+    <!-- Content description for expanding the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_expand_logins_content_description_2" tools:ignore="UnusedResources">Utvid lagrede passord</string>
     <!-- Content description for collapsing the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_collapse_logins_content_description">Slå sammen foreslåtte innlogginger</string>
+    <!-- Content description for collapsing the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_collapse_logins_content_description_2" tools:ignore="UnusedResources">Skjul lagrede passord</string>
     <!-- Header for the select login prompt to allow users to fill a form with a saved login -->
     <string name="mozac_feature_prompts_saved_logins">Foreslåtte innlogginger</string>
 
+    <!-- Header for the select password prompt to allow users to fill a form with a saved password -->
+    <string name="mozac_feature_prompts_saved_logins_2" tools:ignore="UnusedResources">Lagrede passord</string>
+
+    <!-- Content description for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
+    <string name="mozac_feature_prompts_suggest_strong_password_content_description">Foreslå sterkt passord</string>
+    <!-- Header for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
+    <string name="mozac_feature_prompts_suggest_strong_password">Foreslå sterkt passord</string>
+    <!-- Title for using the suggest strong password confirmation dialog. %1$s will be replaced with the generated password -->
+    <string name="mozac_feature_prompts_suggest_strong_password_message">Bruk sterkt passord: %1$s</string>
+
     <!-- Strings shown in a dialog that appear when users try to refresh a certain kind of webpages -->
     <string name="mozac_feature_prompt_repost_title">Send data på nytt til dette nettstedet?</string>
     <string name="mozac_feature_prompt_repost_message">Oppdatering av denne siden kan duplisere nylige handlinger, for eksempel å sende en betaling eller legge igjen en kommentar to ganger.</string>
@@ -103,12 +131,20 @@
     <!-- Credit Card Autofill -->
     <!-- Header for the select credit card prompt to allow users to fill a form with a saved credit card. -->
     <string name="mozac_feature_prompts_select_credit_card">Velg betalingskort</string>
+    <!-- Header for the select card prompt to allow users to fill a form with a saved card. -->
+    <string name="mozac_feature_prompts_select_credit_card_2" tools:ignore="UnusedResources">Bruk lagret kort</string>
     <!-- Content description for expanding the select credit card options in the select credit card prompt. -->
     <string name="mozac_feature_prompts_expand_credit_cards_content_description">Utvid foreslåtte betalingskort</string>
+    <!-- Content description for expanding the saved card options in the select card prompt. -->
+    <string name="mozac_feature_prompts_expand_credit_cards_content_description_2" tools:ignore="UnusedResources">Utvid lagrede kort</string>
     <!-- Content description for collapsing the select credit card options in the select credit prompt. -->
     <string name="mozac_feature_prompts_collapse_credit_cards_content_description">Slå sammen foreslåtte betalingskort</string>
+    <!-- Content description for collapsing the saved card options in the select prompt. -->
+    <string name="mozac_feature_prompts_collapse_credit_cards_content_description_2" tools:ignore="UnusedResources">Skjul lagrede kort</string>
     <!-- Option in the expanded select credit card prompt that links to credit cards settings. -->
     <string name="mozac_feature_prompts_manage_credit_cards">Behandle betalingskort</string>
+    <!-- Option in the expanded select card prompt that links to cards settings. -->
+    <string name="mozac_feature_prompts_manage_credit_cards_2" tools:ignore="UnusedResources">Behandle kort</string>
     <!-- Text for the title of a save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_title">Lagre dette kortet trygt?</string>
     <!-- Text for the title of an update credit card dialog. -->
@@ -116,13 +152,20 @@
     <!-- Subtitle text displayed under the title of the save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_body">Kortnummer vil bli kryptert. Sikkerhetskoden blir ikke lagret.</string>
 
+    <!-- Subtitle text displayed under the title of the saved card dialog. Parameter will be replaced by app name-->
+    <string name="mozac_feature_prompts_save_credit_card_prompt_body_2" tools:ignore="UnusedResources">%s krypterer kortnummeret ditt. Sikkerhetskoden din blir ikke lagret.</string>
+
     <!-- Address Autofill -->
     <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
     <string name="mozac_feature_prompts_select_address_2">Velg adresse</string>
     <!-- Content description for expanding the select addresses options in the select address prompt. -->
     <string name="mozac_feature_prompts_expand_address_content_description">Utvid foreslåtte adresser</string>
+    <!-- Content description for expanding the saved addresses options in the select address prompt. -->
+    <string name="mozac_feature_prompts_expand_address_content_description_2" tools:ignore="UnusedResources">Utvid lagrede adresser</string>
     <!-- Content description for collapsing the select address options in the select address prompt. -->
     <string name="mozac_feature_prompts_collapse_address_content_description">Slå sammen foreslåtte adresser</string>
+    <!-- Content description for collapsing the saved address options in the select address prompt. -->
+    <string name="mozac_feature_prompts_collapse_address_content_description_2" tools:ignore="UnusedResources">Skjul lagrede adresser</string>
     <!-- Text for the manage addresses button. -->
     <string name="mozac_feature_prompts_manage_address">Behandle adresser</string>
 
diff --git a/android-components/components/feature/search/src/main/res/values-et/strings.xml b/android-components/components/feature/search/src/main/res/values-et/strings.xml
new file mode 100644
index 000000000000..077b8a047c95
--- /dev/null
+++ b/android-components/components/feature/search/src/main/res/values-et/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Search Widget -->
+    <!-- Content description for searching with a widget. The first parameter is the name of the application.-->
+    <string name="search_widget_content_description">Ava uus kaart %1$sis</string>
+    <!-- Text preview for smaller sized widgets -->
+    <string name="search_widget_text_short">Otsing</string>
+    <!-- Text preview for larger sized widgets -->
+    <string name="search_widget_text_long">Otsi veebist</string>
+    <!-- Content description (not visible, for screen readers etc.): Voice search -->
+    <string name="search_widget_voice">Häälotsing</string>
+</resources>
diff --git a/android-components/components/feature/sitepermissions/src/main/res/values-cy/strings.xml b/android-components/components/feature/sitepermissions/src/main/res/values-cy/strings.xml
index 270644b6c908..e937f6fc0a99 100644
--- a/android-components/components/feature/sitepermissions/src/main/res/values-cy/strings.xml
+++ b/android-components/components/feature/sitepermissions/src/main/res/values-cy/strings.xml
@@ -44,5 +44,5 @@
     <!-- Text for a negative button in the storage access permission request dialog. This button will not give access to this permission. -->
     <string name="mozac_feature_sitepermissions_storage_access_not_allow">Rhwystro</string>
     <!-- Clickable text that will open a new tab navigating the user to online documentation about specific features. -->
-    <string name="mozac_feature_sitepermissions_learn_more_title">Dysgu rhagor</string>
+    <string name="mozac_feature_sitepermissions_learn_more_title">Darllen rhagor</string>
 </resources>
diff --git a/android-components/components/ui/widgets/src/main/res/values-et/strings.xml b/android-components/components/ui/widgets/src/main/res/values-et/strings.xml
new file mode 100644
index 000000000000..b77f8fe2fc7d
--- /dev/null
+++ b/android-components/components/ui/widgets/src/main/res/values-et/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Text for confirmation "snackbar" shown after copying an image to the clipboard. -->
+    <string name="snackbar_copy_image_to_clipboard_confirmation">Pilt kopeeriti vahemällu</string>
+</resources>
diff --git a/fenix/app/src/main/res/values-co/strings.xml b/fenix/app/src/main/res/values-co/strings.xml
index a83ceb26785f..b233b981bff3 100644
--- a/fenix/app/src/main/res/values-co/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-cy/strings.xml b/fenix/app/src/main/res/values-cy/strings.xml
index bc5f735d6a5f..c86dbcc717f0 100644
--- a/fenix/app/src/main/res/values-cy/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-da/strings.xml b/fenix/app/src/main/res/values-da/strings.xml
index 6c206ff7bb78..1ecf296b4580 100644
--- a/fenix/app/src/main/res/values-da/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-et/strings.xml b/fenix/app/src/main/res/values-et/strings.xml
index b7312a3b4029..c0aef4b9c76a 100644
--- a/fenix/app/src/main/res/values-et/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-fi/strings.xml b/fenix/app/src/main/res/values-fi/strings.xml
index 01e16e803004..2ca2abadd915 100644
--- a/fenix/app/src/main/res/values-fi/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-fur/strings.xml b/fenix/app/src/main/res/values-fur/strings.xml
index c01770abef49..1360e9100785 100644
--- a/fenix/app/src/main/res/values-fur/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-kab/strings.xml b/fenix/app/src/main/res/values-kab/strings.xml
index 9f1bd4710373..099ae1be7691 100644
--- a/fenix/app/src/main/res/values-kab/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-nb-rNO/strings.xml b/fenix/app/src/main/res/values-nb-rNO/strings.xml
index c6bf155c6c7b..86347ea1afd6 100644
--- a/fenix/app/src/main/res/values-nb-rNO/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-pt-rBR/strings.xml b/fenix/app/src/main/res/values-pt-rBR/strings.xml
index e32bdb52c3bf..ad71b6832367 100644
--- a/fenix/app/src/main/res/values-pt-rBR/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-uk/strings.xml b/fenix/app/src/main/res/values-uk/strings.xml
index 90504d5dafd8..b9f1506f0a69 100644
--- a/fenix/app/src/main/res/values-uk/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-vi/strings.xml b/fenix/app/src/main/res/values-vi/strings.xml
index 736a82c332fc..356737044dd8 100644
--- a/fenix/app/src/main/res/values-vi/strings.xml
+++ b/fenix/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. -->
diff --git a/focus-android/app/src/main/res/values-cy/strings.xml b/focus-android/app/src/main/res/values-cy/strings.xml
index 67cc2aca970d..95a8cdd2dfdb 100644
--- a/focus-android/app/src/main/res/values-cy/strings.xml
+++ b/focus-android/app/src/main/res/values-cy/strings.xml
@@ -251,7 +251,7 @@
     <string name="preference_autocomplete_title_remove">Tynnu URLau cyfaddas</string>
 
     <!-- A link to SUMO at autocomplete settings. -->
-    <string name="preference_autocomplete_learn_more">Dysgu rhagor</string>
+    <string name="preference_autocomplete_learn_more">Darllen rhagor</string>
 
     <!-- Preference summary: Custom (user-defined) autocomplete URLs. -->
     <string name="preference_autocomplete_custom_summary">Ychwanegu a rheoli URLs awtogwblhau cyfaddas.</string>
@@ -344,7 +344,7 @@
     <string name="preference_mozilla_telemetry2">Anfon data defnydd</string>
 
     <!-- A link to SUMO at the end of the summary (preference_mozilla_telemetry_summary2) of the "Send anonymous usage data" setting. -->
-    <string name="preference_mozilla_telemetry_summary">Dysgu rhagor</string>
+    <string name="preference_mozilla_telemetry_summary">Darllen rhagor</string>
 
     <!-- %1$s will be replaced with the name of the app (e.g. Firefox Focus) -->
     <string name="preference_mozilla_telemetry_summary2">Mae Mozilla\'n ceisio casglu dim ond yr hyn sydd ei angen arnom i ddarparu a gwella %1$s ar gyfer pawb.</string>
@@ -832,7 +832,7 @@
     <string name="preference_studies_summary">Efallai y bydd Firefox yn gosod 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 when some changes are made on studies -->
     <string name="studies_restart_app">Bydd yr ap yn cau er mwyn gosod y newidiadau</string>
diff --git a/focus-android/app/src/main/res/values-kab/strings.xml b/focus-android/app/src/main/res/values-kab/strings.xml
index 5e7559129c7b..2d5b089a0b06 100644
--- a/focus-android/app/src/main/res/values-kab/strings.xml
+++ b/focus-android/app/src/main/res/values-kab/strings.xml
@@ -86,6 +86,8 @@
 
     <string name="notification_erase_title_android_14">Sfeḍ amazray n tunigin?</string>
 
+    <string name="notification_erase_text_android_14">Sit ɣef telɣut-a neɣ kkes-itt i wakken ad tekkseḍ azray-ik n tunigin s wudem aɣelsan.</string>
+
     <string name="notification_erase_text">Sfeḍ amazray n tunigin</string>
 
     <!-- Notification action to open Focus and resume the current browsing session. -->
diff --git a/focus-android/app/src/main/res/values-nb-rNO/strings.xml b/focus-android/app/src/main/res/values-nb-rNO/strings.xml
index 2e61c7e582d1..e5257880a9bd 100644
--- a/focus-android/app/src/main/res/values-nb-rNO/strings.xml
+++ b/focus-android/app/src/main/res/values-nb-rNO/strings.xml
@@ -53,7 +53,6 @@
     <string name="menu_remove_from_shortcuts">Fjern fra snarveier</string>
 
     <!-- Menu item: Shows information about features and changes that are new to this version -->
-    <string name="menu_whats_new" moz:RemovedIn="116" tools:ignore="UnusedResources">Hva er nytt</string>
     <string name="menu_settings">Innstillinger</string>
     <string name="menu_about">Om</string>
     <string name="menu_help">Hjelp</string>
@@ -84,10 +83,9 @@
          sharing an URL. -->
     <string name="share_dialog_title">Del via</string>
 
-    <!-- While a browsing session is active (in the foreground or background) we will show a notification
-         so that the user doesn't forget about the website still being open. This text is shown in
-         the notification. Clicking the notification will have the same effect as clicking the "erase"
-         button in the application. -->
+    <string name="notification_erase_title_android_14">Slett nettleserhistorikk?</string>
+    <string name="notification_erase_text_android_14">Trykk eller fjern dette varselet for å slette nettleserhistorikken din på en sikker måte.</string>
+
     <string name="notification_erase_text">Slett nettleserhistorikk</string>
 
     <!-- Notification action to open Focus and resume the current browsing session. -->

From 744c77429a98851b7a481860cf2cef0ea16a4b6a Mon Sep 17 00:00:00 2001
From: MickeyMoz <sebastian@mozilla.com>
Date: Sun, 11 Feb 2024 00:48:36 +0000
Subject: [PATCH 12/51] Update GeckoView (Nightly) to 124.0.20240210210518.

---
 android-components/plugins/dependencies/src/main/java/Gecko.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/Gecko.kt b/android-components/plugins/dependencies/src/main/java/Gecko.kt
index 62d9b0ca99b9..68e3ede7293f 100644
--- a/android-components/plugins/dependencies/src/main/java/Gecko.kt
+++ b/android-components/plugins/dependencies/src/main/java/Gecko.kt
@@ -9,7 +9,7 @@ object Gecko {
     /**
      * GeckoView Version.
      */
-    const val version = "124.0.20240210094249"
+    const val version = "124.0.20240210210518"
 
     /**
      * GeckoView channel

From 2d69fcc0c174e8f2e6541db7df542ed3c9f20033 Mon Sep 17 00:00:00 2001
From: MickeyMoz <sebastian@mozilla.com>
Date: Sun, 11 Feb 2024 12:24:26 +0000
Subject: [PATCH 13/51] Update GeckoView (Nightly) to 124.0.20240211090343.

---
 android-components/plugins/dependencies/src/main/java/Gecko.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/Gecko.kt b/android-components/plugins/dependencies/src/main/java/Gecko.kt
index 68e3ede7293f..6151e8e4691c 100644
--- a/android-components/plugins/dependencies/src/main/java/Gecko.kt
+++ b/android-components/plugins/dependencies/src/main/java/Gecko.kt
@@ -9,7 +9,7 @@ object Gecko {
     /**
      * GeckoView Version.
      */
-    const val version = "124.0.20240210210518"
+    const val version = "124.0.20240211090343"
 
     /**
      * GeckoView channel

From 01938092c80bdfc3c2c512de8021daa3717b8bc6 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 14/51] Import translations from android-l10n

---
 .../addons/src/main/res/values-eo/strings.xml |   2 +
 .../addons/src/main/res/values-ja/strings.xml |   4 +-
 .../addons/src/main/res/values-pl/strings.xml |   4 +-
 .../media/src/main/res/values-eo/strings.xml  |  11 +-
 .../media/src/main/res/values-ja/strings.xml  |  11 +-
 .../media/src/main/res/values-pl/strings.xml  |  11 +-
 .../src/main/res/values-eo/strings.xml        |  36 ++++
 .../src/main/res/values-ja/strings.xml        |  36 ++++
 .../src/main/res/values-pl/strings.xml        |  36 ++++
 fenix/app/src/main/res/values-azb/strings.xml |  47 ++++++
 fenix/app/src/main/res/values-co/strings.xml  |   2 +-
 fenix/app/src/main/res/values-cs/strings.xml  |   3 +
 fenix/app/src/main/res/values-dsb/strings.xml |   3 +
 .../src/main/res/values-en-rGB/strings.xml    |   3 +
 fenix/app/src/main/res/values-eo/strings.xml  | 154 ++++++++++++-----
 fenix/app/src/main/res/values-is/strings.xml  |   3 +
 fenix/app/src/main/res/values-ja/strings.xml  | 154 ++++++++++++-----
 fenix/app/src/main/res/values-pl/strings.xml  | 156 +++++++++++++-----
 fenix/app/src/main/res/values-rm/strings.xml  |  81 +++++++++
 fenix/app/src/main/res/values-tg/strings.xml  |  49 ++++++
 fenix/app/src/main/res/values-tr/strings.xml  |   3 +
 .../app/src/main/res/values-eo/strings.xml    |   8 +-
 .../app/src/main/res/values-pl/strings.xml    |  10 +-
 23 files changed, 677 insertions(+), 150 deletions(-)

diff --git a/android-components/components/feature/addons/src/main/res/values-eo/strings.xml b/android-components/components/feature/addons/src/main/res/values-eo/strings.xml
index 83ffd79ad57b..affab0359586 100644
--- a/android-components/components/feature/addons/src/main/res/values-eo/strings.xml
+++ b/android-components/components/feature/addons/src/main/res/values-eo/strings.xml
@@ -22,6 +22,8 @@
      then we will show another collapsed entry saying "Access your data on 2 other domains". This entry it's for the plural case, when the add-on is accessing more than one extra domain.
      %1$d will be replaced by an integer indicating the number of additional domains for which this web extension is requesting permission. -->
     <string name="mozac_feature_addons_permissions_extra_domains_description_plural" tools:ignore="PluralsCandidate">Aliri viajn datumojn de %1$d aliaj nomregnoj</string>
+    <!-- Content description for a permission item, for an installed add-on details page. %1$s will be replaced with the permission text name, %2$d will be replaced with the permission position in the list and %3$d will be replaced with the total number of permissions in the list.Taking as an example "Read and modify privacy settings" the whole text will read Read and modify privacy settings, 2 of 6. -->
+    <string name="mozac_feature_addons_permissions_content_description_item">%1$s, %2$d el %3$d</string>
     <!-- Description for tabs add-on permission. -->
     <string name="mozac_feature_addons_permissions_tabs_description">Aliri retumilajn langetojn</string>
     <!-- Description for unlimited_storage permission. -->
diff --git a/android-components/components/feature/addons/src/main/res/values-ja/strings.xml b/android-components/components/feature/addons/src/main/res/values-ja/strings.xml
index f03d79b68a83..2027ae146f51 100644
--- a/android-components/components/feature/addons/src/main/res/values-ja/strings.xml
+++ b/android-components/components/feature/addons/src/main/res/values-ja/strings.xml
@@ -22,6 +22,8 @@
      then we will show another collapsed entry saying "Access your data on 2 other domains". This entry it's for the plural case, when the add-on is accessing more than one extra domain.
      %1$d will be replaced by an integer indicating the number of additional domains for which this web extension is requesting permission. -->
     <string name="mozac_feature_addons_permissions_extra_domains_description_plural" tools:ignore="PluralsCandidate">その他 %1$d ドメイン上のデータへのアクセス</string>
+    <!-- Content description for a permission item, for an installed add-on details page. %1$s will be replaced with the permission text name, %2$d will be replaced with the permission position in the list and %3$d will be replaced with the total number of permissions in the list.Taking as an example "Read and modify privacy settings" the whole text will read Read and modify privacy settings, 2 of 6. -->
+    <string name="mozac_feature_addons_permissions_content_description_item">%1$s、%2$d / %3$d</string>
     <!-- Description for tabs add-on permission. -->
     <string name="mozac_feature_addons_permissions_tabs_description">ブラウザーのタブへのアクセス</string>
     <!-- Description for unlimited_storage permission. -->
@@ -75,7 +77,7 @@
     <!-- The author of an add-on. -->
     <string name="mozac_feature_addons_author">作者</string>
     <!-- The authors of an add-on. -->
-    <string name="mozac_feature_addons_authors" moz:removedIn="120" tools:ignore="UnusedResources">作者</string>
+    <string name="mozac_feature_addons_authors" moz:removedIn="123" tools:ignore="UnusedResources">作者</string>
     <!-- The last date that the add-on was updated. -->
     <string name="mozac_feature_addons_last_updated">最終更新日時</string>
     <!-- The developer website (Homepage) of the add-on. -->
diff --git a/android-components/components/feature/addons/src/main/res/values-pl/strings.xml b/android-components/components/feature/addons/src/main/res/values-pl/strings.xml
index d6632d7d8f4b..7dd3bbc45556 100644
--- a/android-components/components/feature/addons/src/main/res/values-pl/strings.xml
+++ b/android-components/components/feature/addons/src/main/res/values-pl/strings.xml
@@ -22,6 +22,8 @@
      then we will show another collapsed entry saying "Access your data on 2 other domains". This entry it's for the plural case, when the add-on is accessing more than one extra domain.
      %1$d will be replaced by an integer indicating the number of additional domains for which this web extension is requesting permission. -->
     <string name="mozac_feature_addons_permissions_extra_domains_description_plural" tools:ignore="PluralsCandidate">Dostęp do danych użytkownika w %1$d innych domenach</string>
+    <!-- Content description for a permission item, for an installed add-on details page. %1$s will be replaced with the permission text name, %2$d will be replaced with the permission position in the list and %3$d will be replaced with the total number of permissions in the list.Taking as an example "Read and modify privacy settings" the whole text will read Read and modify privacy settings, 2 of 6. -->
+    <string name="mozac_feature_addons_permissions_content_description_item">%1$s, %2$d z %3$d</string>
     <!-- Description for tabs add-on permission. -->
     <string name="mozac_feature_addons_permissions_tabs_description">Dostęp do kart przeglądarki</string>
     <!-- Description for unlimited_storage permission. -->
@@ -75,7 +77,7 @@
     <!-- The author of an add-on. -->
     <string name="mozac_feature_addons_author">Autor</string>
     <!-- The authors of an add-on. -->
-    <string name="mozac_feature_addons_authors" moz:removedIn="120" tools:ignore="UnusedResources">Autorzy</string>
+    <string name="mozac_feature_addons_authors" moz:removedIn="123" tools:ignore="UnusedResources">Autorzy</string>
     <!-- The last date that the add-on was updated. -->
     <string name="mozac_feature_addons_last_updated">Ostatnia aktualizacja</string>
     <!-- The developer website (Homepage) of the add-on. -->
diff --git a/android-components/components/feature/media/src/main/res/values-eo/strings.xml b/android-components/components/feature/media/src/main/res/values-eo/strings.xml
index 640a56aef077..7c98f55eec30 100644
--- a/android-components/components/feature/media/src/main/res/values-eo/strings.xml
+++ b/android-components/components/feature/media/src/main/res/values-eo/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
 
     <!-- Name of the "notification channel" used for displaying media notification. See https://developer.android.com/training/notify-user/channels -->
     <string name="mozac_feature_media_notification_channel">Aŭdvidaĵo</string>
@@ -22,10 +22,15 @@
     <!-- Text of reminder notification shown when the device's camera is shared with a website (WebRTC). %1$s is a placeholder that will be replaced by the app name-->
     <string name="mozac_feature_media_sharing_camera_reminder_text">Memorigo: %1$s ankoraŭ uzas vian filmilon. Tuŝetu por malfermi la langeton.</string>
     <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
-    <string name="mozac_feature_media_sharing_microphone_reminder_text">Memorigo: %1$s ankoraŭ uzas vian mikrofonon. Tuŝetu por malfermi la langeton.</string>
+    <string name="mozac_feature_media_sharing_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Memorigo: %1$s ankoraŭ uzas vian mikrofonon. Tuŝetu por malfermi la langeton.</string>
+
+    <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_microphone_reminder_text_2">Memorigo: %1$s ankoraŭ uzas vian mikrofonon. Tuŝetu por malfermi la langeton.</string>
+    <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Memorigo: %1$s ankoraŭ uzas vian mikrofonon kaj filmilon. Tuŝetu por malfermi la langeton.</string>
 
     <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
-    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text">Memorigo: %1$s ankoraŭ uzas vian mikrofonon kaj filmilon. Tuŝetu por malfermi la langeton.</string>
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text_2">Memorigo: %1$s ankoraŭ uzas vian mikrofonon kaj filmilon. Tuŝetu por malfermi la langeton.</string>
 
     <!--This is the title of the "play" action media shown in the media notification while web content is playing media. Clicking it will resume playing paused media. On most modern Android system only an icon is visible. But screen readers may read this title. -->
     <string name="mozac_feature_media_notification_action_play">Ludi</string>
diff --git a/android-components/components/feature/media/src/main/res/values-ja/strings.xml b/android-components/components/feature/media/src/main/res/values-ja/strings.xml
index 5ad6081ea8ba..c1cfbc4c7d80 100644
--- a/android-components/components/feature/media/src/main/res/values-ja/strings.xml
+++ b/android-components/components/feature/media/src/main/res/values-ja/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
     <!-- Name of the "notification channel" used for displaying media notification. See https://developer.android.com/training/notify-user/channels -->
     <string name="mozac_feature_media_notification_channel">メディア</string>
 
@@ -23,9 +23,14 @@
     <!-- Text of reminder notification shown when the device's camera is shared with a website (WebRTC). %1$s is a placeholder that will be replaced by the app name-->
     <string name="mozac_feature_media_sharing_camera_reminder_text">通知: %1$s がまだカメラを使用しています。タップしてタブを開いてください。</string>
     <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
-    <string name="mozac_feature_media_sharing_microphone_reminder_text">通知: %1$s がまだマイクを使用しています。タップしてタブを開いてください。</string>
+    <string name="mozac_feature_media_sharing_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">通知: %1$s がまだマイクを使用しています。タップしてタブを開いてください。</string>
+    <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_microphone_reminder_text_2">通知: %1$s がまだマイクを使用しています。タップしてタブを開いてください。</string>
+    <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">通知: %1$s がまだマイクとカメラを使用しています。タップしてタブを開いてください。</string>
+
     <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
-    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text">通知: %1$s がまだマイクとカメラを使用しています。タップしてタブを開いてください。</string>
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text_2">通知: %1$s がまだマイクとカメラを使用しています。タップしてタブを開いてください。</string>
 
     <!--This is the title of the "play" action media shown in the media notification while web content is playing media. Clicking it will resume playing paused media. On most modern Android system only an icon is visible. But screen readers may read this title. -->
     <string name="mozac_feature_media_notification_action_play">再生</string>
diff --git a/android-components/components/feature/media/src/main/res/values-pl/strings.xml b/android-components/components/feature/media/src/main/res/values-pl/strings.xml
index a0c7466ff71d..9c22f9a90b51 100644
--- a/android-components/components/feature/media/src/main/res/values-pl/strings.xml
+++ b/android-components/components/feature/media/src/main/res/values-pl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
     <!-- Name of the "notification channel" used for displaying media notification. See https://developer.android.com/training/notify-user/channels -->
     <string name="mozac_feature_media_notification_channel">Multimedia</string>
 
@@ -21,9 +21,14 @@
     <!-- Text of reminder notification shown when the device's camera is shared with a website (WebRTC). %1$s is a placeholder that will be replaced by the app name-->
     <string name="mozac_feature_media_sharing_camera_reminder_text">Przypomnienie: %1$s nadal korzysta z aparatu. Stuknij, aby otworzyć kartę.</string>
     <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
-    <string name="mozac_feature_media_sharing_microphone_reminder_text">Przypomnienie: %1$s nadal korzysta z mikrofonu. Stuknij, aby otworzyć kartę</string>
+    <string name="mozac_feature_media_sharing_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Przypomnienie: %1$s nadal korzysta z mikrofonu. Stuknij, aby otworzyć kartę</string>
+    <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_microphone_reminder_text_2">Przypomnienie: %1$s nadal korzysta z mikrofonu. Stuknij, aby otworzyć kartę.</string>
+    <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Przypomnienie: %1$s nadal korzysta z mikrofonu i aparatu. Stuknij, aby otworzyć kartę</string>
+
     <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
-    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text">Przypomnienie: %1$s nadal korzysta z mikrofonu i aparatu. Stuknij, aby otworzyć kartę</string>
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text_2">Przypomnienie: %1$s nadal korzysta z mikrofonu i aparatu. Stuknij, aby otworzyć kartę.</string>
 
     <!--This is the title of the "play" action media shown in the media notification while web content is playing media. Clicking it will resume playing paused media. On most modern Android system only an icon is visible. But screen readers may read this title. -->
     <string name="mozac_feature_media_notification_action_play">Odtwórz</string>
diff --git a/android-components/components/feature/prompts/src/main/res/values-eo/strings.xml b/android-components/components/feature/prompts/src/main/res/values-eo/strings.xml
index 781e22d78aa7..a6cc86761b9c 100644
--- a/android-components/components/feature/prompts/src/main/res/values-eo/strings.xml
+++ b/android-components/components/feature/prompts/src/main/res/values-eo/strings.xml
@@ -18,6 +18,8 @@
     <string name="mozac_feature_prompt_password_hint">Pasvorto</string>
     <!-- Negative confirmation that we should not save the new or updated login -->
     <string name="mozac_feature_prompt_dont_save">Ne konservi</string>
+    <!-- Negative confirmation that we should not save the new or updated login -->
+    <string name="mozac_feature_prompt_dont_save_2" tools:ignore="UnusedResources">Ne nun</string>
     <!-- Negative confirmation that we should never save a login for this site -->
     <string name="mozac_feature_prompt_never_save">Neniam konservi</string>
     <!-- Negative confirmation that we should not save a credit card for this site -->
@@ -26,16 +28,26 @@
     <string name="mozac_feature_prompt_save_confirmation">Konservi</string>
     <!-- Negative confirmation that we should not save the updated login -->
     <string name="mozac_feature_prompt_dont_update">Ne ĝisdatigi</string>
+    <!-- Negative confirmation that we should not save the updated login -->
+    <string name="mozac_feature_prompt_dont_update_2" tools:ignore="UnusedResources">Ne nun</string>
     <!-- Positive confirmation that we should save the updated login -->
     <string name="mozac_feature_prompt_update_confirmation">Ĝisdatigi</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
     <string name="mozac_feature_prompt_error_empty_password">La pasvorto ne povas esti malplena</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_empty_password_2" tools:ignore="UnusedResources">Tajpu pasvorton</string>
+    <!-- Error text displayed underneath the login field when it is in an error case -->
     <string name="mozac_feature_prompt_error_unknown_cause">Ne eblas konservi legitimilon</string>
+    <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_unknown_cause_2" tools:ignore="UnusedResources">Ne eblas konservi la pasvorton</string>
     <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new login. -->
     <string name="mozac_feature_prompt_login_save_headline">Ĉu konservi tiun ĉi legitimilon?</string>
+    <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new password. -->
+    <string name="mozac_feature_prompt_login_save_headline_2" tools:ignore="UnusedResources">Ĉu konservi pasvorton?</string>
     <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_update_headline">Ĉu ĝisdatigi tiun ĉi akreditilon?</string>
+    <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the password. -->
+    <string name="mozac_feature_prompt_login_update_headline_2" tools:ignore="UnusedResources">Ĉu ĝisdatigi pasvorton?</string>
     <!-- Prompt message displayed when app detects a user has entered a username for an existing login without a username and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_add_username_headline">Ĉu aldoni nomon de uzanto al la konservita pasvorto?</string>
     <!-- Text for a label for the field when prompt requesting a text is shown. -->
@@ -85,13 +97,22 @@
     <string name="mozac_feature_prompts_set_time">Difini horon</string>
     <!-- Option in expanded select login prompt that links to login settings -->
     <string name="mozac_feature_prompts_manage_logins">Administri legitimilojn</string>
+    <!-- Option in expanded select password prompt that links to password settings -->
+    <string name="mozac_feature_prompts_manage_logins_2" tools:ignore="UnusedResources">Administri pasvortojn</string>
     <!-- Content description for expanding the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_expand_logins_content_description">Malfaldi sugestitajn legitimilojn</string>
+    <!-- Content description for expanding the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_expand_logins_content_description_2" tools:ignore="UnusedResources">Malfaldi konservitajn pasvortojn</string>
     <!-- Content description for collapsing the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_collapse_logins_content_description">Faldi sugestitajn legitimilojn</string>
+    <!-- Content description for collapsing the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_collapse_logins_content_description_2" tools:ignore="UnusedResources">Faldi konservitajn pasvortojn</string>
     <!-- Header for the select login prompt to allow users to fill a form with a saved login -->
     <string name="mozac_feature_prompts_saved_logins">Sugestitaj legitimiloj</string>
 
+    <!-- Header for the select password prompt to allow users to fill a form with a saved password -->
+    <string name="mozac_feature_prompts_saved_logins_2" tools:ignore="UnusedResources">Konservitaj pasvortoj</string>
+
     <!-- Content description for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
     <string name="mozac_feature_prompts_suggest_strong_password_content_description">Sugesti fortan pasvorton</string>
     <!-- Header for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
@@ -110,12 +131,20 @@
     <!-- Credit Card Autofill -->
     <!-- Header for the select credit card prompt to allow users to fill a form with a saved credit card. -->
     <string name="mozac_feature_prompts_select_credit_card">Elekti kreditkarton</string>
+    <!-- Header for the select card prompt to allow users to fill a form with a saved card. -->
+    <string name="mozac_feature_prompts_select_credit_card_2" tools:ignore="UnusedResources">Uzi konservitan karton</string>
     <!-- Content description for expanding the select credit card options in the select credit card prompt. -->
     <string name="mozac_feature_prompts_expand_credit_cards_content_description">Malfaldi sugestitajn kreditkartojn</string>
+    <!-- Content description for expanding the saved card options in the select card prompt. -->
+    <string name="mozac_feature_prompts_expand_credit_cards_content_description_2" tools:ignore="UnusedResources">Elporti konservitajn pasvortojn</string>
     <!-- Content description for collapsing the select credit card options in the select credit prompt. -->
     <string name="mozac_feature_prompts_collapse_credit_cards_content_description">Faldi sugestitajn kreditkartojn</string>
+    <!-- Content description for collapsing the saved card options in the select prompt. -->
+    <string name="mozac_feature_prompts_collapse_credit_cards_content_description_2" tools:ignore="UnusedResources">Faldi konservitajn kartojn</string>
     <!-- Option in the expanded select credit card prompt that links to credit cards settings. -->
     <string name="mozac_feature_prompts_manage_credit_cards">Administri kreditkartojn</string>
+    <!-- Option in the expanded select card prompt that links to cards settings. -->
+    <string name="mozac_feature_prompts_manage_credit_cards_2" tools:ignore="UnusedResources">Administri kartojn</string>
     <!-- Text for the title of a save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_title">Ĉu sekure konservi tiun ĉi kreditkarton?</string>
     <!-- Text for the title of an update credit card dialog. -->
@@ -123,13 +152,20 @@
     <!-- Subtitle text displayed under the title of the save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_body">La numero de kreditkaro estos ĉifrita. La sekureca kodo ne estos konservita.</string>
 
+    <!-- Subtitle text displayed under the title of the saved card dialog. Parameter will be replaced by app name-->
+    <string name="mozac_feature_prompts_save_credit_card_prompt_body_2" tools:ignore="UnusedResources">%s ĉifras vian numeron de karto. Via sekureca kodo ne estos konservita.</string>
+
     <!-- Address Autofill -->
     <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
     <string name="mozac_feature_prompts_select_address_2">Elekti adresojn</string>
     <!-- Content description for expanding the select addresses options in the select address prompt. -->
     <string name="mozac_feature_prompts_expand_address_content_description">Malfaldi sugestitajn adresojn</string>
+    <!-- Content description for expanding the saved addresses options in the select address prompt. -->
+    <string name="mozac_feature_prompts_expand_address_content_description_2" tools:ignore="UnusedResources">Malfaldi konservitajn adresojn</string>
     <!-- Content description for collapsing the select address options in the select address prompt. -->
     <string name="mozac_feature_prompts_collapse_address_content_description">Faldi sugestitajn adresojn</string>
+    <!-- Content description for collapsing the saved address options in the select address prompt. -->
+    <string name="mozac_feature_prompts_collapse_address_content_description_2" tools:ignore="UnusedResources">Faldi konservitajn adresojn</string>
     <!-- Text for the manage addresses button. -->
     <string name="mozac_feature_prompts_manage_address">Administri adresojn</string>
 
diff --git a/android-components/components/feature/prompts/src/main/res/values-ja/strings.xml b/android-components/components/feature/prompts/src/main/res/values-ja/strings.xml
index d72f03a9a1f7..9b0ba18b329c 100644
--- a/android-components/components/feature/prompts/src/main/res/values-ja/strings.xml
+++ b/android-components/components/feature/prompts/src/main/res/values-ja/strings.xml
@@ -26,6 +26,8 @@
 
     <!-- Negative confirmation that we should not save the new or updated login -->
     <string name="mozac_feature_prompt_dont_save">保存しない</string>
+    <!-- Negative confirmation that we should not save the new or updated login -->
+    <string name="mozac_feature_prompt_dont_save_2" tools:ignore="UnusedResources">後で</string>
     <!-- Negative confirmation that we should never save a login for this site -->
     <string name="mozac_feature_prompt_never_save">保存しない</string>
     <!-- Negative confirmation that we should not save a credit card for this site -->
@@ -34,16 +36,26 @@
     <string name="mozac_feature_prompt_save_confirmation">保存する</string>
     <!-- Negative confirmation that we should not save the updated login -->
     <string name="mozac_feature_prompt_dont_update">更新しない</string>
+    <!-- Negative confirmation that we should not save the updated login -->
+    <string name="mozac_feature_prompt_dont_update_2" tools:ignore="UnusedResources">後で</string>
     <!-- Positive confirmation that we should save the updated login -->
     <string name="mozac_feature_prompt_update_confirmation">更新</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
     <string name="mozac_feature_prompt_error_empty_password">パスワードを入力してください</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_empty_password_2" tools:ignore="UnusedResources">パスワードを入力してください</string>
+    <!-- Error text displayed underneath the login field when it is in an error case -->
     <string name="mozac_feature_prompt_error_unknown_cause">ログイン情報を保存できません</string>
+    <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_unknown_cause_2" tools:ignore="UnusedResources">パスワードを保存できません</string>
     <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new login. -->
     <string name="mozac_feature_prompt_login_save_headline">このログイン情報を保存しますか？</string>
+    <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new password. -->
+    <string name="mozac_feature_prompt_login_save_headline_2" tools:ignore="UnusedResources">パスワードを保存しますか？</string>
     <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_update_headline">このログイン情報を更新しますか？</string>
+    <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the password. -->
+    <string name="mozac_feature_prompt_login_update_headline_2" tools:ignore="UnusedResources">パスワードを更新しますか？</string>
     <!-- Prompt message displayed when app detects a user has entered a username for an existing login without a username and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_add_username_headline">保存されたパスワードにユーザー名を追加しますか？</string>
     <!-- Text for a label for the field when prompt requesting a text is shown. -->
@@ -97,13 +109,22 @@
     <string name="mozac_feature_prompts_set_time">時刻の設定</string>
     <!-- Option in expanded select login prompt that links to login settings -->
     <string name="mozac_feature_prompts_manage_logins">ログイン情報の管理</string>
+    <!-- Option in expanded select password prompt that links to password settings -->
+    <string name="mozac_feature_prompts_manage_logins_2" tools:ignore="UnusedResources">パスワードを管理</string>
     <!-- Content description for expanding the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_expand_logins_content_description">提案されたログイン情報を展開</string>
+    <!-- Content description for expanding the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_expand_logins_content_description_2" tools:ignore="UnusedResources">保存したパスワードを展開</string>
     <!-- Content description for collapsing the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_collapse_logins_content_description">提案されたログイン情報を折りたたむ</string>
+    <!-- Content description for collapsing the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_collapse_logins_content_description_2" tools:ignore="UnusedResources">保存したパスワードを折りたたむ</string>
     <!-- Header for the select login prompt to allow users to fill a form with a saved login -->
     <string name="mozac_feature_prompts_saved_logins">提案されたログイン情報</string>
 
+    <!-- Header for the select password prompt to allow users to fill a form with a saved password -->
+    <string name="mozac_feature_prompts_saved_logins_2" tools:ignore="UnusedResources">保存されたパスワード</string>
+
     <!-- Content description for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
     <string name="mozac_feature_prompts_suggest_strong_password_content_description">強固なパスワードを提案する</string>
     <!-- Header for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
@@ -122,12 +143,20 @@
     <!-- Credit Card Autofill -->
     <!-- Header for the select credit card prompt to allow users to fill a form with a saved credit card. -->
     <string name="mozac_feature_prompts_select_credit_card">クレジットカードを選択</string>
+    <!-- Header for the select card prompt to allow users to fill a form with a saved card. -->
+    <string name="mozac_feature_prompts_select_credit_card_2" tools:ignore="UnusedResources">保存したカード情報を使用</string>
     <!-- Content description for expanding the select credit card options in the select credit card prompt. -->
     <string name="mozac_feature_prompts_expand_credit_cards_content_description">提案されたクレジットカード情報を展開する</string>
+    <!-- Content description for expanding the saved card options in the select card prompt. -->
+    <string name="mozac_feature_prompts_expand_credit_cards_content_description_2" tools:ignore="UnusedResources">保存したカード情報を展開</string>
     <!-- Content description for collapsing the select credit card options in the select credit prompt. -->
     <string name="mozac_feature_prompts_collapse_credit_cards_content_description">提案されたクレジットカード情報を折りたたむ</string>
+    <!-- Content description for collapsing the saved card options in the select prompt. -->
+    <string name="mozac_feature_prompts_collapse_credit_cards_content_description_2" tools:ignore="UnusedResources">保存したカード情報を折りたたむ</string>
     <!-- Option in the expanded select credit card prompt that links to credit cards settings. -->
     <string name="mozac_feature_prompts_manage_credit_cards">クレジットカードを管理</string>
+    <!-- Option in the expanded select card prompt that links to cards settings. -->
+    <string name="mozac_feature_prompts_manage_credit_cards_2" tools:ignore="UnusedResources">カード情報を管理</string>
     <!-- Text for the title of a save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_title">このカードの情報を安全に保存しますか？</string>
     <!-- Text for the title of an update credit card dialog. -->
@@ -135,13 +164,20 @@
     <!-- Subtitle text displayed under the title of the save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_body">カード番号は暗号化されます。セキュリティコードは保存されません。</string>
 
+    <!-- Subtitle text displayed under the title of the saved card dialog. Parameter will be replaced by app name-->
+    <string name="mozac_feature_prompts_save_credit_card_prompt_body_2" tools:ignore="UnusedResources">%s がカード番号を暗号化します。セキュリティコードは保存しません。</string>
+
     <!-- Address Autofill -->
     <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
     <string name="mozac_feature_prompts_select_address_2">アドレスの選択</string>
     <!-- Content description for expanding the select addresses options in the select address prompt. -->
     <string name="mozac_feature_prompts_expand_address_content_description">提案されたアドレス情報を展開する</string>
+    <!-- Content description for expanding the saved addresses options in the select address prompt. -->
+    <string name="mozac_feature_prompts_expand_address_content_description_2" tools:ignore="UnusedResources">保存したアドレス情報を展開</string>
     <!-- Content description for collapsing the select address options in the select address prompt. -->
     <string name="mozac_feature_prompts_collapse_address_content_description">提案されたアドレス情報を折りたたむ</string>
+    <!-- Content description for collapsing the saved address options in the select address prompt. -->
+    <string name="mozac_feature_prompts_collapse_address_content_description_2" tools:ignore="UnusedResources">保存したアドレス情報を折りたたむ</string>
     <!-- Text for the manage addresses button. -->
     <string name="mozac_feature_prompts_manage_address">アドレスの管理</string>
 
diff --git a/android-components/components/feature/prompts/src/main/res/values-pl/strings.xml b/android-components/components/feature/prompts/src/main/res/values-pl/strings.xml
index c11e34a80a3c..92107e968fd8 100644
--- a/android-components/components/feature/prompts/src/main/res/values-pl/strings.xml
+++ b/android-components/components/feature/prompts/src/main/res/values-pl/strings.xml
@@ -18,6 +18,8 @@
     <string name="mozac_feature_prompt_password_hint">Hasło</string>
     <!-- Negative confirmation that we should not save the new or updated login -->
     <string name="mozac_feature_prompt_dont_save">Nie zachowuj</string>
+    <!-- Negative confirmation that we should not save the new or updated login -->
+    <string name="mozac_feature_prompt_dont_save_2" tools:ignore="UnusedResources">Nie teraz</string>
     <!-- Negative confirmation that we should never save a login for this site -->
     <string name="mozac_feature_prompt_never_save">Nigdy nie zachowuj</string>
     <!-- Negative confirmation that we should not save a credit card for this site -->
@@ -26,16 +28,26 @@
     <string name="mozac_feature_prompt_save_confirmation">Zachowaj</string>
     <!-- Negative confirmation that we should not save the updated login -->
     <string name="mozac_feature_prompt_dont_update">Nie aktualizuj</string>
+    <!-- Negative confirmation that we should not save the updated login -->
+    <string name="mozac_feature_prompt_dont_update_2" tools:ignore="UnusedResources">Nie teraz</string>
     <!-- Positive confirmation that we should save the updated login -->
     <string name="mozac_feature_prompt_update_confirmation">Aktualizuj</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
     <string name="mozac_feature_prompt_error_empty_password">Pole hasła nie może być puste</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_empty_password_2" tools:ignore="UnusedResources">Wpisz hasło</string>
+    <!-- Error text displayed underneath the login field when it is in an error case -->
     <string name="mozac_feature_prompt_error_unknown_cause">Nie można zachować danych logowania</string>
+    <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_unknown_cause_2" tools:ignore="UnusedResources">Nie można zachować hasła</string>
     <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new login. -->
     <string name="mozac_feature_prompt_login_save_headline">Czy zachować te dane logowania?</string>
+    <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new password. -->
+    <string name="mozac_feature_prompt_login_save_headline_2" tools:ignore="UnusedResources">Czy zachować hasło?</string>
     <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_update_headline">Czy zaktualizować te dane logowania?</string>
+    <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the password. -->
+    <string name="mozac_feature_prompt_login_update_headline_2" tools:ignore="UnusedResources">Czy zaktualizować hasło?</string>
     <!-- Prompt message displayed when app detects a user has entered a username for an existing login without a username and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_add_username_headline">Czy dodać nazwę użytkownika do zachowanego hasła?</string>
     <!-- Text for a label for the field when prompt requesting a text is shown. -->
@@ -85,13 +97,22 @@
     <string name="mozac_feature_prompts_set_time">Ustaw czas</string>
     <!-- Option in expanded select login prompt that links to login settings -->
     <string name="mozac_feature_prompts_manage_logins">Zarządzaj danymi logowania</string>
+    <!-- Option in expanded select password prompt that links to password settings -->
+    <string name="mozac_feature_prompts_manage_logins_2" tools:ignore="UnusedResources">Zarządzaj hasłami</string>
     <!-- Content description for expanding the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_expand_logins_content_description">Rozwiń podpowiadane dane logowania</string>
+    <!-- Content description for expanding the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_expand_logins_content_description_2" tools:ignore="UnusedResources">Rozwiń zachowane hasła</string>
     <!-- Content description for collapsing the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_collapse_logins_content_description">Zwiń podpowiadane dane logowania</string>
+    <!-- Content description for collapsing the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_collapse_logins_content_description_2" tools:ignore="UnusedResources">Zwiń zachowane hasła</string>
     <!-- Header for the select login prompt to allow users to fill a form with a saved login -->
     <string name="mozac_feature_prompts_saved_logins">Podpowiadane dane logowania</string>
 
+    <!-- Header for the select password prompt to allow users to fill a form with a saved password -->
+    <string name="mozac_feature_prompts_saved_logins_2" tools:ignore="UnusedResources">Zachowane hasła</string>
+
     <!-- Content description for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
     <string name="mozac_feature_prompts_suggest_strong_password_content_description">Zaproponuj silne hasło</string>
     <!-- Header for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
@@ -110,12 +131,20 @@
     <!-- Credit Card Autofill -->
     <!-- Header for the select credit card prompt to allow users to fill a form with a saved credit card. -->
     <string name="mozac_feature_prompts_select_credit_card">Wybierz kartę płatniczą</string>
+    <!-- Header for the select card prompt to allow users to fill a form with a saved card. -->
+    <string name="mozac_feature_prompts_select_credit_card_2" tools:ignore="UnusedResources">Użyj zachowanej karty</string>
     <!-- Content description for expanding the select credit card options in the select credit card prompt. -->
     <string name="mozac_feature_prompts_expand_credit_cards_content_description">Rozwiń podpowiadane karty płatnicze</string>
+    <!-- Content description for expanding the saved card options in the select card prompt. -->
+    <string name="mozac_feature_prompts_expand_credit_cards_content_description_2" tools:ignore="UnusedResources">Rozwiń zachowane karty</string>
     <!-- Content description for collapsing the select credit card options in the select credit prompt. -->
     <string name="mozac_feature_prompts_collapse_credit_cards_content_description">Zwiń podpowiadane karty płatnicze</string>
+    <!-- Content description for collapsing the saved card options in the select prompt. -->
+    <string name="mozac_feature_prompts_collapse_credit_cards_content_description_2" tools:ignore="UnusedResources">Zwiń zachowane karty</string>
     <!-- Option in the expanded select credit card prompt that links to credit cards settings. -->
     <string name="mozac_feature_prompts_manage_credit_cards">Zarządzaj kartami płatniczymi</string>
+    <!-- Option in the expanded select card prompt that links to cards settings. -->
+    <string name="mozac_feature_prompts_manage_credit_cards_2" tools:ignore="UnusedResources">Zarządzaj kartami</string>
     <!-- Text for the title of a save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_title">Czy bezpiecznie zachować tę kartę?</string>
     <!-- Text for the title of an update credit card dialog. -->
@@ -123,13 +152,20 @@
     <!-- Subtitle text displayed under the title of the save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_body">Numer karty zostanie zaszyfrowany. Kod zabezpieczający nie zostanie zachowany.</string>
 
+    <!-- Subtitle text displayed under the title of the saved card dialog. Parameter will be replaced by app name-->
+    <string name="mozac_feature_prompts_save_credit_card_prompt_body_2" tools:ignore="UnusedResources">%s szyfruje numer karty. Kod zabezpieczający nie zostanie zachowany.</string>
+
     <!-- Address Autofill -->
     <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
     <string name="mozac_feature_prompts_select_address_2">Wybierz adres</string>
     <!-- Content description for expanding the select addresses options in the select address prompt. -->
     <string name="mozac_feature_prompts_expand_address_content_description">Rozwiń podpowiadane adresy</string>
+    <!-- Content description for expanding the saved addresses options in the select address prompt. -->
+    <string name="mozac_feature_prompts_expand_address_content_description_2" tools:ignore="UnusedResources">Rozwiń zachowane adresy</string>
     <!-- Content description for collapsing the select address options in the select address prompt. -->
     <string name="mozac_feature_prompts_collapse_address_content_description">Zwiń podpowiadane adresy</string>
+    <!-- Content description for collapsing the saved address options in the select address prompt. -->
+    <string name="mozac_feature_prompts_collapse_address_content_description_2" tools:ignore="UnusedResources">Zwiń zachowane adresy</string>
     <!-- Text for the manage addresses button. -->
     <string name="mozac_feature_prompts_manage_address">Zarządzaj adresami</string>
 
diff --git a/fenix/app/src/main/res/values-azb/strings.xml b/fenix/app/src/main/res/values-azb/strings.xml
index 37a4ebc5fce0..1c5e4b0c8767 100644
--- a/fenix/app/src/main/res/values-azb/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-co/strings.xml b/fenix/app/src/main/res/values-co/strings.xml
index b233b981bff3..e41a5e4c1073 100644
--- a/fenix/app/src/main/res/values-co/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-cs/strings.xml b/fenix/app/src/main/res/values-cs/strings.xml
index d257bf7c056b..2a9bafda93c7 100644
--- a/fenix/app/src/main/res/values-cs/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-dsb/strings.xml b/fenix/app/src/main/res/values-dsb/strings.xml
index bbc3d240baff..629b72032271 100644
--- a/fenix/app/src/main/res/values-dsb/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-en-rGB/strings.xml b/fenix/app/src/main/res/values-en-rGB/strings.xml
index ea001e9be880..31dfb31b8d99 100644
--- a/fenix/app/src/main/res/values-en-rGB/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-eo/strings.xml b/fenix/app/src/main/res/values-eo/strings.xml
index 64032af01be0..adae84f571a2 100644
--- a/fenix/app/src/main/res/values-eo/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-is/strings.xml b/fenix/app/src/main/res/values-is/strings.xml
index bdb531e46c93..46dd967e512e 100644
--- a/fenix/app/src/main/res/values-is/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-ja/strings.xml b/fenix/app/src/main/res/values-ja/strings.xml
index 9b75f0b363a5..e7af7cfc386c 100644
--- a/fenix/app/src/main/res/values-ja/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-pl/strings.xml b/fenix/app/src/main/res/values-pl/strings.xml
index f9642e66f6a2..ae67905ffff8 100644
--- a/fenix/app/src/main/res/values-pl/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-rm/strings.xml b/fenix/app/src/main/res/values-rm/strings.xml
index efa79cba3148..c5c40892d4d4 100644
--- a/fenix/app/src/main/res/values-rm/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-tg/strings.xml b/fenix/app/src/main/res/values-tg/strings.xml
index 4eaf14fdb39c..4ae0da3cfc30 100644
--- a/fenix/app/src/main/res/values-tg/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-tr/strings.xml b/fenix/app/src/main/res/values-tr/strings.xml
index 927f22503d6f..c273ae92ea24 100644
--- a/fenix/app/src/main/res/values-tr/strings.xml
+++ b/fenix/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. -->
diff --git a/focus-android/app/src/main/res/values-eo/strings.xml b/focus-android/app/src/main/res/values-eo/strings.xml
index 422afe3c34bd..66c8d9dc1735 100644
--- a/focus-android/app/src/main/res/values-eo/strings.xml
+++ b/focus-android/app/src/main/res/values-eo/strings.xml
@@ -54,7 +54,6 @@
     <string name="menu_remove_from_shortcuts">Forigi el ŝparvojoj</string>
 
     <!-- Menu item: Shows information about features and changes that are new to this version -->
-    <string name="menu_whats_new" moz:RemovedIn="116" tools:ignore="UnusedResources">Novaĵoj</string>
     <string name="menu_settings">Agordoj</string>
     <string name="menu_about">Pri</string>
     <string name="menu_help">Helpo</string>
@@ -85,10 +84,9 @@
          sharing an URL. -->
     <string name="share_dialog_title">Dividi per</string>
 
-    <!-- While a browsing session is active (in the foreground or background) we will show a notification
-         so that the user doesn't forget about the website still being open. This text is shown in
-         the notification. Clicking the notification will have the same effect as clicking the "erase"
-         button in the application. -->
+    <string name="notification_erase_title_android_14">Ĉu viŝi retuman historion?</string>
+    <string name="notification_erase_text_android_14">Tuŝetu aŭ viŝu tiun ĉi sciigon por sekure viŝi vian retuman historion.</string>
+
     <string name="notification_erase_text">Forviŝi retuman historion</string>
 
     <!-- Notification action to open Focus and resume the current browsing session. -->
diff --git a/focus-android/app/src/main/res/values-pl/strings.xml b/focus-android/app/src/main/res/values-pl/strings.xml
index ed2d1f76fae7..28c036d45641 100644
--- a/focus-android/app/src/main/res/values-pl/strings.xml
+++ b/focus-android/app/src/main/res/values-pl/strings.xml
@@ -53,7 +53,6 @@
     <string name="menu_remove_from_shortcuts">Usuń ze skrótów</string>
 
     <!-- Menu item: Shows information about features and changes that are new to this version -->
-    <string name="menu_whats_new" moz:RemovedIn="116" tools:ignore="UnusedResources">Co nowego</string>
     <string name="menu_settings">Ustawienia</string>
     <string name="menu_about">O programie</string>
     <string name="menu_help">Pomoc</string>
@@ -84,10 +83,9 @@
          sharing an URL. -->
     <string name="share_dialog_title">Udostępnij przez</string>
 
-    <!-- While a browsing session is active (in the foreground or background) we will show a notification
-         so that the user doesn't forget about the website still being open. This text is shown in
-         the notification. Clicking the notification will have the same effect as clicking the "erase"
-         button in the application. -->
+    <string name="notification_erase_title_android_14">Usunąć historię przeglądania?</string>
+    <string name="notification_erase_text_android_14">Stuknij lub wyczyść to powiadomienie, aby bezpiecznie usunąć historię przeglądania.</string>
+
     <string name="notification_erase_text">Usuń historię przeglądania</string>
 
     <!-- Notification action to open Focus and resume the current browsing session. -->
@@ -290,7 +288,7 @@
     <string name="preference_privacy_block_ads">Blokowanie śledzących reklam</string>
     <string name="preference_privacy_block_ads_summary">Niektóre reklamy (nawet niekliknięte) śledzą odwiedziny zawierających je stron</string>
     <string name="preference_privacy_block_analytics">Blokowanie śledzących statystyk</string>
-    <string name="preference_privacy_block_analytics_summary">Używane do zbierania, analizowania i mierzenia działań użytkownika, takich jak kliknięcia i przewijanie</string>
+    <string name="preference_privacy_block_analytics_summary">Używane do zbierania, analizowania i mierzenia działań użytkownika, takich jak stuknięcia i przewijanie</string>
     <string name="preference_privacy_block_social">Blokowanie śledzących społecznościowych</string>
     <string name="preference_privacy_block_social_summary">Osadzane na stronach, aby śledzić ich odwiedziny i dodawać np. przyciski udostępniania</string>
     <string name="preference_privacy_block_content">Blokowanie pozostałych śledzących</string>

From d22515b8d250c05f81b65a717bc2f0e35834e6a0 Mon Sep 17 00:00:00 2001
From: MickeyMoz <sebastian@mozilla.com>
Date: Mon, 12 Feb 2024 00:48:31 +0000
Subject: [PATCH 15/51] Update GeckoView (Nightly) to 124.0.20240211213657.

---
 android-components/plugins/dependencies/src/main/java/Gecko.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/Gecko.kt b/android-components/plugins/dependencies/src/main/java/Gecko.kt
index 6151e8e4691c..1d336b896ce4 100644
--- a/android-components/plugins/dependencies/src/main/java/Gecko.kt
+++ b/android-components/plugins/dependencies/src/main/java/Gecko.kt
@@ -9,7 +9,7 @@ object Gecko {
     /**
      * GeckoView Version.
      */
-    const val version = "124.0.20240211090343"
+    const val version = "124.0.20240211213657"
 
     /**
      * GeckoView channel

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

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

diff --git a/fenix/app/src/main/java/org/mozilla/fenix/compose/Menu.kt b/fenix/app/src/main/java/org/mozilla/fenix/compose/Menu.kt
index 68acd450bef8..2d1d5cbe148b 100644
--- a/fenix/app/src/main/java/org/mozilla/fenix/compose/Menu.kt
+++ b/fenix/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 cd5b5497c88e2a703f7a8734315d705de5dc472b 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 17/51] 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/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/TestAssetHelper.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/TestAssetHelper.kt
index d638e762f634..fb90e772f380 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/TestAssetHelper.kt
+++ b/fenix/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/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
index a1f415a5cfc4..2a06b0990458 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
+++ b/fenix/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/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt
index a725fd33dbb9..3dcdd96cdf4b 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt
+++ b/fenix/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 97fd5abb21c87f8856afcd657ba9014ac538f260 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Thu, 18 Jan 2024 15:51:53 -0700
Subject: [PATCH 18/51] Bug 1875379 - Update Private notification description
 text

---
 .../org/mozilla/focus/session/SessionNotificationService.kt | 2 +-
 focus-android/app/src/main/res/values/strings.xml           | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/focus-android/app/src/main/java/org/mozilla/focus/session/SessionNotificationService.kt b/focus-android/app/src/main/java/org/mozilla/focus/session/SessionNotificationService.kt
index 875ec3b03635..0360d3017929 100644
--- a/focus-android/app/src/main/java/org/mozilla/focus/session/SessionNotificationService.kt
+++ b/focus-android/app/src/main/java/org/mozilla/focus/session/SessionNotificationService.kt
@@ -108,7 +108,7 @@ class SessionNotificationService : Service() {
         }
 
         val contentText = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            getString(R.string.notification_erase_text_android_14)
+            getString(R.string.notification_erase_text_android_14_1)
         } else {
             getString(R.string.notification_erase_text)
         }
diff --git a/focus-android/app/src/main/res/values/strings.xml b/focus-android/app/src/main/res/values/strings.xml
index fb0275eb5397..20aa1234291f 100644
--- a/focus-android/app/src/main/res/values/strings.xml
+++ b/focus-android/app/src/main/res/values/strings.xml
@@ -86,7 +86,11 @@
     <string name="share_dialog_title">Share via</string>
 
     <string name="notification_erase_title_android_14">Erase browsing history?</string>
-    <string name="notification_erase_text_android_14">Tap or clear this notification to securely erase your browsing history.</string>
+    <string name="notification_erase_text_android_14" moz:RemovedIn="124" tools:ignore="UnusedResources">Tap or clear this notification to securely erase your browsing history.</string>
+
+    <!-- Text shown in the notification description that pops up to remind the user that a private browsing session is active
+    for Android 14+. -->
+    <string name="notification_erase_text_android_14_1">Tap or swipe this notification to securely erase your browsing history.</string>
 
     <string name="notification_erase_text">Erase browsing history</string>
 

From 09592e559a82cd366243455624038ed3f8a3858d Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Wed, 26 Jul 2023 14:56:25 +0300
Subject: [PATCH 19/51] Bug 1845496 - Upgrade Kotlin and compose compiler.

Also upgrade Kotlin related libraries: coroutines, serialisation and ksp.

upgrade
---
 .../dependencies/src/main/java/DependenciesPlugin.kt   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
index 44340909cd8d..878bea815397 100644
--- a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
+++ b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
@@ -14,9 +14,9 @@ class DependenciesPlugin : Plugin<Settings> {
 
 // Synchronized version numbers for dependencies used by (some) modules
 object Versions {
-    const val kotlin = "1.8.22"
-    const val coroutines = "1.7.2"
-    const val serialization = "1.5.1"
+    const val kotlin = "1.9.22"
+    const val coroutines = "1.7.3"
+    const val serialization = "1.6.0"
     const val python_envs_plugin = "0.0.31"
 
     const val junit = "4.13.2"
@@ -47,13 +47,13 @@ object Versions {
     const val mozilla_glean = "56.1.0"
 
     const val material = "1.9.0"
-    const val ksp = "1.0.11"
+    const val ksp = "1.0.17"
     val ksp_plugin = "$kotlin-$ksp"
 
     // see https://android-developers.googleblog.com/2022/06/independent-versioning-of-Jetpack-Compose-libraries.html
     // for Jetpack Compose libraries versioning
     const val compose_version = "1.5.4"
-    const val compose_compiler = "1.4.8"
+    const val compose_compiler = "1.5.8"
 
     object AndroidX {
         const val activityCompose = "1.7.2"

From 13ee3dfb4fdf9a9fb97d8ffdfecf2d8e547f158f Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Thu, 10 Aug 2023 18:51:42 +0300
Subject: [PATCH 20/51] Bug 1847999 - Upgrade Room to latest version.

---
 .../plugins/dependencies/src/main/java/DependenciesPlugin.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
index 878bea815397..18dcb3366171 100644
--- a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
+++ b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
@@ -74,7 +74,7 @@ object Versions {
         const val test_ext = "1.1.5"
         const val test_runner = "1.5.2"
         const val espresso = "3.5.1"
-        const val room = "2.5.2"
+        const val room = "2.6.1"
         const val savedstate = "1.2.1"
         const val paging = "3.2.1"
         const val palette = "1.0.0"

From 433bd7adbd35207595b4e884ef8ebcff0ab18b6b Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Thu, 10 Aug 2023 18:53:03 +0300
Subject: [PATCH 21/51] Bug 1847999 - Switch to generating Kotlin code for
 Room.

---
 android-components/components/feature/addons/build.gradle        | 1 +
 android-components/components/feature/containers/build.gradle    | 1 +
 android-components/components/feature/downloads/build.gradle     | 1 +
 android-components/components/feature/logins/build.gradle        | 1 +
 android-components/components/feature/pwa/build.gradle           | 1 +
 .../components/feature/recentlyclosed/build.gradle               | 1 +
 android-components/components/feature/share/build.gradle         | 1 +
 .../components/feature/sitepermissions/build.gradle              | 1 +
 .../components/feature/tab-collections/build.gradle              | 1 +
 android-components/components/feature/top-sites/build.gradle     | 1 +
 android-components/components/service/pocket/build.gradle        | 1 +
 11 files changed, 11 insertions(+)

diff --git a/android-components/components/feature/addons/build.gradle b/android-components/components/feature/addons/build.gradle
index 48dacf68b8b9..b6bd5641cd3b 100644
--- a/android-components/components/feature/addons/build.gradle
+++ b/android-components/components/feature/addons/build.gradle
@@ -18,6 +18,7 @@ android {
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas".toString())
+            arg("room.generateKotlin", "true")
         }
 
         javaCompileOptions {
diff --git a/android-components/components/feature/containers/build.gradle b/android-components/components/feature/containers/build.gradle
index f035e5dc27bf..9ebb3289dbd5 100644
--- a/android-components/components/feature/containers/build.gradle
+++ b/android-components/components/feature/containers/build.gradle
@@ -15,6 +15,7 @@ android {
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas".toString())
+            arg("room.generateKotlin", "true")
         }
 
         javaCompileOptions {
diff --git a/android-components/components/feature/downloads/build.gradle b/android-components/components/feature/downloads/build.gradle
index 4519d283ee72..1072c051b14f 100644
--- a/android-components/components/feature/downloads/build.gradle
+++ b/android-components/components/feature/downloads/build.gradle
@@ -19,6 +19,7 @@ android {
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas".toString())
+            arg("room.generateKotlin", "true")
         }
     }
 
diff --git a/android-components/components/feature/logins/build.gradle b/android-components/components/feature/logins/build.gradle
index 9e3cb034301d..fd4febbe3264 100644
--- a/android-components/components/feature/logins/build.gradle
+++ b/android-components/components/feature/logins/build.gradle
@@ -15,6 +15,7 @@ android {
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas".toString())
+            arg("room.generateKotlin", "true")
         }
     }
 
diff --git a/android-components/components/feature/pwa/build.gradle b/android-components/components/feature/pwa/build.gradle
index 0920617b1486..5d8b90b313fe 100644
--- a/android-components/components/feature/pwa/build.gradle
+++ b/android-components/components/feature/pwa/build.gradle
@@ -17,6 +17,7 @@ android {
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas".toString())
+            arg("room.generateKotlin", "true")
         }
 
         javaCompileOptions {
diff --git a/android-components/components/feature/recentlyclosed/build.gradle b/android-components/components/feature/recentlyclosed/build.gradle
index 8258b9471420..586afb1edc84 100644
--- a/android-components/components/feature/recentlyclosed/build.gradle
+++ b/android-components/components/feature/recentlyclosed/build.gradle
@@ -15,6 +15,7 @@ android {
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas".toString())
+            arg("room.generateKotlin", "true")
         }
 
         javaCompileOptions {
diff --git a/android-components/components/feature/share/build.gradle b/android-components/components/feature/share/build.gradle
index 103693cc6b99..a44df774e16c 100644
--- a/android-components/components/feature/share/build.gradle
+++ b/android-components/components/feature/share/build.gradle
@@ -15,6 +15,7 @@ android {
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas".toString())
+            arg("room.generateKotlin", "true")
         }
 
         javaCompileOptions {
diff --git a/android-components/components/feature/sitepermissions/build.gradle b/android-components/components/feature/sitepermissions/build.gradle
index 0215b84542cf..06fa58246b87 100644
--- a/android-components/components/feature/sitepermissions/build.gradle
+++ b/android-components/components/feature/sitepermissions/build.gradle
@@ -19,6 +19,7 @@ android {
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas".toString())
+            arg("room.generateKotlin", "true")
         }
 
         javaCompileOptions {
diff --git a/android-components/components/feature/tab-collections/build.gradle b/android-components/components/feature/tab-collections/build.gradle
index 9ad2d6f74384..74cd5c76b720 100644
--- a/android-components/components/feature/tab-collections/build.gradle
+++ b/android-components/components/feature/tab-collections/build.gradle
@@ -15,6 +15,7 @@ android {
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas".toString())
+            arg("room.generateKotlin", "true")
         }
 
         javaCompileOptions {
diff --git a/android-components/components/feature/top-sites/build.gradle b/android-components/components/feature/top-sites/build.gradle
index 0dbac23deef4..236137605152 100644
--- a/android-components/components/feature/top-sites/build.gradle
+++ b/android-components/components/feature/top-sites/build.gradle
@@ -15,6 +15,7 @@ android {
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas".toString())
+            arg("room.generateKotlin", "true")
         }
 
         javaCompileOptions {
diff --git a/android-components/components/service/pocket/build.gradle b/android-components/components/service/pocket/build.gradle
index 416ddaf8741f..2835723a988b 100644
--- a/android-components/components/service/pocket/build.gradle
+++ b/android-components/components/service/pocket/build.gradle
@@ -15,6 +15,7 @@ android {
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas".toString())
+            arg("room.generateKotlin", "true")
         }
     }
 

From cadfde47b4a9729734b06fa9331ce62cc7edc2b5 Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Thu, 10 Aug 2023 18:58:30 +0300
Subject: [PATCH 22/51] Bug 1847999 - Rename param to match supertype.

The supertype param was changed in Room 2.6.0
---
 .../feature/downloads/db/DownloadsDatabase.kt | 18 ++++----
 .../feature/pwa/db/ManifestDatabase.kt        | 18 ++++----
 .../feature/share/db/RecentAppsDatabase.kt    |  6 +--
 .../db/SitePermissionsDatabase.kt             | 46 +++++++++----------
 .../feature/top/sites/db/TopSiteDatabase.kt   | 18 ++++----
 .../db/PocketRecommendationsDatabase.kt       | 32 ++++++-------
 6 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/db/DownloadsDatabase.kt b/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/db/DownloadsDatabase.kt
index 16405ef2c67f..9adabfe9cdb1 100644
--- a/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/db/DownloadsDatabase.kt
+++ b/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/db/DownloadsDatabase.kt
@@ -48,29 +48,29 @@ internal abstract class DownloadsDatabase : RoomDatabase() {
 @Suppress("MaxLineLength", "MagicNumber")
 internal object Migrations {
     val migration_1_2 = object : Migration(1, 2) {
-        override fun migrate(database: SupportSQLiteDatabase) {
-            database.execSQL(
+        override fun migrate(db: SupportSQLiteDatabase) {
+            db.execSQL(
                 "ALTER TABLE downloads ADD COLUMN is_private INTEGER NOT NULL DEFAULT 0",
             )
         }
     }
     val migration_2_3 = object : Migration(2, 3) {
-        override fun migrate(database: SupportSQLiteDatabase) {
+        override fun migrate(db: SupportSQLiteDatabase) {
             // Create a temporal table
-            database.execSQL("CREATE TABLE temp_downloads (`id` TEXT NOT NULL, `url` TEXT NOT NULL, `file_name` TEXT, `content_type` TEXT, `content_length` INTEGER, `status` INTEGER NOT NULL, `destination_directory` TEXT NOT NULL, `created_at` INTEGER NOT NULL, PRIMARY KEY(`id`))")
+            db.execSQL("CREATE TABLE temp_downloads (`id` TEXT NOT NULL, `url` TEXT NOT NULL, `file_name` TEXT, `content_type` TEXT, `content_length` INTEGER, `status` INTEGER NOT NULL, `destination_directory` TEXT NOT NULL, `created_at` INTEGER NOT NULL, PRIMARY KEY(`id`))")
             // Copy the data
-            database.execSQL("INSERT INTO temp_downloads (id,url,file_name,content_type,content_length,status,destination_directory,created_at) SELECT id,url,file_name,content_type,content_length,status,destination_directory,created_at FROM downloads where is_private = 0")
+            db.execSQL("INSERT INTO temp_downloads (id,url,file_name,content_type,content_length,status,destination_directory,created_at) SELECT id,url,file_name,content_type,content_length,status,destination_directory,created_at FROM downloads where is_private = 0")
             // Remove the old table
-            database.execSQL("DROP TABLE downloads")
+            db.execSQL("DROP TABLE downloads")
             // Rename the table name to the correct one
-            database.execSQL("ALTER TABLE temp_downloads RENAME TO downloads")
+            db.execSQL("ALTER TABLE temp_downloads RENAME TO downloads")
         }
     }
 
     val migration_3_4 = object : Migration(3, 4) {
-        override fun migrate(database: SupportSQLiteDatabase) {
+        override fun migrate(db: SupportSQLiteDatabase) {
             // Clear any data urls.
-            database.execSQL("UPDATE downloads SET url='' WHERE url LIKE 'data:%' ")
+            db.execSQL("UPDATE downloads SET url='' WHERE url LIKE 'data:%' ")
         }
     }
 }
diff --git a/android-components/components/feature/pwa/src/main/java/mozilla/components/feature/pwa/db/ManifestDatabase.kt b/android-components/components/feature/pwa/src/main/java/mozilla/components/feature/pwa/db/ManifestDatabase.kt
index f47670c876b7..fdf36d57346b 100644
--- a/android-components/components/feature/pwa/src/main/java/mozilla/components/feature/pwa/db/ManifestDatabase.kt
+++ b/android-components/components/feature/pwa/src/main/java/mozilla/components/feature/pwa/db/ManifestDatabase.kt
@@ -27,28 +27,28 @@ internal abstract class ManifestDatabase : RoomDatabase() {
 
         @VisibleForTesting
         internal val MIGRATION_1_2: Migration = object : Migration(1, 2) {
-            override fun migrate(database: SupportSQLiteDatabase) {
-                val cursor = database.query("SELECT * FROM manifests LIMIT 0,1")
+            override fun migrate(db: SupportSQLiteDatabase) {
+                val cursor = db.query("SELECT * FROM manifests LIMIT 0,1")
 
                 if (cursor.getColumnIndex("used_at") < 0) {
-                    database.execSQL("ALTER TABLE manifests ADD COLUMN used_at INTEGER NOT NULL DEFAULT 0")
+                    db.execSQL("ALTER TABLE manifests ADD COLUMN used_at INTEGER NOT NULL DEFAULT 0")
                 }
 
                 if (cursor.getColumnIndex("scope") < 0) {
-                    database.execSQL("ALTER TABLE manifests ADD COLUMN scope TEXT")
+                    db.execSQL("ALTER TABLE manifests ADD COLUMN scope TEXT")
                 }
 
-                database.execSQL("CREATE INDEX IF NOT EXISTS index_manifests_scope ON manifests (scope)")
-                database.execSQL("UPDATE manifests SET used_at = updated_at WHERE used_at = 0")
+                db.execSQL("CREATE INDEX IF NOT EXISTS index_manifests_scope ON manifests (scope)")
+                db.execSQL("UPDATE manifests SET used_at = updated_at WHERE used_at = 0")
             }
         }
 
         @VisibleForTesting
         internal val MIGRATION_2_3: Migration = object : Migration(2, 3) {
-            override fun migrate(database: SupportSQLiteDatabase) {
-                database.execSQL("ALTER TABLE manifests ADD COLUMN has_share_targets INTEGER NOT NULL DEFAULT 0")
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE manifests ADD COLUMN has_share_targets INTEGER NOT NULL DEFAULT 0")
 
-                database.execSQL(
+                db.execSQL(
                     "CREATE INDEX IF NOT EXISTS index_manifests_has_share_targets ON manifests (has_share_targets)",
                 )
             }
diff --git a/android-components/components/feature/share/src/main/java/mozilla/components/feature/share/db/RecentAppsDatabase.kt b/android-components/components/feature/share/src/main/java/mozilla/components/feature/share/db/RecentAppsDatabase.kt
index bf648220a4fc..d554bd320986 100644
--- a/android-components/components/feature/share/src/main/java/mozilla/components/feature/share/db/RecentAppsDatabase.kt
+++ b/android-components/components/feature/share/src/main/java/mozilla/components/feature/share/db/RecentAppsDatabase.kt
@@ -45,9 +45,9 @@ internal abstract class RecentAppsDatabase : RoomDatabase() {
 
 internal object Migrations {
     val migration_1_2 = object : Migration(1, 2) {
-        override fun migrate(database: SupportSQLiteDatabase) {
-            database.execSQL("DROP TABLE RECENT_APPS_TABLE")
-            database.execSQL(
+        override fun migrate(db: SupportSQLiteDatabase) {
+            db.execSQL("DROP TABLE RECENT_APPS_TABLE")
+            db.execSQL(
                 "CREATE TABLE IF NOT EXISTS " + RECENT_APPS_TABLE +
                     "(" +
                     "`activityName` TEXT NOT NULL, " +
diff --git a/android-components/components/feature/sitepermissions/src/main/java/mozilla/components/feature/sitepermissions/db/SitePermissionsDatabase.kt b/android-components/components/feature/sitepermissions/src/main/java/mozilla/components/feature/sitepermissions/db/SitePermissionsDatabase.kt
index ab474c763353..bdf82b53e53a 100644
--- a/android-components/components/feature/sitepermissions/src/main/java/mozilla/components/feature/sitepermissions/db/SitePermissionsDatabase.kt
+++ b/android-components/components/feature/sitepermissions/src/main/java/mozilla/components/feature/sitepermissions/db/SitePermissionsDatabase.kt
@@ -82,12 +82,12 @@ internal class StatusConverter {
 
 internal object Migrations {
     val migration_1_2 = object : Migration(1, 2) {
-        override fun migrate(database: SupportSQLiteDatabase) {
+        override fun migrate(db: SupportSQLiteDatabase) {
             // Version 1 is used in Nightly builds of Fenix, but not in production. Let's just skip actually migrating
             // anything and let's re-create the "site_permissions" table.
 
-            database.execSQL("DROP TABLE site_permissions")
-            database.execSQL(
+            db.execSQL("DROP TABLE site_permissions")
+            db.execSQL(
                 "CREATE TABLE IF NOT EXISTS `site_permissions` (" +
                     "`origin` TEXT NOT NULL, " +
                     "`location` INTEGER NOT NULL, " +
@@ -104,19 +104,19 @@ internal object Migrations {
 
     @Suppress("MagicNumber")
     val migration_2_3 = object : Migration(2, 3) {
-        override fun migrate(database: SupportSQLiteDatabase) {
-            val haveAutoPlayColumns = database.query("SELECT * FROM site_permissions").columnCount == 10
+        override fun migrate(db: SupportSQLiteDatabase) {
+            val haveAutoPlayColumns = db.query("SELECT * FROM site_permissions").columnCount == 10
             // We just want to apply this migration for user that do not have
             // the new autoplay fields autoplay_audible and autoplay_inaudible
             if (!haveAutoPlayColumns) {
-                database.execSQL(
+                db.execSQL(
                     "ALTER TABLE site_permissions ADD COLUMN autoplay_audible INTEGER NOT NULL DEFAULT ''",
                 )
-                database.execSQL(
+                db.execSQL(
                     "ALTER TABLE site_permissions ADD COLUMN autoplay_inaudible INTEGER NOT NULL DEFAULT ''",
                 )
 
-                database.execSQL(
+                db.execSQL(
                     " UPDATE site_permissions" +
                         " SET autoplay_audible = -1, " + // BLOCKED by default
                         " `autoplay_inaudible` = 1", // ALLOWED by default
@@ -127,33 +127,33 @@ internal object Migrations {
 
     @Suppress("MagicNumber")
     val migration_3_4 = object : Migration(3, 4) {
-        override fun migrate(database: SupportSQLiteDatabase) {
-            val hasEmeColumn = database.query("SELECT * FROM site_permissions").columnCount == 11
+        override fun migrate(db: SupportSQLiteDatabase) {
+            val hasEmeColumn = db.query("SELECT * FROM site_permissions").columnCount == 11
             if (!hasEmeColumn) {
-                database.execSQL(
+                db.execSQL(
                     "ALTER TABLE site_permissions ADD COLUMN media_key_system_access INTEGER NOT NULL DEFAULT 0",
                 )
                 // default is NO_DECISION
-                database.execSQL("UPDATE site_permissions SET media_key_system_access = 0")
+                db.execSQL("UPDATE site_permissions SET media_key_system_access = 0")
             }
         }
     }
 
     @Suppress("MagicNumber")
     val migration_4_5 = object : Migration(4, 5) {
-        override fun migrate(database: SupportSQLiteDatabase) {
+        override fun migrate(db: SupportSQLiteDatabase) {
             // Updating any previous autoplay sites with 0 (NO_DECISION) with the supported values
             // Autoplay permission doesn't support 0 (NO_DECISION),
             // it only supports 1 (ALLOWED) or -1 (BLOCKED)
-            database.execSQL("UPDATE site_permissions SET autoplay_audible = -1 WHERE autoplay_audible = 0 ")
-            database.execSQL("UPDATE site_permissions SET autoplay_inaudible = 1 WHERE autoplay_inaudible = 0 ")
+            db.execSQL("UPDATE site_permissions SET autoplay_audible = -1 WHERE autoplay_audible = 0 ")
+            db.execSQL("UPDATE site_permissions SET autoplay_inaudible = 1 WHERE autoplay_inaudible = 0 ")
         }
     }
 
     @Suppress("MagicNumber")
     val migration_5_6 = object : Migration(5, 6) {
-        override fun migrate(database: SupportSQLiteDatabase) {
-            database.execSQL(
+        override fun migrate(db: SupportSQLiteDatabase) {
+            db.execSQL(
                 "UPDATE site_permissions SET origin = 'https://'||origin||':443'",
             )
         }
@@ -161,12 +161,12 @@ internal object Migrations {
 
     @Suppress("MagicNumber")
     val migration_6_7 = object : Migration(6, 7) {
-        override fun migrate(database: SupportSQLiteDatabase) {
+        override fun migrate(db: SupportSQLiteDatabase) {
             // Update any site with our previous default value (block audio and video)  to block audio only.
             // autoplay_audible BLOCKED (-1) and autoplay_inaudible BLOCKED (-1) to
             // autoplay_audible BLOCKED (-1) and autoplay_inaudible ALLOWED (1)
             // This match the default value of desktop block audio only.
-            database.execSQL(
+            db.execSQL(
                 "UPDATE site_permissions SET autoplay_audible = -1, autoplay_inaudible= 1 " +
                     "WHERE autoplay_audible = -1 AND autoplay_inaudible = -1",
             )
@@ -175,14 +175,14 @@ internal object Migrations {
 
     @Suppress("MagicNumber")
     val migration_7_8 = object : Migration(7, 8) {
-        override fun migrate(database: SupportSQLiteDatabase) {
-            val hasCrossOriginStorageAccessColumn = database.query("SELECT * FROM site_permissions").columnCount == 12
+        override fun migrate(db: SupportSQLiteDatabase) {
+            val hasCrossOriginStorageAccessColumn = db.query("SELECT * FROM site_permissions").columnCount == 12
             if (!hasCrossOriginStorageAccessColumn) {
-                database.execSQL(
+                db.execSQL(
                     "ALTER TABLE site_permissions ADD COLUMN cross_origin_storage_access INTEGER NOT NULL DEFAULT 0",
                 )
                 // default is NO_DECISION
-                database.execSQL("UPDATE site_permissions SET cross_origin_storage_access = 0")
+                db.execSQL("UPDATE site_permissions SET cross_origin_storage_access = 0")
             }
         }
     }
diff --git a/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/db/TopSiteDatabase.kt b/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/db/TopSiteDatabase.kt
index 78202bcf6097..59aa469f5463 100644
--- a/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/db/TopSiteDatabase.kt
+++ b/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/db/TopSiteDatabase.kt
@@ -43,15 +43,15 @@ internal abstract class TopSiteDatabase : RoomDatabase() {
 
 internal object Migrations {
     val migration_1_2 = object : Migration(1, 2) {
-        override fun migrate(database: SupportSQLiteDatabase) {
+        override fun migrate(db: SupportSQLiteDatabase) {
             // Add the new is_default column and set is_default to 0 (false) for every entry.
-            database.execSQL(
+            db.execSQL(
                 "ALTER TABLE top_sites ADD COLUMN is_default INTEGER NOT NULL DEFAULT 0",
             )
 
             // Prior to version 2, pocket top sites, wikipedia and youtube were added as default
             // sites in Fenix. Look for these entries and set is_default to 1 (true).
-            database.execSQL(
+            db.execSQL(
                 "UPDATE top_sites " +
                     "SET is_default = 1 " +
                     "WHERE url IN " +
@@ -64,9 +64,9 @@ internal object Migrations {
 
     @Suppress("MagicNumber")
     val migration_2_3 = object : Migration(2, 3) {
-        override fun migrate(database: SupportSQLiteDatabase) {
+        override fun migrate(db: SupportSQLiteDatabase) {
             // Create a temporary top sites table of version 1.
-            database.execSQL(
+            db.execSQL(
                 "CREATE TABLE IF NOT EXISTS `top_sites_temp` (" +
                     "`id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
                     "`title` TEXT NOT NULL, " +
@@ -76,25 +76,25 @@ internal object Migrations {
             )
 
             // Insert every entry from the old table into the temporary top sites table.
-            database.execSQL(
+            db.execSQL(
                 "INSERT INTO top_sites_temp (title, url, created_at, is_default) " +
                     "SELECT title, url, created_at, 0 FROM top_sites",
             )
 
             // Assume there are consumers of version 2 with the mismatched isDefault and is_default
             // column name. Drop the old table.
-            database.execSQL(
+            db.execSQL(
                 "DROP TABLE top_sites",
             )
 
             // Rename the temporary table to top_sites.
-            database.execSQL(
+            db.execSQL(
                 "ALTER TABLE top_sites_temp RENAME TO top_sites",
             )
 
             // Prior to version 2, pocket top sites, wikipedia and youtube were added as default
             // sites in Fenix. Look for these entries and set isDefault to 1 (true).
-            database.execSQL(
+            db.execSQL(
                 "UPDATE top_sites " +
                     "SET is_default = 1 " +
                     "WHERE url IN " +
diff --git a/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/stories/db/PocketRecommendationsDatabase.kt b/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/stories/db/PocketRecommendationsDatabase.kt
index 7f37091d5d2b..5a3e4f0efee4 100644
--- a/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/stories/db/PocketRecommendationsDatabase.kt
+++ b/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/stories/db/PocketRecommendationsDatabase.kt
@@ -62,8 +62,8 @@ internal abstract class PocketRecommendationsDatabase : RoomDatabase() {
 
 internal object Migrations {
     val migration_1_2 = object : Migration(1, 2) {
-        override fun migrate(database: SupportSQLiteDatabase) {
-            database.execSQL(
+        override fun migrate(db: SupportSQLiteDatabase) {
+            db.execSQL(
                 "CREATE TABLE IF NOT EXISTS " +
                     "`${PocketRecommendationsDatabase.TABLE_NAME_SPOCS}` (" +
                     "`url` TEXT NOT NULL, " +
@@ -82,15 +82,15 @@ internal object Migrations {
      * Migration for when adding support for pacing sponsored stories.
      */
     val migration_2_3 = object : Migration(2, 3) {
-        override fun migrate(database: SupportSQLiteDatabase) {
+        override fun migrate(db: SupportSQLiteDatabase) {
             // There are many new columns added. Drop the old table allowing to start fresh.
             // This migration is expected to only be needed in debug builds
             // with the feature not being live in any Fenix release.
-            database.execSQL(
+            db.execSQL(
                 "DROP TABLE ${PocketRecommendationsDatabase.TABLE_NAME_SPOCS}",
             )
 
-            database.createNewSpocsTables()
+            db.createNewSpocsTables()
         }
     }
 
@@ -98,8 +98,8 @@ internal object Migrations {
      * Migration for when adding sponsored stories along with pacing support.
      */
     val migration_1_3 = object : Migration(1, 3) {
-        override fun migrate(database: SupportSQLiteDatabase) {
-            database.createNewSpocsTables()
+        override fun migrate(db: SupportSQLiteDatabase) {
+            db.createNewSpocsTables()
         }
     }
 
@@ -107,26 +107,26 @@ internal object Migrations {
      * Migration for when adding a new index to the spoc impression entity.
      */
     val migration_3_4 = object : Migration(3, 4) {
-        override fun migrate(database: SupportSQLiteDatabase) {
+        override fun migrate(db: SupportSQLiteDatabase) {
             // Rename the old tables to allow creating new ones
-            database.execSQL(
+            db.execSQL(
                 "ALTER TABLE `${PocketRecommendationsDatabase.TABLE_NAME_SPOCS}` " +
                     "RENAME TO temp_spocs",
             )
-            database.execSQL(
+            db.execSQL(
                 "ALTER TABLE `${PocketRecommendationsDatabase.TABLE_NAME_SPOCS_IMPRESSIONS}` " +
                     "RENAME TO temp_spocs_impressions",
             )
 
             // Create new tables with the new schema
-            database.createNewSpocsTables()
-            database.execSQL(
+            db.createNewSpocsTables()
+            db.execSQL(
                 "CREATE INDEX IF NOT EXISTS `index_spocs_impressions_spocId` " +
                     "ON `${PocketRecommendationsDatabase.TABLE_NAME_SPOCS_IMPRESSIONS}` (`spocId`)",
             )
 
             // Copy the old data to the new tables
-            database.execSQL(
+            db.execSQL(
                 "INSERT INTO " +
                     "'${PocketRecommendationsDatabase.TABLE_NAME_SPOCS}' (" +
                     "id, url, title, imageUrl, sponsor, clickShim, impressionShim, " +
@@ -136,7 +136,7 @@ internal object Migrations {
                     "priority, lifetimeCapCount, flightCapCount, flightCapPeriod " +
                     "FROM temp_spocs",
             )
-            database.execSQL(
+            db.execSQL(
                 "INSERT INTO " +
                     "'${PocketRecommendationsDatabase.TABLE_NAME_SPOCS_IMPRESSIONS}' (" +
                     "spocId, impressionId, impressionDateInSeconds" +
@@ -146,8 +146,8 @@ internal object Migrations {
             )
 
             // Cleanup
-            database.execSQL("DROP TABLE temp_spocs")
-            database.execSQL("DROP TABLE temp_spocs_impressions")
+            db.execSQL("DROP TABLE temp_spocs")
+            db.execSQL("DROP TABLE temp_spocs_impressions")
         }
     }
 

From ad0a5144729b4f9823814681e6555b2df0f55666 Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Thu, 10 Aug 2023 20:40:46 +0300
Subject: [PATCH 23/51] Bug 1847999 - Switch to using non-deprecated
 constructor for MigrationTestHelper.

---
 .../feature/downloads/OnDeviceDownloadStorageTest.kt         | 5 +----
 .../components/feature/logins/LoginExceptionStorageTest.kt   | 5 +----
 .../feature/pwa/db/ManifestDatabaseMigrationTest.kt          | 5 +----
 .../sitepermissions/db/OnDeviceSitePermissionsStorageTest.kt | 5 +----
 .../feature/top/sites/OnDevicePinnedSitesStorageTest.kt      | 5 +----
 .../pocket/stories/db/PocketRecommendationsDatabaseTest.kt   | 5 +----
 6 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/android-components/components/feature/downloads/src/androidTest/java/mozilla/components/feature/downloads/OnDeviceDownloadStorageTest.kt b/android-components/components/feature/downloads/src/androidTest/java/mozilla/components/feature/downloads/OnDeviceDownloadStorageTest.kt
index bcfd2577f2ed..e7c689b4f032 100644
--- a/android-components/components/feature/downloads/src/androidTest/java/mozilla/components/feature/downloads/OnDeviceDownloadStorageTest.kt
+++ b/android-components/components/feature/downloads/src/androidTest/java/mozilla/components/feature/downloads/OnDeviceDownloadStorageTest.kt
@@ -7,7 +7,6 @@ package mozilla.components.feature.downloads
 import android.content.Context
 import androidx.room.Room
 import androidx.room.testing.MigrationTestHelper
-import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -32,11 +31,9 @@ class OnDeviceDownloadStorageTest {
     private lateinit var database: DownloadsDatabase
 
     @get:Rule
-    @Suppress("DEPRECATION")
     val helper: MigrationTestHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
-        DownloadsDatabase::class.java.canonicalName,
-        FrameworkSQLiteOpenHelperFactory(),
+        DownloadsDatabase::class.java,
     )
 
     @Before
diff --git a/android-components/components/feature/logins/src/androidTest/java/mozilla/components/feature/logins/LoginExceptionStorageTest.kt b/android-components/components/feature/logins/src/androidTest/java/mozilla/components/feature/logins/LoginExceptionStorageTest.kt
index 6ee5a3566b70..749ee0b82f15 100644
--- a/android-components/components/feature/logins/src/androidTest/java/mozilla/components/feature/logins/LoginExceptionStorageTest.kt
+++ b/android-components/components/feature/logins/src/androidTest/java/mozilla/components/feature/logins/LoginExceptionStorageTest.kt
@@ -8,7 +8,6 @@ import android.content.Context
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.room.Room
 import androidx.room.testing.MigrationTestHelper
-import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.flow.first
@@ -37,11 +36,9 @@ class LoginExceptionStorageTest {
     var instantTaskExecutorRule = InstantTaskExecutorRule()
 
     @get:Rule
-    @Suppress("DEPRECATION")
     val helper: MigrationTestHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
-        LoginExceptionStorage::class.java.canonicalName,
-        FrameworkSQLiteOpenHelperFactory(),
+        LoginExceptionDatabase::class.java,
     )
 
     @Before
diff --git a/android-components/components/feature/pwa/src/androidTest/java/mozilla/components/feature/pwa/db/ManifestDatabaseMigrationTest.kt b/android-components/components/feature/pwa/src/androidTest/java/mozilla/components/feature/pwa/db/ManifestDatabaseMigrationTest.kt
index 7bfcfab6f528..00659e3af23d 100644
--- a/android-components/components/feature/pwa/src/androidTest/java/mozilla/components/feature/pwa/db/ManifestDatabaseMigrationTest.kt
+++ b/android-components/components/feature/pwa/src/androidTest/java/mozilla/components/feature/pwa/db/ManifestDatabaseMigrationTest.kt
@@ -6,7 +6,6 @@ package mozilla.components.feature.pwa.db
 
 import androidx.core.database.getStringOrNull
 import androidx.room.testing.MigrationTestHelper
-import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
@@ -20,11 +19,9 @@ class ManifestDatabaseMigrationTest {
 
     @Rule
     @JvmField
-    @Suppress("DEPRECATION")
     val helper: MigrationTestHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
-        ManifestDatabase::class.java.canonicalName,
-        FrameworkSQLiteOpenHelperFactory(),
+        ManifestDatabase::class.java,
     )
 
     @Test
diff --git a/android-components/components/feature/sitepermissions/src/androidTest/java/mozilla/components/feature/sitepermissions/db/OnDeviceSitePermissionsStorageTest.kt b/android-components/components/feature/sitepermissions/src/androidTest/java/mozilla/components/feature/sitepermissions/db/OnDeviceSitePermissionsStorageTest.kt
index cb057593b446..83b2a5a04250 100644
--- a/android-components/components/feature/sitepermissions/src/androidTest/java/mozilla/components/feature/sitepermissions/db/OnDeviceSitePermissionsStorageTest.kt
+++ b/android-components/components/feature/sitepermissions/src/androidTest/java/mozilla/components/feature/sitepermissions/db/OnDeviceSitePermissionsStorageTest.kt
@@ -8,7 +8,6 @@ import android.content.Context
 import androidx.core.net.toUri
 import androidx.room.Room
 import androidx.room.testing.MigrationTestHelper
-import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.test.runTest
@@ -34,11 +33,9 @@ class OnDeviceSitePermissionsStorageTest {
     private lateinit var database: SitePermissionsDatabase
 
     @get:Rule
-    @Suppress("DEPRECATION")
     val helper: MigrationTestHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
-        SitePermissionsDatabase::class.java.canonicalName,
-        FrameworkSQLiteOpenHelperFactory(),
+        SitePermissionsDatabase::class.java,
     )
 
     @Before
diff --git a/android-components/components/feature/top-sites/src/androidTest/java/mozilla/components/feature/top/sites/OnDevicePinnedSitesStorageTest.kt b/android-components/components/feature/top-sites/src/androidTest/java/mozilla/components/feature/top/sites/OnDevicePinnedSitesStorageTest.kt
index a4d15b3c2742..ac5563190d6b 100644
--- a/android-components/components/feature/top-sites/src/androidTest/java/mozilla/components/feature/top/sites/OnDevicePinnedSitesStorageTest.kt
+++ b/android-components/components/feature/top-sites/src/androidTest/java/mozilla/components/feature/top/sites/OnDevicePinnedSitesStorageTest.kt
@@ -8,7 +8,6 @@ import android.content.Context
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.room.Room
 import androidx.room.testing.MigrationTestHelper
-import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -38,11 +37,9 @@ class OnDevicePinnedSitesStorageTest {
     var instantTaskExecutorRule = InstantTaskExecutorRule()
 
     @get:Rule
-    @Suppress("DEPRECATION")
     val helper: MigrationTestHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
-        TopSiteDatabase::class.java.canonicalName,
-        FrameworkSQLiteOpenHelperFactory(),
+        TopSiteDatabase::class.java,
     )
 
     @Before
diff --git a/android-components/components/service/pocket/src/androidTest/java/mozilla/components/service/pocket/stories/db/PocketRecommendationsDatabaseTest.kt b/android-components/components/service/pocket/src/androidTest/java/mozilla/components/service/pocket/stories/db/PocketRecommendationsDatabaseTest.kt
index fed7f5ff6831..f31f41a31899 100644
--- a/android-components/components/service/pocket/src/androidTest/java/mozilla/components/service/pocket/stories/db/PocketRecommendationsDatabaseTest.kt
+++ b/android-components/components/service/pocket/src/androidTest/java/mozilla/components/service/pocket/stories/db/PocketRecommendationsDatabaseTest.kt
@@ -8,7 +8,6 @@ import android.content.Context
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.room.Room
 import androidx.room.testing.MigrationTestHelper
-import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.runBlocking
@@ -31,11 +30,9 @@ class PocketRecommendationsDatabaseTest {
     private lateinit var database: PocketRecommendationsDatabase
 
     @get:Rule
-    @Suppress("DEPRECATION")
     val helper: MigrationTestHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
-        PocketRecommendationsDatabase::class.java.canonicalName,
-        FrameworkSQLiteOpenHelperFactory(),
+        PocketRecommendationsDatabase::class.java,
     )
 
     @get:Rule

From 2917efdabbad9e4840b58ba3d248e8f433b0c20c 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 24/51] Bug 1879539 - Remove redundant assertion functions from
 LibrarySubMenusMultipleSelectionToolbarRobot

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

diff --git a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
index a86f8802efab..3c675bf05e8b 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
+++ b/fenix/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 0a504515ce8e3d2ae66bf1933e1a92f0582cdfec 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 25/51] Bug 1879539 - Add test logs to
 LibrarySubMenusMultipleSelectionToolbarRobot

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

diff --git a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
index 3c675bf05e8b..1e65807a09cb 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
+++ b/fenix/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 95e9fa455f10bdc2bcc31ee99bf6a9b0fdb521f9 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 26/51] Bug 1879539 - Remove unused functions from
 LibrarySubMenusMultipleSelectionToolbarRobot

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

diff --git a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
index 1e65807a09cb..b3b3d395c8ac 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt
+++ b/fenix/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 9beaef6d805a0f286984b004d47c7d295cf5b0d4 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 27/51] Bug 1879819 - Improve rating description in list of
 add-ons

---
 .../feature/addons/ui/AddonsManagerAdapter.kt     |  2 +-
 .../addons/src/main/res/values/strings.xml        |  4 +++-
 .../feature/addons/ui/AddonsManagerAdapterTest.kt |  2 +-
 .../fenix/addons/AddonDetailsBindingDelegate.kt   | 15 +++++++++------
 .../addons/AddonDetailsBindingDelegateTest.kt     | 11 +++++++----
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/AddonsManagerAdapter.kt b/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/AddonsManagerAdapter.kt
index 64c4df655d26..2b0ed6ed0225 100644
--- a/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/AddonsManagerAdapter.kt
+++ b/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/AddonsManagerAdapter.kt
@@ -260,7 +260,7 @@ class AddonsManagerAdapter(
             val reviewCount = context.getString(R.string.mozac_feature_addons_user_rating_count_2)
             val ratingContentDescription =
                 String.format(
-                    context.getString(R.string.mozac_feature_addons_rating_content_description),
+                    context.getString(R.string.mozac_feature_addons_rating_content_description_2),
                     it.average,
                 )
             holder.ratingView.contentDescription = ratingContentDescription
diff --git a/android-components/components/feature/addons/src/main/res/values/strings.xml b/android-components/components/feature/addons/src/main/res/values/strings.xml
index dc1c822e25ae..1a2efc89a0ac 100644
--- a/android-components/components/feature/addons/src/main/res/values/strings.xml
+++ b/android-components/components/feature/addons/src/main/res/values/strings.xml
@@ -148,7 +148,9 @@
     <!-- Indicates how many users have rated an add-on. %1$s will be replaced with number of reviews -->
     <string name="mozac_feature_addons_user_rating_count_2">Reviews: %1$s</string>
     <!-- Accessibility content description for the amount of stars that add-on has, where %1$.02f will be the amount of stars and / separator and 5 the maximum number of stars e.g (2/5, 4.5/5 or 5/5)  . -->
-    <string name="mozac_feature_addons_rating_content_description">%1$.02f/5</string>
+    <string name="mozac_feature_addons_rating_content_description" moz:removedIn="124" tools:ignore="UnusedResources">%1$.02f/5</string>
+    <!-- Accessibility content description for the amount of stars that add-on has, where %1$.02f will be the amount of stars. -->
+    <string name="mozac_feature_addons_rating_content_description_2">Rating: %1$.02f out of 5</string>
     <!-- This is the title of page where all the add-ons are listed-->
     <string name="mozac_feature_addons_addons">Add-ons</string>
     <!-- Label for add-ons sub menu item for add-ons manager-->
diff --git a/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/ui/AddonsManagerAdapterTest.kt b/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/ui/AddonsManagerAdapterTest.kt
index 41b8370cd0e1..6dac9c9f69df 100644
--- a/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/ui/AddonsManagerAdapterTest.kt
+++ b/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/ui/AddonsManagerAdapterTest.kt
@@ -170,7 +170,7 @@ class AddonsManagerAdapterTest {
 
         adapter.bindAddon(addonViewHolder, addon, appName, appVersion)
 
-        verify(ratingAccessibleView).setText("4.50/5")
+        verify(ratingAccessibleView).setText("Rating: 4.50 out of 5")
         verify(titleView).setText("name")
         verify(titleView).setTextColor(ContextCompat.getColor(testContext, style.addonNameTextColor!!))
         verify(summaryView).setText("summary")
diff --git a/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt b/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
index fef044b050c4..3cfcc9575c0f 100644
--- a/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
+++ b/fenix/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/fenix/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt b/fenix/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
index 91f27b9e9e7f..ca27f28c9bb0 100644
--- a/fenix/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
+++ b/fenix/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 a26e21ee3b090843ed2bed110eb5e8529eb79149 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Wed, 31 Jan 2024 17:25:08 -0500
Subject: [PATCH 28/51] 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.
---
 .../mozilla/components/feature/session/SessionUseCases.kt | 8 ++++++++
 .../components/feature/session/SessionUseCasesTest.kt     | 4 ++++
 docs/changelog.md                                         | 5 ++++-
 .../java/org/mozilla/fenix/ui/CrashReportingTest.kt       | 2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/android-components/components/feature/session/src/main/java/mozilla/components/feature/session/SessionUseCases.kt b/android-components/components/feature/session/src/main/java/mozilla/components/feature/session/SessionUseCases.kt
index 4c53f0d22f75..565ba3463218 100644
--- a/android-components/components/feature/session/src/main/java/mozilla/components/feature/session/SessionUseCases.kt
+++ b/android-components/components/feature/session/src/main/java/mozilla/components/feature/session/SessionUseCases.kt
@@ -4,6 +4,7 @@
 
 package mozilla.components.feature.session
 
+import mozilla.components.browser.state.action.ContentAction
 import mozilla.components.browser.state.action.CrashAction
 import mozilla.components.browser.state.action.EngineAction
 import mozilla.components.browser.state.action.LastAccessAction
@@ -99,6 +100,13 @@ class SessionUseCases(
                     flags = flags,
                     additionalHeaders = additionalHeaders,
                 )
+                // Update the url in content immediately until the engine updates with any new changes to the state.
+                store.dispatch(
+                    ContentAction.UpdateUrlAction(
+                        loadSessionId,
+                        url,
+                    ),
+                )
                 store.dispatch(
                     EngineAction.OptimizedLoadUrlTriggeredAction(
                         loadSessionId,
diff --git a/android-components/components/feature/session/src/test/java/mozilla/components/feature/session/SessionUseCasesTest.kt b/android-components/components/feature/session/src/test/java/mozilla/components/feature/session/SessionUseCasesTest.kt
index 16a5fd3d626f..4461577d2595 100644
--- a/android-components/components/feature/session/src/test/java/mozilla/components/feature/session/SessionUseCasesTest.kt
+++ b/android-components/components/feature/session/src/test/java/mozilla/components/feature/session/SessionUseCasesTest.kt
@@ -11,6 +11,7 @@ import mozilla.components.browser.state.action.EngineAction
 import mozilla.components.browser.state.action.TabListAction
 import mozilla.components.browser.state.engine.EngineMiddleware
 import mozilla.components.browser.state.selector.findTab
+import mozilla.components.browser.state.selector.selectedTab
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.browser.state.state.createCustomTab
@@ -80,6 +81,7 @@ class SessionUseCasesTest {
             assertEquals("mozilla", action.tabId)
             assertEquals("https://getpocket.com", action.url)
         }
+        assertEquals("https://getpocket.com", store.state.selectedTab?.content?.url)
 
         useCases.loadUrl("https://www.mozilla.org", LoadUrlFlags.select(LoadUrlFlags.EXTERNAL))
         store.waitUntilIdle()
@@ -93,6 +95,7 @@ class SessionUseCasesTest {
             assertEquals("https://www.mozilla.org", action.url)
             assertEquals(LoadUrlFlags.select(LoadUrlFlags.EXTERNAL), action.flags)
         }
+        assertEquals("https://www.mozilla.org", store.state.selectedTab?.content?.url)
 
         useCases.loadUrl("https://firefox.com", store.state.selectedTabId)
         store.waitUntilIdle()
@@ -102,6 +105,7 @@ class SessionUseCasesTest {
             assertEquals("mozilla", action.tabId)
             assertEquals("https://firefox.com", action.url)
         }
+        assertEquals("https://firefox.com", store.state.selectedTab?.content?.url)
 
         useCases.loadUrl.invoke(
             "https://developer.mozilla.org",
diff --git a/docs/changelog.md b/docs/changelog.md
index 06a453a17cc4..c3de6235c869 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -19,7 +19,7 @@ permalink: /changelog/
 
 * **all components**
   * All new usages of the `concept-fetch` component to make fetch requests now have conservative-mode off by default. Current features will continue to use conservative mode until individually updated.
-  
+
 * **browser-toolbar**
   * Add `showMenuButton` and `hideMenuButton` API to `BrowserToolbar` and `DisplayToolbar` to allow hiding and showing of the menu button in
   the `BrowserToolbar` [Bug 1864760](https://bugzilla.mozilla.org/show_bug.cgi?id=1864760)
@@ -27,6 +27,9 @@ permalink: /changelog/
 * **feature-customtabs**
   * Fallback behaviour when failing to open a new window in custom tab will now be loading the URL directly in the same custom tab. [Bug 1832357](https://bugzilla.mozilla.org/show_bug.cgi?id=1832357)
 
+* **feature-session**
+  * Update URL in the store immediately when using the optimized load URL code path.
+
 # 123.0
 * [Commits](https://github.com/mozilla-mobile/firefox-android/compare/releases_v122..releases_v123)
 * [Dependencies](https://github.com/mozilla-mobile/firefox-android/blob/releases_v123/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt)
diff --git a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
index 84083e014ddf..be99ebe8af54 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
+++ b/fenix/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 5c0e0cacd88794befdb11d5a5898eac0d217a7f6 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 29/51] 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/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
index b4f37a0af4db..6dfd7a06951f 100644
--- a/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
+++ b/fenix/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 ab7cc9543b11710f8b7262d00d18f3f346089a39 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Mon, 12 Feb 2024 14:15:25 -0500
Subject: [PATCH 30/51] 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/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
index e4a769a07c2a..efc00ff779f4 100644
--- a/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+++ b/fenix/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 82da77452ed8f24c1fdc164cb193877b353085ec 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 31/51] Import translations from android-l10n

---
 .../addons/src/main/res/values-eu/strings.xml |   4 +-
 .../media/src/main/res/values-eu/strings.xml  |  11 +-
 .../src/main/res/values-eu/strings.xml        |  36 ++++
 fenix/app/src/main/res/values-azb/strings.xml |  56 +++++++
 fenix/app/src/main/res/values-eu/strings.xml  | 154 +++++++++++++-----
 .../app/src/main/res/values-iw/strings.xml    |  15 ++
 6 files changed, 230 insertions(+), 46 deletions(-)

diff --git a/android-components/components/feature/addons/src/main/res/values-eu/strings.xml b/android-components/components/feature/addons/src/main/res/values-eu/strings.xml
index 56985171df47..8c06d98ceeb5 100644
--- a/android-components/components/feature/addons/src/main/res/values-eu/strings.xml
+++ b/android-components/components/feature/addons/src/main/res/values-eu/strings.xml
@@ -22,6 +22,8 @@
      then we will show another collapsed entry saying "Access your data on 2 other domains". This entry it's for the plural case, when the add-on is accessing more than one extra domain.
      %1$d will be replaced by an integer indicating the number of additional domains for which this web extension is requesting permission. -->
     <string name="mozac_feature_addons_permissions_extra_domains_description_plural" tools:ignore="PluralsCandidate">Beste %1$d domeinutan zure datuak atzitzea</string>
+    <!-- Content description for a permission item, for an installed add-on details page. %1$s will be replaced with the permission text name, %2$d will be replaced with the permission position in the list and %3$d will be replaced with the total number of permissions in the list.Taking as an example "Read and modify privacy settings" the whole text will read Read and modify privacy settings, 2 of 6. -->
+    <string name="mozac_feature_addons_permissions_content_description_item">%1$s, %2$d of %3$d</string>
     <!-- Description for tabs add-on permission. -->
     <string name="mozac_feature_addons_permissions_tabs_description">Nabigatzailearen fitxak atzitzea</string>
     <!-- Description for unlimited_storage permission. -->
@@ -75,7 +77,7 @@
     <!-- The author of an add-on. -->
     <string name="mozac_feature_addons_author">Egilea</string>
     <!-- The authors of an add-on. -->
-    <string name="mozac_feature_addons_authors" moz:removedIn="120" tools:ignore="UnusedResources">Egileak</string>
+    <string name="mozac_feature_addons_authors" moz:removedIn="123" tools:ignore="UnusedResources">Egileak</string>
     <!-- The last date that the add-on was updated. -->
     <string name="mozac_feature_addons_last_updated">Azken eguneraketa</string>
     <!-- The developer website (Homepage) of the add-on. -->
diff --git a/android-components/components/feature/media/src/main/res/values-eu/strings.xml b/android-components/components/feature/media/src/main/res/values-eu/strings.xml
index f61dc91a9ca2..12d9fb39a8a2 100644
--- a/android-components/components/feature/media/src/main/res/values-eu/strings.xml
+++ b/android-components/components/feature/media/src/main/res/values-eu/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
     <!-- Name of the "notification channel" used for displaying media notification. See https://developer.android.com/training/notify-user/channels -->
     <string name="mozac_feature_media_notification_channel">Media</string>
 
@@ -21,9 +21,14 @@
     <!-- Text of reminder notification shown when the device's camera is shared with a website (WebRTC). %1$s is a placeholder that will be replaced by the app name-->
     <string name="mozac_feature_media_sharing_camera_reminder_text">Gogorarazlea: %1$s zure kamera ari da erabiltzen oraindik. Sakatu fitxa irekitzeko.</string>
     <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
-    <string name="mozac_feature_media_sharing_microphone_reminder_text">Gogorarazlea: %1$s zure mikrofonoa ari da erabiltzen oraindik. Sakatu fitxa irekitzeko</string>
+    <string name="mozac_feature_media_sharing_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Gogorarazlea: %1$s zure mikrofonoa ari da erabiltzen oraindik. Sakatu fitxa irekitzeko</string>
+    <!-- Text of reminder notification shown when the device's microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_microphone_reminder_text_2">Gogorarazlea: %1$s zure mikrofonoa ari da erabiltzen oraindik. Sakatu fitxa irekitzeko.</string>
+    <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text" moz:RemovedIn="124" tools:ignore="UnusedResources">Gogorarazlea: %1$s zure mikrofono eta kamera ari da erabiltzen oraindik. Sakatu fitxa irekitzeko</string>
+
     <!-- Text of reminder notification shown when the device's camera and microphone is shared with a website (WebRTC) %1$s is a placeholder that will be replaced by the app name-->
-    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text">Gogorarazlea: %1$s zure mikrofono eta kamera ari da erabiltzen oraindik. Sakatu fitxa irekitzeko</string>
+    <string name="mozac_feature_media_sharing_camera_and_microphone_reminder_text_2">Gogorarazlea: %1$s zure mikrofono eta kamera ari da erabiltzen oraindik. Sakatu fitxa irekitzeko.</string>
 
     <!--This is the title of the "play" action media shown in the media notification while web content is playing media. Clicking it will resume playing paused media. On most modern Android system only an icon is visible. But screen readers may read this title. -->
     <string name="mozac_feature_media_notification_action_play">Erreproduzitu</string>
diff --git a/android-components/components/feature/prompts/src/main/res/values-eu/strings.xml b/android-components/components/feature/prompts/src/main/res/values-eu/strings.xml
index 95a210e5c1fd..3782fee0a216 100644
--- a/android-components/components/feature/prompts/src/main/res/values-eu/strings.xml
+++ b/android-components/components/feature/prompts/src/main/res/values-eu/strings.xml
@@ -18,6 +18,8 @@
     <string name="mozac_feature_prompt_password_hint">Pasahitza</string>
     <!-- Negative confirmation that we should not save the new or updated login -->
     <string name="mozac_feature_prompt_dont_save">Ez gorde</string>
+    <!-- Negative confirmation that we should not save the new or updated login -->
+    <string name="mozac_feature_prompt_dont_save_2" tools:ignore="UnusedResources">Une honetan ez</string>
     <!-- Negative confirmation that we should never save a login for this site -->
     <string name="mozac_feature_prompt_never_save">Ez gorde inoiz</string>
     <!-- Negative confirmation that we should not save a credit card for this site -->
@@ -26,16 +28,26 @@
     <string name="mozac_feature_prompt_save_confirmation">Gorde</string>
     <!-- Negative confirmation that we should not save the updated login -->
     <string name="mozac_feature_prompt_dont_update">Ez eguneratu</string>
+    <!-- Negative confirmation that we should not save the updated login -->
+    <string name="mozac_feature_prompt_dont_update_2" tools:ignore="UnusedResources">Une honetan ez</string>
     <!-- Positive confirmation that we should save the updated login -->
     <string name="mozac_feature_prompt_update_confirmation">Eguneratu</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
     <string name="mozac_feature_prompt_error_empty_password">Pasahitzaren eremuak ezin du hutsik egon</string>
     <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_empty_password_2" tools:ignore="UnusedResources">Idatzi pasahitz bat</string>
+    <!-- Error text displayed underneath the login field when it is in an error case -->
     <string name="mozac_feature_prompt_error_unknown_cause">Ezin da saio-hasiera gorde</string>
+    <!-- Error text displayed underneath the password field when it is in an error case -->
+    <string name="mozac_feature_prompt_error_unknown_cause_2" tools:ignore="UnusedResources">Ezin da pasahitza gorde</string>
     <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new login. -->
     <string name="mozac_feature_prompt_login_save_headline">Gorde saio-hasiera hau?</string>
+    <!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new password. -->
+    <string name="mozac_feature_prompt_login_save_headline_2" tools:ignore="UnusedResources">Gorde pasahitza?</string>
     <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_update_headline">Eguneratu saio-hasiera hau?</string>
+    <!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the password. -->
+    <string name="mozac_feature_prompt_login_update_headline_2" tools:ignore="UnusedResources">Eguneratu pasahitza?</string>
     <!-- Prompt message displayed when app detects a user has entered a username for an existing login without a username and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_add_username_headline">Gehitu erabiltzaile-izena gordetako pasahitzari?</string>
     <!-- Text for a label for the field when prompt requesting a text is shown. -->
@@ -85,13 +97,22 @@
     <string name="mozac_feature_prompts_set_time">Ezarri denbora</string>
     <!-- Option in expanded select login prompt that links to login settings -->
     <string name="mozac_feature_prompts_manage_logins">Kudeatu saio-hasierak</string>
+    <!-- Option in expanded select password prompt that links to password settings -->
+    <string name="mozac_feature_prompts_manage_logins_2" tools:ignore="UnusedResources">Kudeatu pasahitzak</string>
     <!-- Content description for expanding the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_expand_logins_content_description">Zabaldu iradokitako saio-hasierak</string>
+    <!-- Content description for expanding the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_expand_logins_content_description_2" tools:ignore="UnusedResources">Zabaldu gordetako pasahitzak</string>
     <!-- Content description for collapsing the saved logins options in the select login prompt -->
     <string name="mozac_feature_prompts_collapse_logins_content_description">Tolestu iradokitako saio-hasierak</string>
+    <!-- Content description for collapsing the saved passwords options in the select password prompt -->
+    <string name="mozac_feature_prompts_collapse_logins_content_description_2" tools:ignore="UnusedResources">Tolestu gordetako pasahitzak</string>
     <!-- Header for the select login prompt to allow users to fill a form with a saved login -->
     <string name="mozac_feature_prompts_saved_logins">Iradokitako saio-hasierak</string>
 
+    <!-- Header for the select password prompt to allow users to fill a form with a saved password -->
+    <string name="mozac_feature_prompts_saved_logins_2" tools:ignore="UnusedResources">Gordetako pasahitzak</string>
+
     <!-- Content description for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
     <string name="mozac_feature_prompts_suggest_strong_password_content_description">Gomendatu pasahitz sendoa</string>
     <!-- Header for the suggest strong password prompt to allow users to fill a form with a suggested strong password -->
@@ -110,12 +131,20 @@
     <!-- Credit Card Autofill -->
     <!-- Header for the select credit card prompt to allow users to fill a form with a saved credit card. -->
     <string name="mozac_feature_prompts_select_credit_card">Hautatu kreditu-txartela</string>
+    <!-- Header for the select card prompt to allow users to fill a form with a saved card. -->
+    <string name="mozac_feature_prompts_select_credit_card_2" tools:ignore="UnusedResources">Erabili gordetako txartela</string>
     <!-- Content description for expanding the select credit card options in the select credit card prompt. -->
     <string name="mozac_feature_prompts_expand_credit_cards_content_description">Zabaldu iradokitako kreditu-txartelak</string>
+    <!-- Content description for expanding the saved card options in the select card prompt. -->
+    <string name="mozac_feature_prompts_expand_credit_cards_content_description_2" tools:ignore="UnusedResources">Zabaldu gordetako txartelak</string>
     <!-- Content description for collapsing the select credit card options in the select credit prompt. -->
     <string name="mozac_feature_prompts_collapse_credit_cards_content_description">Tolestu iradokitako kreditu-txartelak</string>
+    <!-- Content description for collapsing the saved card options in the select prompt. -->
+    <string name="mozac_feature_prompts_collapse_credit_cards_content_description_2" tools:ignore="UnusedResources">Tolestu gordetako txartelak</string>
     <!-- Option in the expanded select credit card prompt that links to credit cards settings. -->
     <string name="mozac_feature_prompts_manage_credit_cards">Kudeatu kreditu-txartelak</string>
+    <!-- Option in the expanded select card prompt that links to cards settings. -->
+    <string name="mozac_feature_prompts_manage_credit_cards_2" tools:ignore="UnusedResources">Kudeatu txartelak</string>
     <!-- Text for the title of a save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_title">Gorde txartela modu seguruan?</string>
     <!-- Text for the title of an update credit card dialog. -->
@@ -123,13 +152,20 @@
     <!-- Subtitle text displayed under the title of the save credit card dialog. -->
     <string name="mozac_feature_prompts_save_credit_card_prompt_body">Txartel-zenbakia zifratu egingo da. Segurtasun-kodea ez da gordeko.</string>
 
+    <!-- Subtitle text displayed under the title of the saved card dialog. Parameter will be replaced by app name-->
+    <string name="mozac_feature_prompts_save_credit_card_prompt_body_2" tools:ignore="UnusedResources">%s(e)k zure txartel-zenbakia zifratzen du. Zure segurtasun-kodea ez da gordeko.</string>
+
     <!-- Address Autofill -->
     <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
     <string name="mozac_feature_prompts_select_address_2">Hautatu helbidea</string>
     <!-- Content description for expanding the select addresses options in the select address prompt. -->
     <string name="mozac_feature_prompts_expand_address_content_description">Zabaldu iradokitako helbideak</string>
+    <!-- Content description for expanding the saved addresses options in the select address prompt. -->
+    <string name="mozac_feature_prompts_expand_address_content_description_2" tools:ignore="UnusedResources">Zabaldu gordetako helbideak</string>
     <!-- Content description for collapsing the select address options in the select address prompt. -->
     <string name="mozac_feature_prompts_collapse_address_content_description">Tolestu iradokitako helbideak</string>
+    <!-- Content description for collapsing the saved address options in the select address prompt. -->
+    <string name="mozac_feature_prompts_collapse_address_content_description_2" tools:ignore="UnusedResources">Tolestu gordetako helbideak</string>
     <!-- Text for the manage addresses button. -->
     <string name="mozac_feature_prompts_manage_address">Kudeatu helbideak</string>
 
diff --git a/fenix/app/src/main/res/values-azb/strings.xml b/fenix/app/src/main/res/values-azb/strings.xml
index 1c5e4b0c8767..796ef13cfb87 100644
--- a/fenix/app/src/main/res/values-azb/strings.xml
+++ b/fenix/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/fenix/app/src/main/res/values-eu/strings.xml b/fenix/app/src/main/res/values-eu/strings.xml
index ea6c22134a79..7f70955c968d 100644
--- a/fenix/app/src/main/res/values-eu/strings.xml
+++ b/fenix/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". -->
diff --git a/focus-android/app/src/main/res/values-iw/strings.xml b/focus-android/app/src/main/res/values-iw/strings.xml
index 0a1cf34e3a68..404587cd5062 100644
--- a/focus-android/app/src/main/res/values-iw/strings.xml
+++ b/focus-android/app/src/main/res/values-iw/strings.xml
@@ -724,6 +724,21 @@
     <!-- 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 placeholder will be updated with the app name. -->
     <string name="cookie_banner_exception_panel_description_state_off_for_site2">‏%1$s יכול לנסות לדחות באופן אוטומטי בקשות כרזות עוגיות.</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 panel in the toolbar. -->
+    <string name="cookie_banner_exception_panel_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 panel in the toolbar. -->
+    <string name="cookie_banner_exception_panel_site_is_not_supported_request_support_button">בקשת תמיכה</string>
+
+    <!-- Label for the snackBar, after the user reports with success a website where cookie banner reducer did not work -->
+    <string name="cookie_banner_report_a_site_snackbar_label">הבקשה לתמיכה באתר הוגשה.</string>
+
+    <!-- Label for cookie banner item from tracking protection, after the user reports with success a website where cookie banner reducer did not work -->
+    <string name="cookie_banner_the_site_was_reported">הבקשה לתמיכה באתר הוגשה.</string>
+
+    <!-- CFR for Cookie Banner (Banner Info Message). This string is used as text for a link in cfr_cookie_banner and takes the user to the app settings. -->
+    <string name="cfr_cookie_banner_link">הגדרות</string>
+
     <!-- Preference for autoplay -->
     <string name="preference_autoplay">ניגון אוטומטי</string>
 

From 0b277f1659452e08393e0394db6d9e73e911bc1a Mon Sep 17 00:00:00 2001
From: MickeyMoz <sebastian@mozilla.com>
Date: Tue, 13 Feb 2024 01:40:40 +0000
Subject: [PATCH 32/51] Update GeckoView (Nightly) to 124.0.20240212214644.

---
 android-components/plugins/dependencies/src/main/java/Gecko.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/Gecko.kt b/android-components/plugins/dependencies/src/main/java/Gecko.kt
index 1d336b896ce4..61f2182a2445 100644
--- a/android-components/plugins/dependencies/src/main/java/Gecko.kt
+++ b/android-components/plugins/dependencies/src/main/java/Gecko.kt
@@ -9,7 +9,7 @@ object Gecko {
     /**
      * GeckoView Version.
      */
-    const val version = "124.0.20240211213657"
+    const val version = "124.0.20240212214644"
 
     /**
      * GeckoView channel

From 5648ec974f9d0f89ffb26e41addedcf4a9dc095d Mon Sep 17 00:00:00 2001
From: MickeyMoz <sebastian@mozilla.com>
Date: Tue, 13 Feb 2024 05:34:18 +0000
Subject: [PATCH 33/51] Update A-S to 124.20240213050313.

---
 .../plugins/dependencies/src/main/java/ApplicationServices.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt b/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
index 188a9b88fdf8..2ceca30e0b13 100644
--- a/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
+++ b/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // These lines are generated by android-components/automation/application-services-nightly-bump.py
-val VERSION = "124.20240210050349"
+val VERSION = "124.20240213050313"
 val CHANNEL = ApplicationServicesChannel.NIGHTLY
 
 object ApplicationServicesConfig {

From 20b21b1fcb334cb95b313453427085ef8879d201 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 34/51] Bug 1879886 - Remove unused functions from
 NavigationToolbarRobot

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

diff --git a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
index 2cb5403242f2..51b4656f185c 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
+++ b/fenix/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 49d7033e145a740d63fca193545177733240a6ff 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 35/51] 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/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
index 51b4656f185c..94af51d9ea85 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
+++ b/fenix/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 0a67838b6003eba618da0f132ec357abfdaac8f5 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 36/51] Bug 1879886 - Remove redundant assertion functions from
 NavigationToolbarRobot

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

diff --git a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
index 94af51d9ea85..2b2914e3ebe7 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
+++ b/fenix/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 7b5032183f7472c3f4395e16a3a15677e9e06812 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 37/51] Bug 1879886 - Add test logs to NavigationToolbarRobot

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

diff --git a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
index 2b2914e3ebe7..cb6a8495639e 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
+++ b/fenix/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 11348a2e7f08e43e7aadd093c4e94309b18f4e09 Mon Sep 17 00:00:00 2001
From: DreVla <vlad.dreghici@gmail.com>
Date: Wed, 10 Jan 2024 16:28:38 +0200
Subject: [PATCH 38/51] 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 ++++---
 fenix/app/src/main/res/values/strings.xml                 | 8 ++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/fenix/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNavigationMiddleware.kt b/fenix/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNavigationMiddleware.kt
index 91b846fcebc4..aaa1c4673cfb 100644
--- a/fenix/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNavigationMiddleware.kt
+++ b/fenix/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/fenix/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt b/fenix/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt
index e5c53777b7d0..afa4da62dd4e 100644
--- a/fenix/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt
+++ b/fenix/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/fenix/app/src/main/res/values/strings.xml b/fenix/app/src/main/res/values/strings.xml
index 1796126135be..38148a49f80e 100644
--- a/fenix/app/src/main/res/values/strings.xml
+++ b/fenix/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 1659b3bd1097e3a09dc52090e8538cfa56ff4728 Mon Sep 17 00:00:00 2001
From: MickeyMoz <sebastian@mozilla.com>
Date: Tue, 13 Feb 2024 13:18:55 +0000
Subject: [PATCH 39/51] Update GeckoView (Nightly) to 124.0.20240213093751.

---
 android-components/plugins/dependencies/src/main/java/Gecko.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/Gecko.kt b/android-components/plugins/dependencies/src/main/java/Gecko.kt
index 61f2182a2445..63d33d2f3a30 100644
--- a/android-components/plugins/dependencies/src/main/java/Gecko.kt
+++ b/android-components/plugins/dependencies/src/main/java/Gecko.kt
@@ -9,7 +9,7 @@ object Gecko {
     /**
      * GeckoView Version.
      */
-    const val version = "124.0.20240212214644"
+    const val version = "124.0.20240213093751"
 
     /**
      * GeckoView channel

From 7658c557554fd9c31c987ae5b2de4aea33de87c5 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Mon, 12 Feb 2024 15:04:48 -0500
Subject: [PATCH 40/51] Bug 1879944 - Update Compose Compiler to version 1.5.9

---
 .../plugins/dependencies/src/main/java/DependenciesPlugin.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
index 18dcb3366171..f1daa633fbf8 100644
--- a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
+++ b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
@@ -53,7 +53,7 @@ object Versions {
     // see https://android-developers.googleblog.com/2022/06/independent-versioning-of-Jetpack-Compose-libraries.html
     // for Jetpack Compose libraries versioning
     const val compose_version = "1.5.4"
-    const val compose_compiler = "1.5.8"
+    const val compose_compiler = "1.5.9"
 
     object AndroidX {
         const val activityCompose = "1.7.2"

From 0c2a6aab6a678ae75a2195daf6734f24883be2cd 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 41/51] 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/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
index 7398746e95c3..5a6acc9cbeac 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
+++ b/fenix/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 d947b10eaf6fbb4b761bc8d95460ceb4017586d4 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 42/51] 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/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
index 5a6acc9cbeac..99cbbf9a6906 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
+++ b/fenix/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 ed17a80811b9cba9902c015021f54c71d48d46bc 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 43/51] 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/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt
index f9e050526cd4..0de5dc465a3c 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt
+++ b/fenix/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 2763c7f3d8eec8e825e7a0e90cf70a37823d6f1b 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 44/51] Bug 1880064 - Remove redundant assertion functions from
 ReaderViewRobot

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

diff --git a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt
index 89bd934fbe1b..910dd846e9a1 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt
+++ b/fenix/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 529d1ac674a8fb2e5d555e1f5aab37fc78329864 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 45/51] 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/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt
index f9b95a2dc478..e3c4e532f164 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt
+++ b/fenix/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/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt
index 0de5dc465a3c..cd31c2fc8628 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/PwaRobot.kt
+++ b/fenix/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/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt
index 910dd846e9a1..30d87d72c985 100644
--- a/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt
+++ b/fenix/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 27fdbc45b0120f82cfff0e1106ba39768ef9ef94 Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Wed, 30 Aug 2023 08:57:38 +0300
Subject: [PATCH 46/51] Bug 1850316 - Update androidx navigation.

---
 .../plugins/dependencies/src/main/java/DependenciesPlugin.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
index f1daa633fbf8..6d5ceb48b655 100644
--- a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
+++ b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
@@ -81,7 +81,7 @@ object Versions {
         const val preferences = "1.2.1"
         const val lifecycle = "2.7.0"
         const val media = "1.7.0"
-        const val navigation = "2.5.3"
+        const val navigation = "2.7.7"
         const val work = "2.7.1"
         const val arch = "2.2.0"
         const val uiautomator = "2.2.0"

From d79a60ca88841d208ba36b6768e2411cf44afdf6 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 47/51] Bug 1850316 - Remove navigation library duplication
 from FenixDependencies.

---
 .../plugins/dependencies/src/main/java/DependenciesPlugin.kt  | 3 +++
 fenix/app/build.gradle                                        | 4 ++--
 fenix/build.gradle                                            | 2 +-
 .../src/main/java/FenixDependenciesPlugin.kt                  | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
index 6d5ceb48b655..ceb34e7696c2 100644
--- a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
+++ b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
@@ -129,6 +129,9 @@ object ComponentsDependencies {
     const val androidx_compose_foundation = "androidx.compose.foundation:foundation:${Versions.AndroidX.compose}"
     const val androidx_compose_material = "androidx.compose.material:material:${Versions.AndroidX.compose}"
     const val androidx_compose_runtime_livedata = "androidx.compose.runtime:runtime-livedata:${Versions.AndroidX.compose}"
+    const val androidx_safeargs = "androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.AndroidX.navigation}"
+    const val androidx_navigation_fragment = "androidx.navigation:navigation-fragment-ktx:${Versions.AndroidX.navigation}"
+    const val androidx_navigation_ui = "androidx.navigation:navigation-ui:$${Versions.AndroidX.navigation}"
     const val androidx_compose_navigation = "androidx.navigation:navigation-compose:${Versions.AndroidX.navigation}"
     const val androidx_constraintlayout = "androidx.constraintlayout:constraintlayout:${Versions.AndroidX.constraintlayout}"
     const val androidx_core = "androidx.core:core:${Versions.AndroidX.core}"
diff --git a/fenix/app/build.gradle b/fenix/app/build.gradle
index bacca971143b..4a689a89a7ab 100644
--- a/fenix/app/build.gradle
+++ b/fenix/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/fenix/build.gradle b/fenix/build.gradle
index cb9ff542e225..bd002d017909 100644
--- a/fenix/build.gradle
+++ b/fenix/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/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
index efc00ff779f4..a8657de948a8 100644
--- a/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+++ b/fenix/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 9df75c1ca170796d5cb9df47d175059902934135 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 48/51] Bug 1850316 - Use alternative ways to get backQueue
 elements.

backQueue is now private in NavController.
---
 .../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/fenix/app/src/main/java/org/mozilla/fenix/ext/NavController.kt b/fenix/app/src/main/java/org/mozilla/fenix/ext/NavController.kt
index 07e9713b98d8..e768d72f2a13 100644
--- a/fenix/app/src/main/java/org/mozilla/fenix/ext/NavController.kt
+++ b/fenix/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/fenix/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/fenix/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
index f6fd7de78d38..c41d5ea4c2af 100644
--- a/fenix/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
+++ b/fenix/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/fenix/app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt b/fenix/app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt
index c7aa3e72bbe1..ff71df0ff1cd 100644
--- a/fenix/app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt
+++ b/fenix/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 7f7b326157a6174c3befd126b94543067e440479 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Mon, 12 Feb 2024 09:59:46 -0500
Subject: [PATCH 49/51] 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/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
index a8657de948a8..6cce2f427b86 100644
--- a/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+++ b/fenix/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 65efb284ebc1bd1ca01ec8076aed7ddd6ad5e336 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Fri, 5 Jan 2024 16:13:11 -0500
Subject: [PATCH 50/51] Bug 1879912 - Update OkHttp to version 4.12.0

---
 .../plugins/dependencies/src/main/java/DependenciesPlugin.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
index ceb34e7696c2..39153acc4594 100644
--- a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
+++ b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
@@ -24,7 +24,7 @@ object Versions {
     const val mockito = "5.10.0"
     const val maven_ant_tasks = "2.1.3"
     const val jacoco = "0.8.11"
-    const val okhttp = "4.11.0"
+    const val okhttp = "4.12.0"
     const val okio = "3.6.0"
     const val coil = "2.4.0"
 

From 0df7d35a691c1a73d14a5dc7f3b6d71717e59c92 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Mon, 12 Feb 2024 12:36:47 -0500
Subject: [PATCH 51/51] Bug 1879912 - Update Okio to version 3.8.0

---
 .../plugins/dependencies/src/main/java/DependenciesPlugin.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
index 39153acc4594..964a5cab5c44 100644
--- a/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
+++ b/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
@@ -25,7 +25,7 @@ object Versions {
     const val maven_ant_tasks = "2.1.3"
     const val jacoco = "0.8.11"
     const val okhttp = "4.12.0"
-    const val okio = "3.6.0"
+    const val okio = "3.8.0"
     const val coil = "2.4.0"
 
     const val android_gradle_plugin = "8.2.2"